From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..3b10fee 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,
@@ -150,11 +153,13 @@
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);
List<Map<String, Object>> getPrintDetail(String orderId, String boxNo, Integer productId, String thickness);
+
+ Boolean deleteFinishedGoodsInventoryDate();
}
--
Gitblit v1.8.0