From e3b783fe002b75cb0569e93e04786e00ac711075 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 24 十月 2026 22:49:54 +0800
Subject: [PATCH] refactor(mes): 重构质检模块物料查询逻辑并优化仓储流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 60 +++++++++++++++++-------------------------------------------
1 files changed, 17 insertions(+), 43 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 d7d831a..18bdd6d 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
@@ -6,9 +6,6 @@
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
@@ -71,16 +68,8 @@
*/
private static final String ITEM_RECEIPT_APPROVE_BIZ_TYPE = "item_receipt_approve";
- /**
- * 閲囪喘鍏ュ簱鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
- */
- private static final String ITEM_RECEIPT_APPROVE_PROCESS_KEY = "item_receipt_approve";
-
@Resource
private MesWmItemReceiptMapper itemReceiptMapper;
-
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private MesWmItemReceiptLineService itemReceiptLineService;
@@ -192,35 +181,8 @@
// 鏍￠獙鐗╂枡鎵规绠＄悊锛氬鏋滅墿鏂欏紑鍚壒娆＄鐞嗭紝鍒欐槑缁嗙殑鎵规鍙蜂笉鑳戒负绌�
validateBatchManagement(lines);
- // 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
- approvalConfigApi.validateApprovalEnabledAndGetApprovers(ITEM_RECEIPT_APPROVE_BIZ_TYPE);
-
// 鎻愪氦锛堣崏绋� 鈫� 寰呬笂鏋讹級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
itemReceiptMapper.submitAndResetAuditInfo(id, MesWmItemReceiptStatusEnum.APPROVING.getStatus());
- // 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
- bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
- new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(ITEM_RECEIPT_APPROVE_PROCESS_KEY)
- .setBusinessKey(String.valueOf(id)));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateItemReceiptAuditStatus(Long id, Integer bpmStatus, String reason) {
- // BPM 瀹℃壒缁撴灉鏄犲皠涓哄崟鎹姸鎬侊細閫氳繃=寰呮墽琛屽叆搴� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑�
- Integer status;
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
- status = MesWmItemReceiptStatusEnum.APPROVED.getStatus();
- } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
- status = MesWmItemReceiptStatusEnum.PREPARE.getStatus();
- } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
- status = MesWmItemReceiptStatusEnum.CANCELED.getStatus();
- } else {
- return;
- }
- if (itemReceiptMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
- log.warn("[updateItemReceiptAuditStatus] 閲囪喘鍏ュ簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
- }
}
@Override
@@ -300,9 +262,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockItemReceipt(Long id) {
- // 鏍￠獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
+ // 鏍￠獙瀛樺湪 + 寰呬笂鏋�
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
}
// 鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽叆搴撴暟閲�
@@ -318,8 +280,9 @@
throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH);
}
}
- // 娉ㄦ剰锛氭湰鏂规硶浠呭仛鏁伴噺涓�鑷存�ф牎楠岋紝涓嶅緱淇敼鍗曟嵁鐘舵�併��
- // 鐘舵�佹祦杞敱 audit锛圓PPROVING 鈫� APPROVED锛変笌 finish锛圓PPROVED 鈫� FINISHED锛夎礋璐ｃ��
+ // 涓婃灦瀹屾垚锛堝緟涓婃灦 鈫� 寰呮墽琛屽叆搴擄級
+ itemReceiptMapper.updateById(new MesWmItemReceiptDO()
+ .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVED.getStatus()));
}
@Override
@@ -441,7 +404,18 @@
@Override
public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
- // 浠呰崏绋跨姸鎬佸厑璁哥紪杈戣/鏄庣粏锛涘鎵逛腑锛圓PPROVING锛夊凡閿佸畾锛岄伩鍏嶇粫杩囧鏍镐慨鏀规暟鎹�
+ // 鑽夌涓庡緟涓婃灦鐘舵�佸厑璁哥紪杈戜笂鏋舵槑缁嗭細鎻愪氦鍚庝粨搴撴墽琛屼笂鏋舵椂褰曞叆搴撲綅/鎵规
+ MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.PREPARE.getStatus(), receipt.getStatus())
+ && ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
+ throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
+ }
+ return receipt;
+ }
+
+ @Override
+ public MesWmItemReceiptDO validateItemReceiptLineEditable(Long id) {
+ // 琛屾暟鎹粎鑽夌鍙敼锛氭彁浜ゅ悗琛屾暟鎹攣瀹氾紝閬垮厤涓婃灦闃舵鏀瑰姩鍏ュ簱鏁伴噺
return validateItemReceiptExistsAndDraft(id);
}
--
Gitblit v1.9.3