From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index a6ac03e..058789a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -1183,11 +1183,14 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail",finishedGoodsInventoryMapper.getPrintTitleByBox(
+ List<Map<String, String>> detail = finishedGoodsInventoryMapper.getPrintTitleByBox(
finishedGoodsInventory.getOrder().getCustomerId(),
finishedGoodsInventory.getOrder().getProject(),
- boxNo
- ) );
+ boxNo,
+ orderId
+ );
+
+ itemmap.put("detail",detail);
//鑾峰彇搴撳瓨閲岄潰姝よ鍗曟绠卞彿鐨勬墍鏈変骇鍝佷俊鎭�
List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
.getorderProductByBoxNo(orderId,boxNo);
@@ -1197,13 +1200,6 @@
for(Map<String, Object> details:detailList){
Map<String, Object> detailsmap = new HashMap<>();
detailsmap.put("product_name",details.get("product_name").toString());
- /*finishedOperateLogMapper
- .getDetailLists(
- finishedOperateLog.getOrderId(),
- finishedOperateLog.getRemarks(),
- Integer.valueOf(details.get("product_id").toString()),
- details.get("thickness").toString()
- );*/
//鑾峰彇鏄庣粏鏁版嵁
List<Map<String, Object>> orderDetailList = finishedGoodsInventoryMapper
.getPrintDetail(
--
Gitblit v1.8.0