From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
index 30e36ac..ac3e8b0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -96,7 +96,8 @@
 
     Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                          @Param("storageRegion") String storageRegion,
-                                         @Param("remark") String remark, @Param("container") String container);
+                                         @Param("remark") String remark, @Param("container") String container,
+                                         @Param("getComputeArea") Double getComputeArea);
 
 
     List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
@@ -157,6 +158,10 @@
     List<Map<String, Object>> getorderProductByBoxNo(String orderId, String boxNo);
 
     List<Map<String, Object>> getPrintDetail(String orderId, String boxNo, Integer productId, String thickness);
+
+    Boolean deleteFinishedGoodsInventoryDate();
+
+    List<FinishedGoodsInventory> getFinishedGoodsInventoryList();
 }
 
 

--
Gitblit v1.8.0