From 6aeb134430e16e0dde739da0274c1d60273f0f89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 10 十月 2025 09:08:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java |    5 ++++-
 1 files changed, 4 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 bf1a53c..07b49d3 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
@@ -59,6 +59,8 @@
 
     Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
 
+    Integer findFinishedOperateLogQuantity(String orderId);
+
     Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
                             @Param("storageRegion") String storageRegion,
                             @Param("remark") String remark, @Param("container") String container);
@@ -94,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,

--
Gitblit v1.8.0