From 96d60dcd18b3d8c304afb8131fcbe547c0e74554 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 16:25:10 +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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 d259e3b..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
@@ -22,7 +22,9 @@
@Param("pageSize") Integer pageSize,
@Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);
- Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);
+ Map<String,Integer> getPageTotal(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,
+ @Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);
FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
@Param("order_number") Integer order_number,
@@ -56,6 +58,8 @@
Integer findDeliveryQuantity(String deliveryId);
Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
+
+ Integer findFinishedOperateLogQuantity(String orderId);
Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
@@ -92,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,
@@ -148,11 +153,15 @@
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();
+
+ List<FinishedGoodsInventory> getFinishedGoodsInventoryList();
}
--
Gitblit v1.8.0