From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
index a05baf6..9635618 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
@@ -185,14 +185,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockReturnVendor(Long id) {
- // 鏍￠獙瀛樺湪
+ // 鏍￠獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
- if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVING.getStatus(), returnVendor.getStatus())) {
+ if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVED.getStatus(), returnVendor.getStatus())) {
throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
}
- // 鎵ц鎷ｈ揣锛堝緟鎷ｈ揣 -> 寰呮墽琛岄��璐э級
- returnVendorMapper.updateById(new MesWmReturnVendorDO()
- .setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVED.getStatus()));
+ // 浠呮牎楠岃鏁伴噺涓庢槑缁嗘暟閲忎竴鑷达紝涓嶄慨鏀瑰崟鎹姸鎬�
+ if (!Boolean.TRUE.equals(checkReturnVendorQuantity(id))) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
}
@Override
@@ -208,6 +209,10 @@
if (CollUtil.isEmpty(details)) {
throw exception(WM_RETURN_VENDOR_NO_DETAIL);
}
+ // 1.3 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰绛変簬琛岄��璐ф暟閲忥紝閬垮厤鍑哄簱鏁伴噺涓庡崟鎹笉涓�鑷�
+ if (!Boolean.TRUE.equals(checkReturnVendorQuantity(id))) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH);
+ }
// 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
createTransactionList(returnVendor, details);
@@ -220,7 +225,7 @@
private void createTransactionList(MesWmReturnVendorDO returnVendor, List<MesWmReturnVendorDetailDO> details) {
wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
- .setQuantity(detail.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
+ .setQuantity(negateQuantity(detail.getQuantity())) // 鍑哄簱鏁伴噺涓鸿礋鏁�
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setVendorId(returnVendor.getVendorId())
@@ -228,6 +233,16 @@
.setBizCode(returnVendor.getCode()).setBizLineId(detail.getLineId())));
}
+ /**
+ * 鍑哄簱鏁伴噺鍙栬礋锛氭暟閲忎负绌烘椂鎶涘嚭鏄庣‘鐨勪笟鍔″紓甯革紝閬垮厤 NPE
+ */
+ private BigDecimal negateQuantity(BigDecimal quantity) {
+ if (quantity == null) {
+ throw exception(WM_RETURN_VENDOR_DETAIL_QUANTITY_INVALID);
+ }
+ return quantity.negate();
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelReturnVendor(Long id) {
--
Gitblit v1.9.3