From 7bd10d34e8a8dc2437ec8551eb511e37634d7306 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:52 +0800
Subject: [PATCH] feat(mes): 生产计划审批改走协同办公,修复工单领料与产成品入库校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java | 7 +
/dev/null | 22 ---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 109 +++++++++++----
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java | 11 +
sql/mysql/pro_mps_audit_20261030.sql | 52 +++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/listener/MesProMpsStatusListener.java | 86 ++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java | 78 +++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 9 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java | 31 +++-
11 files changed, 323 insertions(+), 90 deletions(-)
diff --git a/sql/mysql/pro_mps_audit_20261030.sql b/sql/mysql/pro_mps_audit_20261030.sql
index b44cf09..9f78637 100644
--- a/sql/mysql/pro_mps_audit_20261030.sql
+++ b/sql/mysql/pro_mps_audit_20261030.sql
@@ -1,8 +1,9 @@
-- =============================================
-- 璁″垝鎺掔▼锛圡PS锛夊鏍告祦 + 杈呮枡閲囪喘 鍗囩骇鑴氭湰
--- 1) mes_pro_mps 澧炲姞锛氳鍒掑紑濮嬫棩鏈熴�佸鏍镐俊鎭�侀噰璐敵璇峰崟鍏宠仈
+-- 1) mes_pro_mps 澧炲姞锛氳鍒掑紑濮嬫棩鏈熴�佸鏍镐俊鎭�侀噰璐敵璇峰崟鍏宠仈銆佸鎵规祦绋嬪疄渚嬬紪鍙�
-- 2) 瀛楀吀 mes_pro_mps_status 澧炲姞锛�4-瀹℃牳涓��5-宸插鏍�
--- 3) 鑿滃崟/鎸夐挳锛氭彁浜ゅ鏍搞�佸鏍搞�佺敓鎴愰噰璐敵璇峰崟
+-- 3) 鑿滃崟/鎸夐挳锛氭彁浜ゅ鏍搞�佺敓鎴愰噰璐敵璇峰崟锛堥〉闈㈠唴銆屽鏍搞�嶆寜閽凡搴熷純锛屽鎵圭粺涓�鍦ㄥ崗鍚屽姙鍏畬鎴愶級
+-- 4) 瀹℃壒娴佺▼锛氶渶閮ㄧ讲娴佺▼瀹氫箟 mes-pro-mps-audit锛堣 docs/sql/mes_pro_mps_audit_20261102.bpmn锛�
-- 鍙噸澶嶆墽琛岋紝涓嶅寘鍚� tenant_id锛堥」鐩笉浣跨敤澶氱鎴凤級
-- =============================================
START TRANSACTION;
@@ -45,6 +46,14 @@
'SELECT 1');
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+-- 瀹℃壒娴佺▼瀹炰緥缂栧彿锛氭彁浜ゅ鏍稿悗杩涘叆鍗忓悓鍔炲叕瀹℃壒锛屽鎵圭粨鏋滃洖鍐欐湰琛�
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'mes_pro_mps' AND column_name = 'process_instance_id');
+SET @sql = IF(@exists = 0,
+ 'ALTER TABLE mes_pro_mps ADD COLUMN process_instance_id varchar(64) DEFAULT NULL COMMENT ''BPM 娴佺▼瀹炰緥缂栧彿'' AFTER purchase_request_id',
+ 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
-- =============================================
-- 2. 瀛楀吀鏁版嵁锛歁PS 鐘舵�佸鍔� 瀹℃牳涓�(4)銆佸凡瀹℃牳(5)
-- =============================================
@@ -63,9 +72,14 @@
WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'mes_pro_mps_status' AND value = '5' AND deleted = b'0');
-- =============================================
--- 3. 鎸夐挳鏉冮檺锛氭彁浜ゅ鏍� / 瀹℃牳 / 鐢熸垚閲囪喘鐢宠鍗�
+-- 3. 鎸夐挳鏉冮檺锛氭彁浜ゅ鏍� / 鐢熸垚閲囪喘鐢宠鍗�
-- =============================================
SET @mps_page = (SELECT id FROM system_menu WHERE deleted = b'0' AND permission = 'mes:pro-mps:query' ORDER BY id LIMIT 1);
+
+-- 3.0 娓呯悊鏃х増椤甸潰鍐呫�屽鏍搞�嶆寜閽紙瀹℃壒宸叉敼涓哄湪鍗忓悓鍔炲叕瀹屾垚锛�
+DELETE FROM system_role_menu
+WHERE menu_id IN (SELECT id FROM (SELECT id FROM system_menu WHERE permission = 'mes:pro-mps:audit' AND deleted = b'0') t);
+DELETE FROM system_menu WHERE permission = 'mes:pro-mps:audit' AND deleted = b'0';
-- 3.1 鎻愪氦瀹℃牳
SET @btn = (SELECT id FROM system_menu WHERE deleted = b'0' AND permission = 'mes:pro-mps:submit' ORDER BY id LIMIT 1);
@@ -74,14 +88,7 @@
SELECT @next, '鐢熶骇璁″垝-鎻愪氦瀹℃牳', 'mes:pro-mps:submit', 3, 20, @mps_page, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'
FROM DUAL WHERE @btn IS NULL AND @mps_page IS NOT NULL;
--- 3.2 瀹℃牳
-SET @btn = (SELECT id FROM system_menu WHERE deleted = b'0' AND permission = 'mes:pro-mps:audit' ORDER BY id LIMIT 1);
-SET @next = (SELECT IFNULL(MAX(id), 0) + 1 FROM system_menu);
-INSERT INTO system_menu(id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-SELECT @next, '鐢熶骇璁″垝-瀹℃牳', 'mes:pro-mps:audit', 3, 21, @mps_page, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'
-FROM DUAL WHERE @btn IS NULL AND @mps_page IS NOT NULL;
-
--- 3.3 鐢熸垚閲囪喘鐢宠鍗�
+-- 3.2 鐢熸垚閲囪喘鐢宠鍗�
SET @btn = (SELECT id FROM system_menu WHERE deleted = b'0' AND permission = 'mes:pro-mps:generate-purchase' ORDER BY id LIMIT 1);
SET @next = (SELECT IFNULL(MAX(id), 0) + 1 FROM system_menu);
INSERT INTO system_menu(id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
@@ -89,12 +96,31 @@
FROM DUAL WHERE @btn IS NULL AND @mps_page IS NOT NULL;
-- =============================================
--- 4. 鎺堟潈锛氳秴绾х鐞嗗憳鐩存帴鎷ユ湁鍏ㄩ儴鑿滃崟锛屾澶勪粎琛ユ櫘閫氳鑹叉寜闇�鎺堟潈锛堢ず渚嬶細鐢熶骇璁″垝宸叉湁鏌ヨ鏉冮檺鐨勮鑹诧級
+-- 4. 鍗忓悓鍔炲叕娴佺▼鍒嗙被锛氱敓浜ц鍒掑鎵癸紙娴佺▼瀹氫箟 mes-pro-mps-audit 閮ㄧ讲鍚庡綊灞炶鍒嗙被锛�
+-- =============================================
+INSERT INTO bpm_category(name, code, description, status, sort, creator, create_time, updater, update_time, deleted)
+SELECT '鐢熶骇璁″垝瀹℃壒', 'mes_pro_mps_approve', 'MES 鐢熶骇璁″垝瀹℃壒', 0, 72, '1', NOW(), '1', NOW(), b'0'
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM bpm_category WHERE code = 'mes_pro_mps_approve' AND deleted = b'0');
+
+-- =============================================
+-- 5. 鍗忓悓鍔炲叕瀹℃壒璇︽儏锛氱粦瀹氱敓浜ц鍒掍笟鍔¤鎯呯粍浠讹紝瀹℃壒浜哄彲鏌ョ湅璁″垝鏁版嵁
+-- =============================================
+INSERT INTO bpm_business_attach(process_definition_key, business_type, component_path, status, remark,
+ creator, create_time, updater, update_time, deleted)
+SELECT 'mes-pro-mps-audit', 'mes_pro_mps', '/mes/pro/mps/detail/approve/index.vue', 0,
+ '鐢熶骇璁″垝瀹℃壒灞曠ず鐢熶骇璁″垝璇︽儏', '1', NOW(), '1', NOW(), b'0'
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM bpm_business_attach
+ WHERE process_definition_key = 'mes-pro-mps-audit' AND deleted = b'0');
+
+-- =============================================
+-- 6. 鎺堟潈锛氳秴绾х鐞嗗憳鐩存帴鎷ユ湁鍏ㄩ儴鑿滃崟锛屾澶勪粎琛ユ櫘閫氳鑹叉寜闇�鎺堟潈锛堢ず渚嬶細鐢熶骇璁″垝宸叉湁鏌ヨ鏉冮檺鐨勮鑹诧級
-- =============================================
INSERT INTO system_role_menu(role_id, menu_id, creator, create_time, updater, update_time, deleted)
SELECT DISTINCT rm.role_id, m.id, '1', NOW(), '1', NOW(), b'0'
FROM system_role_menu rm
-JOIN system_menu m ON m.permission IN ('mes:pro-mps:submit', 'mes:pro-mps:audit', 'mes:pro-mps:generate-purchase')
+JOIN system_menu m ON m.permission IN ('mes:pro-mps:submit', 'mes:pro-mps:generate-purchase')
AND m.deleted = b'0'
JOIN system_menu parent ON parent.id = rm.menu_id AND parent.permission = 'mes:pro-mps:query' AND parent.deleted = b'0'
WHERE rm.deleted = b'0'
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
index 1c6fb69..774c4bf 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
@@ -9,7 +9,6 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
@@ -149,14 +148,6 @@
@PreAuthorize("@ss.hasPermission('mes:pro-mps:submit')")
public CommonResult<Boolean> submitMps(@RequestParam("id") Long id) {
mpsService.submitMps(id);
- return success(true);
- }
-
- @PostMapping("/audit")
- @Operation(summary = "瀹℃牳鐢熶骇涓昏鍒�")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:audit')")
- public CommonResult<Boolean> auditMps(@Valid @RequestBody MesProMpsAuditReqVO reqVO) {
- mpsService.auditMps(reqVO);
return success(true);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsAuditReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsAuditReqVO.java
deleted file mode 100644
index 830759d..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/vo/MesProMpsAuditReqVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - MES 鐢熶骇涓昏鍒掑鏍� Request VO")
-@Data
-public class MesProMpsAuditReqVO {
-
- @Schema(description = "MPS 缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "MPS 缂栧彿涓嶈兘涓虹┖")
- private Long id;
-
- @Schema(description = "鏄惁閫氳繃锛歵rue=瀹℃牳閫氳繃锛宖alse=椹冲洖", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "瀹℃牳缁撴灉涓嶈兘涓虹┖")
- private Boolean approved;
-
- @Schema(description = "瀹℃牳鎰忚锛堥┏鍥炴椂蹇呭~锛�", example = "鐢熶骇鏁伴噺涓庨攢鍞鍗曚笉绗︼紝璇蜂慨鏀瑰悗閲嶆柊鎻愪氦")
- private String auditRemark;
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
index 3ef59ed..9fc60b5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
@@ -143,19 +143,15 @@
return success(Collections.emptyList());
}
- // 2. 鑾峰彇宸ュ崟宸ュ簭鍒楄〃锛堝惈鍚勫伐搴忕殑鎶曟枡鏄庣粏涓庝骇鍑哄搧锛�
- List<MesProWorkOrderProcessDO> processList = workOrderProcessService
- .getWorkOrderProcessListByWorkOrderId(workOrderId);
- if (CollUtil.isEmpty(processList)) {
-
- return success(Collections.emptyList());
- }
-
- // 3. 鑾峰彇宸ュ崟 BOM 琛岋紙鍚勫伐搴忕殑鎶曟枡璁板綍锛屾寜 processId 鍒嗙粍浣跨敤锛�
+ // 2. 鑾峰彇宸ュ崟 BOM 琛岋紙鍚勫伐搴忕殑鎶曟枡璁板綍锛屽崟鑰楀彛寰勶級
List<MesProWorkOrderBomDO> bomList = workOrderBomService.getWorkOrderBomListByWorkOrderId(workOrderId);
if (CollUtil.isEmpty(bomList)) {
return success(Collections.emptyList());
}
+
+ // 3. 鑾峰彇宸ュ崟宸ュ簭鍒楄〃锛堝惈鍚勫伐搴忕殑鎶曟枡鏄庣粏涓庝骇鍑哄搧锛�
+ List<MesProWorkOrderProcessDO> processList = workOrderProcessService
+ .getWorkOrderProcessListByWorkOrderId(workOrderId);
// 4. 閫氳繃浜у搧ID鍙嶆煡宸ヨ壓璺嚎锛堝伐鍗� routeId 鍙兘涓虹┖锛�
Long routeId = null;
@@ -167,7 +163,22 @@
}
// 5. 鎸夊伐搴忎骇鍑洪摼閫愬眰灞曞紑 BOM锛屽緱鍒板彾瀛愮墿鏂欙紙姣忓崟浣嶆垚鍝佺殑鐢ㄩ噺锛�
- Map<Long, BigDecimal> leafItems = buildWorkOrderItems(processList, bomList, routeId);
+ Map<Long, BigDecimal> leafItems = CollUtil.isEmpty(processList)
+ ? Collections.emptyMap()
+ : buildWorkOrderItems(processList, bomList, routeId);
+ // 5.1 鍥為��锛氬伐鍗曟病鏈夊伐搴忥紝鎴栨姇鏂欐湭鎸傚湪鏈�鍚庝竴閬撳伐搴忎笂锛堜緥濡傛姇鏂欓厤缃湪棣栭亾閰嶆枡宸ュ簭锛夋椂锛�
+ // 閫愬眰灞曞紑浼氬緱鍒扮┖缁撴灉銆傛鏃舵寜鍏ㄩ儴鎶曟枡琛屾眹鎬诲崟鑰楋紝涓庛�屾寜宸ュ崟鐢熸垚棰嗘枡鍗曘�嶇殑鍙栨暟鍙e緞淇濇寔涓�鑷达紝
+ // 鍚﹀垯宸ュ崟鏄庢槑鏈夋姇鏂欍�侀鏂欎篃棰嗚繃浜嗭紝鎵撳嵃棰嗘枡鍗曞嵈鏄剧ず銆屾殏鏃犺緟鏂欓渶姹傘�嶃��
+ if (CollUtil.isEmpty(leafItems)) {
+ Map<Long, BigDecimal> allBomItems = new LinkedHashMap<>();
+ for (MesProWorkOrderBomDO bom : bomList) {
+ if (bom.getItemId() == null || bom.getQuantity() == null) {
+ continue;
+ }
+ allBomItems.merge(bom.getItemId(), bom.getQuantity(), BigDecimal::add);
+ }
+ leafItems = allBomItems;
+ }
if (CollUtil.isEmpty(leafItems)) {
return success(Collections.emptyList());
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java
index cecd74c..adf9934 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java
@@ -169,6 +169,13 @@
*/
private String auditRemark;
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ *
+ * 鎻愪氦瀹℃牳鍚庡湪鍗忓悓鍔炲叕瀹℃壒锛屽鎵圭粨鏋滈�氳繃鐩戝惉鍣ㄥ洖鍐�
+ */
+ private String processInstanceId;
+
// ========== 閲囪喘鍗曞叧鑱� ==========
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 6289d08..1cee9fb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -383,10 +383,10 @@
ErrorCode PRO_MPS_HAS_WORK_ORDER = new ErrorCode(1_040_509_007, "MPS 宸插叧鑱旂敓浜у伐鍗曪紝鏃犳硶鍒犻櫎");
ErrorCode PRO_MPS_MES_PRODUCT_NOT_EXISTS = new ErrorCode(1_040_509_008, "MES 浜у搧涓嶅瓨鍦紝鏃犳硶鍒涘缓 MPS锛屼骇鍝侊細{}");
ErrorCode PRO_MPS_WORK_ORDER_HAS_FEEDBACK = new ErrorCode(1_040_509_009, "璇ヨ鍒掑叧鑱旂殑鐢熶骇璁㈠崟宸叉湁鎶ュ伐璁板綍锛屾棤娉曞彇娑堬紒");
- ErrorCode PRO_MPS_NOT_AUDITING = new ErrorCode(1_040_509_010, "鍙湁瀹℃牳涓姸鎬佺殑 MPS 鎵嶈兘瀹℃牳");
ErrorCode PRO_MPS_NOT_APPROVED = new ErrorCode(1_040_509_011, "鍙湁宸插鏍哥姸鎬佺殑 MPS 鎵嶈兘鎵ц姝ゆ搷浣滐紝璇峰厛鎻愪氦瀹℃牳");
- ErrorCode PRO_MPS_AUDIT_REMARK_REQUIRED = new ErrorCode(1_040_509_012, "椹冲洖瀹℃牳鏃跺繀椤诲~鍐欓┏鍥炲師鍥�");
ErrorCode PRO_MPS_NO_MATERIAL_SHORTAGE = new ErrorCode(1_040_509_013, "璇ヨ鍒掓墍闇�鐗╂枡搴撳瓨鍏呰冻锛屾棤闇�鐢熸垚閲囪喘鍗�");
+ ErrorCode PRO_MPS_PROCESS_NOT_DEPLOYED = new ErrorCode(1_040_509_014, "鎻愪氦瀹℃牳澶辫触锛氱敓浜ц鍒掑鎵规祦绋�(mes-pro-mps-audit)灏氭湭閮ㄧ讲锛岃鑱旂郴绠$悊鍛樺湪銆屽崗鍚屽姙鍏� - 娴佺▼妯″瀷銆嶄腑閮ㄧ讲璇ユ祦绋嬪悗閲嶆柊鎻愪氦");
+ ErrorCode PRO_MPS_NO_MATERIAL_BOM = new ErrorCode(1_040_509_015, "鐢熶骇璁″垝{}鐨勪骇鍝併�恵}銆戝皻鏈淮鎶や骇鍝� BOM 鎴栧伐鑹鸿矾绾挎姇鏂� BOM锛屾棤娉曡绠楃墿鏂欑己鍙o紝璇峰厛鍒般�岀敓浜у熀纭�鏁版嵁 - 鐗╂枡BOM缁存姢銆嶆垨銆岀敓浜у熀纭�鏁版嵁 - 宸ヨ壓璺嚎銆嶄腑閰嶇疆鎶曟枡鍚庡啀鐢熸垚閲囪喘鐢宠鍗�");
// ========== MES 璐ㄩ噺绠$悊-璐ㄦ鏂规锛�1-040-600-000锛� ==========
ErrorCode QC_TEMPLATE_NOT_EXISTS = new ErrorCode(1_040_600_000, "璐ㄦ鏂规涓嶅瓨鍦�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java
index 22cdb28..8173707 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java
@@ -117,6 +117,10 @@
}
continue;
}
+ // 椤剁骇浜у搧娌℃湁浠讳綍涓嬬骇 BOM 鏃讹紝璇存槑灏氭湭缁存姢 BOM锛屼笉鑳芥妸浜у搧鑷韩褰撴垚杈呮枡
+ if (entry.getKey().equals(productId)) {
+ continue;
+ }
// 鏃犱笅绾� BOM锛岃涓哄彾瀛愮墿鏂欙紙澶栬喘浠讹級
leafItems.merge(entry.getKey(), qty, BigDecimal::add);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java
index 611b208..62a083e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsService.java
@@ -61,20 +61,23 @@
/**
* 鎻愪氦瀹℃牳
*
- * 鑽夌鐘舵�� 鈫� 瀹℃牳涓�
+ * 鑽夌鐘舵�� 鈫� 瀹℃牳涓紝骞跺惎鍔� BPM 娴佺▼锛屽鎵瑰湪鍗忓悓鍔炲叕瀹屾垚
*
* @param id MPS 缂栧彿
*/
void submitMps(Long id);
/**
- * 瀹℃牳 MPS
+ * 澶勭悊 BPM 瀹℃壒缁撴灉锛堝崗鍚屽姙鍏鎵瑰畬鎴愬悗鍥炶皟锛�
*
* 瀹℃牳涓� 鈫� 宸插鏍革紙閫氳繃锛�/ 鑽夌锛堥┏鍥烇級
*
- * @param reqVO 瀹℃牳淇℃伅
+ * @param id MPS 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉
+ * @param reason 瀹℃壒鎰忚锛堥┏鍥炲師鍥狅級
+ * @param auditUserId 瀹℃牳浜虹紪鍙�
*/
- void auditMps(@Valid cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsAuditReqVO reqVO);
+ void handleBpmProcessResult(Long id, Integer bpmResult, String reason, Long auditUserId);
/**
* 鑾峰緱璁″垝鐨勮緟鏂欓渶姹傛槑缁嗭紙鍚簱瀛樸�佸湪閫斻�佹槸鍚﹀厖瓒筹級
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index af3ad0d..8e0381f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -3,14 +3,17 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+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.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseRequestApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseRequestCreateReqDTO;
-import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderItemRespVO;
@@ -77,6 +80,11 @@
*/
private static final String MPS_CODE_RULE = "MPS";
+ /**
+ * MPS 瀹℃壒娴佺▼瀹氫箟 Key锛圔PM 娴佺▼妯″瀷涓厤缃級
+ */
+ private static final String MPS_APPROVE_PROCESS_DEFINITION_KEY = "mes-pro-mps-audit";
+
@Resource
private MesProMpsMapper mpsMapper;
@Resource
@@ -105,6 +113,8 @@
private ErpPurchaseOrderApi purchaseOrderApi;
@Resource
private ErpPurchaseRequestApi purchaseRequestApi;
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -194,11 +204,8 @@
// 鏍¢獙缂栫爜鍞竴
validateMpsCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
- // 鏇存柊锛涘鏍镐腑鐨勮鍒掕淇敼鍚庨渶瑕侀噸鏂版彁浜ゅ鏍�
+ // 鏇存柊锛堜粎鑽夌鍙紪杈戯級
MesProMpsDO updateObj = BeanUtils.toBean(updateReqVO, MesProMpsDO.class);
- if (MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
- updateObj.setStatus(MesProMpsStatusEnum.DRAFT.getStatus());
- }
mpsMapper.updateById(updateObj);
}
@@ -221,35 +228,71 @@
@Transactional(rollbackFor = Exception.class)
public void submitMps(Long id) {
MesProMpsDO mps = validateMpsExists(id);
- if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())
- && !MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
+ // 鍙湁鑽夌鍙互鎻愪氦瀹℃牳锛涘鏍镐腑鐨勮鍒掗渶绛夊緟鍗忓悓鍔炲叕瀹℃壒缁撴灉
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())) {
throw exception(PRO_MPS_NOT_DRAFT);
+ }
+ // 鍏ㄥ眬鍏嶅鎵癸細涓嶅仛 BPM 娴佺▼锛岀洿鎺ユ寜瀹℃壒閫氳繃澶勭悊
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.AUDITING.getStatus())
+ .setProcessInstanceId(""));
+ handleBpmProcessResult(id, BpmProcessInstanceStatusEnum.APPROVE.getStatus(), "鍏ㄥ眬鍏嶅鎵硅嚜鍔ㄩ�氳繃", null);
+ return;
+ }
+ // 鍚姩 BPM 娴佺▼锛屽鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛岀粨鏋滅敱鐩戝惉鍣ㄥ洖鍐�
+ String processInstanceId;
+ try {
+ processInstanceId = processInstanceApi.createProcessInstance(SecurityFrameworkUtils.getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(MPS_APPROVE_PROCESS_DEFINITION_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ } catch (ServiceException ex) {
+ // 娴佺▼鏈儴缃叉椂 BPM 鍙姏銆屾祦绋嬪畾涔変笉瀛樺湪銆嶏紝琛ヤ笂鍙墽琛岀殑鎻愮ず
+ if (StrUtil.contains(ex.getMessage(), "娴佺▼瀹氫箟涓嶅瓨鍦�")) {
+ log.warn("[submitMps] 鐢熶骇璁″垝瀹℃壒娴佺▼({}) 鏈儴缃诧紝mpsId={}", MPS_APPROVE_PROCESS_DEFINITION_KEY, id);
+ throw exception(PRO_MPS_PROCESS_NOT_DEPLOYED);
+ }
+ throw ex;
}
mpsMapper.updateById(new MesProMpsDO()
.setId(id)
- .setStatus(MesProMpsStatusEnum.AUDITING.getStatus()));
+ .setStatus(MesProMpsStatusEnum.AUDITING.getStatus())
+ .setProcessInstanceId(processInstanceId));
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void auditMps(MesProMpsAuditReqVO reqVO) {
- MesProMpsDO mps = validateMpsExists(reqVO.getId());
+ public void handleBpmProcessResult(Long id, Integer bpmResult, String reason, Long auditUserId) {
+ // 1. 鏌旀�ф牎楠岋細璁″垝瀛樺湪涓斿浜庡鏍镐腑
+ MesProMpsDO mps = mpsMapper.selectById(id);
+ if (mps == null) {
+ log.warn("[handleBpmProcessResult] 鐢熶骇璁″垝({}) 涓嶅瓨鍦�", id);
+ return;
+ }
if (!MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
- throw exception(PRO_MPS_NOT_AUDITING);
+ log.warn("[handleBpmProcessResult] 鐢熶骇璁″垝({}) 涓嶅浜庡鏍镐腑鐘舵�侊紝褰撳墠鐘舵�侊細{}", id, mps.getStatus());
+ return;
}
- boolean approved = Boolean.TRUE.equals(reqVO.getApproved());
- if (!approved && StrUtil.isBlank(reqVO.getAuditRemark())) {
- throw exception(PRO_MPS_AUDIT_REMARK_REQUIRED);
+
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ if (BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.APPROVED.getStatus())
+ .setAuditUserId(auditUserId)
+ .setAuditTime(LocalDateTime.now())
+ .setAuditRemark(StrUtil.blankToDefault(reason, "瀹℃牳閫氳繃")));
+ } else if (BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(bpmResult)
+ || BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ mpsMapper.updateById(new MesProMpsDO()
+ .setId(id)
+ .setStatus(MesProMpsStatusEnum.DRAFT.getStatus())
+ .setAuditUserId(auditUserId)
+ .setAuditTime(LocalDateTime.now())
+ .setAuditRemark(StrUtil.blankToDefault(reason, "瀹℃壒椹冲洖")));
}
- mpsMapper.updateById(new MesProMpsDO()
- .setId(reqVO.getId())
- .setStatus(approved ? MesProMpsStatusEnum.APPROVED.getStatus()
- : MesProMpsStatusEnum.DRAFT.getStatus())
- .setAuditUserId(SecurityFrameworkUtils.getLoginUserId())
- .setAuditTime(LocalDateTime.now())
- .setAuditRemark(approved
- ? StrUtil.blankToDefault(reqVO.getAuditRemark(), "瀹℃牳閫氳繃")
- : reqVO.getAuditRemark()));
}
@Override
@@ -267,9 +310,16 @@
if (!MesProMpsStatusEnum.APPROVED.getStatus().equals(mps.getStatus())) {
throw exception(PRO_MPS_NOT_APPROVED);
}
- // 1. 鍙缂哄彛鐗╂枡鐢熸垚閲囪喘鏄庣粏锛氱己鍙� = 闇�姹� - 鍙敤搴撳瓨 - 鍦ㄩ�旈噰璐�
+ // 1. 鐗╂枡闇�姹備负绌鸿鏄庝骇鍝佹湭缁存姢浠讳綍 BOM锛岀洿鎺ユ彁绀猴紝閬垮厤璇姤鈥滃簱瀛樺厖瓒斥��
+ List<MesProWorkOrderItemRespVO> materialItems = getMpsItemList(id);
+ if (CollUtil.isEmpty(materialItems)) {
+ MesMdItemDO product = itemService.getItem(mps.getProductId());
+ throw exception(PRO_MPS_NO_MATERIAL_BOM, mps.getCode(),
+ product != null ? product.getName() : String.valueOf(mps.getProductId()));
+ }
+ // 2. 鍙缂哄彛鐗╂枡鐢熸垚閲囪喘鏄庣粏锛氱己鍙� = 闇�姹� - 鍙敤搴撳瓨 - 鍦ㄩ�旈噰璐�
List<ErpPurchaseRequestCreateReqDTO.Item> shortageItems = new ArrayList<>();
- for (MesProWorkOrderItemRespVO item : getMpsItemList(id)) {
+ for (MesProWorkOrderItemRespVO item : materialItems) {
if (Boolean.TRUE.equals(item.getStockSufficient())) {
continue;
}
@@ -293,14 +343,14 @@
if (CollUtil.isEmpty(shortageItems)) {
throw exception(PRO_MPS_NO_MATERIAL_SHORTAGE);
}
- // 2. 鐢熸垚閲囪喘鐢宠鍗曪紙鑽夌锛屾棤渚涘簲鍟嗭紝鍚庣画鐢遍噰璐汉鍛樿ˉ鍏呭苟鎸夋祦绋嬫彁浜わ級
+ // 3. 鐢熸垚閲囪喘鐢宠鍗曪紙鑽夌锛屾棤渚涘簲鍟嗭紝鍚庣画鐢遍噰璐汉鍛樿ˉ鍏呭苟鎸夋祦绋嬫彁浜わ級
ErpPurchaseRequestCreateReqDTO createReqDTO = new ErpPurchaseRequestCreateReqDTO()
.setRequestTime(LocalDateTime.now())
.setRequestReason("鐢熶骇璁″垝 " + mps.getCode() + " 杈呮枡閲囪喘")
.setRemark("鐢辩敓浜ц鍒掕嚜鍔ㄧ敓鎴愶紝鍏� " + shortageItems.size() + " 椤圭墿鏂欏簱瀛樹笉瓒�")
.setItems(shortageItems);
Long purchaseRequestId = purchaseRequestApi.createPurchaseRequest(createReqDTO).getCheckedData();
- // 3. 鍥炲啓閲囪喘鐢宠鍗曠紪鍙凤紝渚夸簬浠庤鍒掕拷婧�
+ // 4. 鍥炲啓閲囪喘鐢宠鍗曠紪鍙凤紝渚夸簬浠庤鍒掕拷婧�
mpsMapper.updateById(new MesProMpsDO().setId(id).setPurchaseRequestId(purchaseRequestId));
log.info("[generatePurchaseRequest] 璁″垝({}) 鐢熸垚閲囪喘鐢宠鍗�({})锛屾槑缁� {} 椤�", mps.getCode(), purchaseRequestId, shortageItems.size());
return purchaseRequestId;
@@ -638,12 +688,11 @@
}
/**
- * 鏍¢獙 MPS 瀛樺湪 + 鍙紪杈戠姸鎬侊紙鏈紑濮嬨�佸鏍镐腑锛�
+ * 鏍¢獙 MPS 瀛樺湪 + 鍙紪杈戠姸鎬侊紙浠呰崏绋匡紱瀹℃牳涓殑璁″垝闇�绛夊緟鍗忓悓鍔炲叕瀹℃壒锛�
*/
private MesProMpsDO validateMpsExistsAndEditable(Long id) {
MesProMpsDO mps = validateMpsExists(id);
- if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())
- && !MesProMpsStatusEnum.AUDITING.getStatus().equals(mps.getStatus())) {
+ if (!MesProMpsStatusEnum.DRAFT.getStatus().equals(mps.getStatus())) {
throw exception(PRO_MPS_NOT_DRAFT);
}
return mps;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/listener/MesProMpsStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/listener/MesProMpsStatusListener.java
new file mode 100644
index 0000000..2cf9082
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/listener/MesProMpsStatusListener.java
@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.mes.service.pro.mps.listener;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants;
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
+import cn.iocoder.yudao.module.mes.service.pro.mps.MesProMpsService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.springframework.stereotype.Component;
+
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 鐢熶骇涓昏鍒掞紙MPS锛夊鎵圭姸鎬佺洃鍚櫒
+ *
+ * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鎶婂崗鍚屽姙鍏殑瀹℃壒缁撴灉鍥炲啓鍒� MPS 鐘舵��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesProMpsStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ /**
+ * MPS 瀹℃壒娴佺▼瀹氫箟 Key
+ */
+ private static final String BPM_PROCESS_DEFINITION_KEY = "mes-pro-mps-audit";
+
+ @Resource
+ private MesProMpsService mpsService;
+
+ @Resource
+ private BpmTaskService bpmTaskService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return BPM_PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ Long mpsId;
+ try {
+ mpsId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨勭敓浜ц鍒掔紪鍙�", event.getBusinessKey());
+ return;
+ }
+ String reason = event.getReason();
+ Long auditUserId = null;
+ if (event.getId() != null) {
+ // 褰� event.getReason() 涓虹┖鏃讹紝灏濊瘯浠庢渶鍚庝竴涓畬鎴愮殑浠诲姟涓幏鍙栧鎵规剰瑙佷笌瀹℃壒浜�
+ List<HistoricTaskInstance> tasks = bpmTaskService.getTaskListByProcessInstanceId(event.getId(), false);
+ if (CollUtil.isNotEmpty(tasks)) {
+ HistoricTaskInstance lastTask = tasks.stream()
+ .filter(task -> task.getEndTime() != null)
+ // 鎺掗櫎澶氬疄渚嬫垨绛炬弧瓒虫潯浠跺悗锛岃绯荤粺鑷姩鍙栨秷鐨勫厔寮熶换鍔★紙deleteReason 闈炵┖锛�
+ .filter(task -> task.getDeleteReason() == null)
+ .max(Comparator.comparing(HistoricTaskInstance::getEndTime))
+ .orElse(null);
+ if (lastTask != null) {
+ if (StrUtil.isEmpty(reason) && lastTask.getTaskLocalVariables() != null) {
+ reason = (String) lastTask.getTaskLocalVariables().get(BpmnVariableConstants.TASK_VARIABLE_REASON);
+ }
+ if (StrUtil.isNotEmpty(lastTask.getAssignee())) {
+ try {
+ auditUserId = Long.parseLong(lastTask.getAssignee());
+ } catch (NumberFormatException ignored) {
+ log.warn("[onEvent] 瀹℃壒浜�({}) 涓嶆槸鏈夋晥鐨勭敤鎴风紪鍙�", lastTask.getAssignee());
+ }
+ }
+ }
+ }
+ }
+
+ log.info("[onEvent] 鏀跺埌BPM瀹℃壒浜嬩欢锛宮psId={}, status={}, reason={}, auditUserId={}",
+ mpsId, event.getStatus(), reason, auditUserId);
+ mpsService.handleBpmProcessResult(mpsId, event.getStatus(), reason, auditUserId);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
index 100627f..036131c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -19,6 +20,8 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -32,6 +35,9 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -54,6 +60,8 @@
private MesWmTransactionService wmTransactionService;
@Resource
private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesMdItemService itemService;
@Resource
private MesWmWarehouseService warehouseService;
@Resource
@@ -139,11 +147,81 @@
throw exception(WM_PRODUCT_RECPT_STATUS_ERROR);
}
+ // 鏍¢獙涓婃灦鏄庣粏宸茶鐩栨瘡涓�琛屾敹璐ф暟閲忥細鐘舵�佷竴鏃︽帹杩涘埌銆屽緟鎵ц鍏ュ簱銆嶏紝鏄庣粏灏变笉鑳藉啀缂栬緫锛�
+ // 鑻ユ鏃舵槑缁嗕负绌烘垨鏁伴噺涓嶈冻锛屽崟鎹皢姘歌繙鏃犳硶鎵ц鍏ュ簱锛堜細琚崱姝诲湪寰呮墽琛屽叆搴擄級
+ validateProductReceiptStockDetail(receipt);
+
// 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
productReceiptMapper.updateById(new MesWmProductReceiptDO()
.setId(id).setStatus(MesWmProductReceiptStatusEnum.APPROVED.getStatus()));
}
+ /**
+ * 鏍¢獙鎵ц涓婃灦鍓嶇殑涓婃灦鏄庣粏锛氭瘡涓�琛岀殑鏀惰揣鏁伴噺閮藉繀椤昏璇ヨ鐨勪笂鏋舵槑缁嗗悎璁¤鐩�
+ *
+ * 鎻愮ず鎸夈�屽叿浣撹 + 鍙屾柟鏁伴噺 + 涓嬩竴姝ュ姩浣溿�嶇粍缁囷紝閬垮厤鍙姤涓�鍙ョ缁熺殑"鏁伴噺涓嶅尮閰�"
+ */
+ private void validateProductReceiptStockDetail(MesWmProductReceiptDO receipt) {
+ List<MesWmProductReceiptLineDO> lines = productReceiptLineService.getProductReceiptLineListByRecptId(receipt.getId());
+ if (CollUtil.isEmpty(lines)) {
+ throw new ServiceException(WM_PRODUCT_RECPT_NO_LINE.getCode(),
+ String.format("鏀惰揣鍗昜%s]娌℃湁鏀惰揣琛岋紝鏃犳硶鎵ц涓婃灦锛氳鍏堝湪鍗曟嵁涓坊鍔犳敹璐ц锛堢墿鏂欎笌鏀惰揣鏁伴噺锛夊悗鍐嶆墽琛屼笂鏋躲��",
+ receipt.getCode()));
+ }
+ Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(lines.stream()
+ .map(MesWmProductReceiptLineDO::getItemId).filter(Objects::nonNull).collect(Collectors.toSet()));
+ for (int i = 0; i < lines.size(); i++) {
+ MesWmProductReceiptLineDO line = lines.get(i);
+ String lineLabel = String.format("绗� %d 琛孾%s]", i + 1, formatItemLabel(line.getItemId(), itemMap));
+ if (line.getBatchCode() != null) {
+ lineLabel += String.format("锛堟壒娆%s]锛�", line.getBatchCode());
+ }
+ BigDecimal lineQuantity = line.getQuantity() == null ? BigDecimal.ZERO : line.getQuantity();
+ List<MesWmProductReceiptDetailDO> details =
+ productReceiptDetailService.getProductReceiptDetailListByLineId(line.getId());
+ // 鏄庣粏涓虹┖鏃剁洿鎺ユ彁绀�"鍘荤偣涓婃灦"锛屾瘮鎻愮ず"鍚堣 0 涓� 20 涓嶄竴鑷�"鏇存槑纭�
+ if (CollUtil.isEmpty(details)) {
+ throw new ServiceException(WM_PRODUCT_RECPT_NO_DETAIL.getCode(),
+ String.format("鏀惰揣鍗昜%s]%s杩樻病鏈変笂鏋舵槑缁嗭紙鏀惰揣鏁伴噺[%s]锛夛細璇峰厛鍦ㄨ琛岀偣銆屼笂鏋躲�嶏紝濉啓鍏ュ簱浠撳簱涓庝笂鏋舵暟閲忥紝"
+ + "鍚堣濉弧 %s 鍚庡啀鎵ц涓婃灦銆�", receipt.getCode(), lineLabel,
+ formatQuantity(lineQuantity), formatQuantity(lineQuantity)));
+ }
+ BigDecimal detailQuantity = CollectionUtils.getSumValue(details,
+ MesWmProductReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
+ if (detailQuantity.compareTo(lineQuantity) != 0) {
+ BigDecimal diff = lineQuantity.subtract(detailQuantity);
+ String action = diff.signum() > 0
+ ? String.format("杩樺樊[%s]锛氳鍦ㄨ琛岀偣銆屼笂鏋躲�嶈ˉ鐧荤己灏戠殑涓婃灦鏄庣粏", formatQuantity(diff))
+ : String.format("澶氬嚭[%s]锛氳鍒犻櫎鎴栬皟鏁磋琛屽浣欑殑涓婃灦鏄庣粏", formatQuantity(diff.negate()));
+ throw new ServiceException(WM_PRODUCT_RECPT_DETAIL_QUANTITY_MISMATCH.getCode(),
+ String.format("鏀惰揣鍗昜%s]%s涓婃灦鏄庣粏鍚堣[%s]涓庢敹璐ф暟閲廩%s]涓嶄竴鑷达紝%s锛岃皟鏁翠竴鑷村悗鍐嶆墽琛屼笂鏋躲��",
+ receipt.getCode(), lineLabel, formatQuantity(detailQuantity),
+ formatQuantity(lineQuantity), action));
+ }
+ }
+ }
+
+ /**
+ * 鏁伴噺鏄剧ず锛氬幓鎺夋暟鎹簱 scale 甯﹀嚭鐨勫浣� 0锛�20.000000 鈫� 20锛�
+ */
+ private String formatQuantity(BigDecimal quantity) {
+ if (quantity == null) {
+ return "0";
+ }
+ return quantity.stripTrailingZeros().toPlainString();
+ }
+
+ /**
+ * 鐗╂枡鏄剧ず鍚嶏細浼樺厛銆屽悕绉�/缂栫爜銆嶏紝鏌ヤ笉鍒版椂鍥為��涓� ID锛岄伩鍏嶆妸瑁� ID 鐩存帴鎶涚粰鐢ㄦ埛
+ */
+ private String formatItemLabel(Long itemId, Map<Long, MesMdItemDO> itemMap) {
+ MesMdItemDO item = itemId == null ? null : itemMap.get(itemId);
+ if (item == null) {
+ return itemId == null ? "鐗╂枡[鏈�夋嫨]" : String.format("鐗╂枡[ID=%s]", itemId);
+ }
+ return String.format("%s/%s", item.getName(), item.getCode());
+ }
+
@Override
public Boolean checkProductReceiptQuantity(Long id) {
List<MesWmProductReceiptLineDO> lines = productReceiptLineService.getProductReceiptLineListByRecptId(id);
--
Gitblit v1.9.3