From 006020bc9a87dc40c2e73bc50f244b348b831de1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:41:56 +0800
Subject: [PATCH] 恢复 ERP 采购入库/退货后端，补齐采购统计接口
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index bc3620d..b6bc848 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -550,7 +550,8 @@
// 1. 鏇存柊姣忎釜閲囪喘璁㈠崟椤�
orderItems.forEach(item -> {
BigDecimal inCount = inCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getInCount().equals(inCount)) {
+ // 鍘嗗彶/瀵煎叆鏁版嵁鐨勫叆搴撴暟閲忓彲鑳戒负绌猴紝鎸� 0 澶勭悊锛岄伩鍏� NPE
+ if (ObjectUtil.defaultIfNull(item.getInCount(), BigDecimal.ZERO).compareTo(inCount) == 0) {
return;
}
if (inCount.compareTo(item.getCount()) > 0) {
@@ -570,12 +571,14 @@
// 1. 鏇存柊姣忎釜閲囪喘璁㈠崟椤�
orderItems.forEach(item -> {
BigDecimal returnCount = returnCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getReturnCount().equals(returnCount)) {
+ // 鍘嗗彶/瀵煎叆鏁版嵁鐨勯��璐ф暟閲忋�佸叆搴撴暟閲忓彲鑳戒负绌猴紝鎸� 0 澶勭悊锛岄伩鍏� NPE
+ if (ObjectUtil.defaultIfNull(item.getReturnCount(), BigDecimal.ZERO).compareTo(returnCount) == 0) {
return;
}
- if (returnCount.compareTo(item.getInCount()) > 0) {
+ BigDecimal inCount = ObjectUtil.defaultIfNull(item.getInCount(), BigDecimal.ZERO);
+ if (returnCount.compareTo(inCount) > 0) {
throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
- "浜у搧ID:" + item.getProductId(), item.getInCount());
+ "浜у搧ID:" + item.getProductId(), inCount);
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
});
--
Gitblit v1.9.3