From 1c7184503554a6728895489b084cc4b523f261f2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 09:39:48 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index beaad9f..10e29b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -362,9 +362,9 @@
PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
if (!Objects.isNull(purchaseItem)) {
purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());
- }
- if (!purchaseItemService.updateById(purchaseItem)) {
- throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
}
});
@@ -372,11 +372,13 @@
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
- purchase.setQty(purchase.getQty() - sum)
- .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
+ if (!Objects.isNull(purchase)) {
+ purchase.setQty(purchase.getQty() - sum)
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
- if (!purchaseService.updateById(purchase)) {
- throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ if (!purchaseService.updateById(purchase)) {
+ throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
}
}
--
Gitblit v1.9.1