From 8a63774671aef17807569d6fb631eca20d4696f0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 25 八月 2025 17:04:46 +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/service/mm/FinishedGoodsInventoryService.java | 20 ++++++++++----------
1 files changed, 10 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 e06de5e..0b548c2 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
@@ -924,6 +924,11 @@
Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
//鑾峰彇宸茬粡鍑哄簱鐨勬暟閲�
Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
+
+ Integer finishedOperateLogQuantitySum = finishedGoodsInventoryMapper.findFinishedOperateLogQuantity(orderDetail.getDeliveryDetail().getOrderId());
+ if(finishedOperateLogQuantitySum==null){
+ finishedOperateLogQuantitySum=0;
+ }
if(deliverydetailsum==null){
deliverydetailsum=0;
}
@@ -954,7 +959,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (orderNumberdsum==orderNumberdDeliverysum) {
+ if (ordersum==finishedOperateLogQuantitySum) {
//if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
@@ -1183,12 +1188,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,
orderId
- ) );
+ );
+
+ itemmap.put("detail",detail);
//鑾峰彇搴撳瓨閲岄潰姝よ鍗曟绠卞彿鐨勬墍鏈変骇鍝佷俊鎭�
List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
.getorderProductByBoxNo(orderId,boxNo);
@@ -1198,13 +1205,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