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/itemreceipt/MesWmItemReceiptServiceImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
index ef1b5c0..018802e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -265,9 +265,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockItemReceipt(Long id) {
- // 鏍￠獙瀛樺湪
+ // 鏍￠獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
}
// 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽叆搴撴暟閲�
@@ -283,10 +283,8 @@
throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH);
}
}
-
- // 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
- itemReceiptMapper.updateById(new MesWmItemReceiptDO()
- .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVED.getStatus()));
+ // 娉ㄦ剰锛氭湰鏂规硶浠呭仛鏁伴噺涓�鑷存�ф牎楠岋紝涓嶅緱淇敼鍗曟嵁鐘舵�併��
+ // 鐘舵�佹祦杞敱 audit锛圓PPROVING 鈫� APPROVED锛変笌 finish锛圓PPROVED 鈫� FINISHED锛夎礋璐ｃ��
}
@Override
@@ -408,12 +406,8 @@
@Override
public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
- MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(receipt.getStatus(), MesWmItemReceiptStatusEnum.PREPARE.getStatus())
- && ObjUtil.notEqual(receipt.getStatus(), MesWmItemReceiptStatusEnum.APPROVING.getStatus())) {
- throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
- }
- return receipt;
+ // 浠呰崏绋跨姸鎬佸厑璁哥紪杈戣/鏄庣粏锛涘鎵逛腑锛圓PPROVING锛夊凡閿佸畾锛岄伩鍏嶇粫杩囧鏍镐慨鏀规暟鎹�
+ return validateItemReceiptExistsAndDraft(id);
}
private MesWmItemReceiptDO validateItemReceiptExists(Long id) {
--
Gitblit v1.9.3