From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 4 +++-
1 files changed, 3 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 d494181..30e36ac 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);
@@ -150,7 +152,7 @@
Integer findOrderNumberdContainercount(String orderId, Integer orderNumber, String container);
- List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo);
+ List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo,String orderId);
List<Map<String, Object>> getorderProductByBoxNo(String orderId, String boxNo);
--
Gitblit v1.8.0