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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 b2c68b2..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 (ordersum==orderNumberdDeliverysum) {
+ if (ordersum==finishedOperateLogQuantitySum) {
//if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
--
Gitblit v1.8.0