From 89e3115c7281edf06fa1cd362ff32071a52b51ce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 04 七月 2025 08:25:14 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 2d4054d..056c630 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -167,14 +167,22 @@
throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
}
for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
- AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
- if (Double.compare(orderItem.getDemandQty(), 0.0) == 0) {
+ if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
continue;
}
+ AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
- BigDecimal orderDemandQty = new BigDecimal(orderItem.getDemandQty().toString());
+ BigDecimal orderDemandQty = new BigDecimal(oldOrderItem.getDemandQty().toString());
if (num.compareTo(orderDemandQty) < 0){
throw new CoolException("鎾鏁伴噺澶т簬鍗曟嵁鍑哄簱鏁伴噺锛岃妫�鏌�");
+ }
+ AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
+ if (Cools.isEmpty(asnOrder)){
+ throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
+ }
+ asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
+ if (!asnOrderService.updateById(asnOrder)){
+ throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
}
orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
if (!asnOrderItemService.updateById(orderItem)){
@@ -183,11 +191,6 @@
//妫�鏌ュ崟鎹槸鍚﹀畬鎴�
Boolean orderChecked = checkOrderComplete(orderItem);
if (orderChecked){
- AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
- if (Cools.isEmpty(asnOrder)){
- throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
- }
- asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
if (!asnOrderService.updateById(asnOrder)){
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
--
Gitblit v1.9.1