From cea8396d93b31fe6037a0558febcabb2169363a8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 14:02:25 +0800
Subject: [PATCH] feat(wm): 入库单和领料单支持手工填写关联信息
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
index 3164436..e71c958 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
@@ -90,13 +90,16 @@
// 1. 鏍￠獙鍏宠仈鏁版嵁
validateProductIssueSaveData(createReqVO);
- // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId
- MesProTaskDO task = taskService.validateTaskExists(createReqVO.getTaskId());
- if (createReqVO.getWorkOrderId() == null) {
- createReqVO.setWorkOrderId(task.getWorkOrderId());
- }
- if (createReqVO.getWorkstationId() == null) {
- createReqVO.setWorkstationId(task.getWorkstationId());
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId锛�
+ // 鐢熶骇浠诲姟鏀逛负鍙�夛細鎵嬪～鍗曟嵁涓嶄紶 taskId锛屽伐鍗曚笌宸ヤ綔绔欑敱浜哄伐濉啓锛屼笉鑷姩甯﹀叆
+ if (createReqVO.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(createReqVO.getTaskId());
+ if (createReqVO.getWorkOrderId() == null) {
+ createReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (createReqVO.getWorkstationId() == null) {
+ createReqVO.setWorkstationId(task.getWorkstationId());
+ }
}
// 3. 鎻掑叆涓昏〃
@@ -114,13 +117,16 @@
// 1.2 鏍￠獙鍏宠仈鏁版嵁
validateProductIssueSaveData(updateReqVO);
- // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId
- MesProTaskDO task = taskService.validateTaskExists(updateReqVO.getTaskId());
- if (updateReqVO.getWorkOrderId() == null) {
- updateReqVO.setWorkOrderId(task.getWorkOrderId());
- }
- if (updateReqVO.getWorkstationId() == null) {
- updateReqVO.setWorkstationId(task.getWorkstationId());
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId锛�
+ // 鐢熶骇浠诲姟鏀逛负鍙�夛細鎵嬪～鍗曟嵁涓嶄紶 taskId锛屽伐鍗曚笌宸ヤ綔绔欑敱浜哄伐濉啓锛屼笉鑷姩甯﹀叆
+ if (updateReqVO.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(updateReqVO.getTaskId());
+ if (updateReqVO.getWorkOrderId() == null) {
+ updateReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (updateReqVO.getWorkstationId() == null) {
+ updateReqVO.setWorkstationId(task.getWorkstationId());
+ }
}
// 3. 鏇存柊涓昏〃
@@ -398,12 +404,17 @@
*/
private void validateProductIssueSaveData(MesWmProductIssueSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙 task 瀛樺湪
- MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
- // 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
- Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
- if (workOrderId != null) {
- workOrderService.validateWorkOrderConfirmed(workOrderId);
+ // 鐢熶骇浠诲姟鏀逛负鍙�夛細浼犱簡鎵嶆牎楠屼换鍔″瓨鍦紝骞舵寜浠诲姟甯﹀嚭鐨勫伐鍗曟牎楠屽凡纭
+ if (reqVO.getTaskId() != null) {
+ MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
+ // 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
+ Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
+ if (workOrderId != null) {
+ workOrderService.validateWorkOrderConfirmed(workOrderId);
+ }
+ } else if (reqVO.getWorkOrderId() != null) {
+ // 娌′紶 taskId 浣嗕紶浜� workOrderId锛屼粛鏍￠獙宸ュ崟宸茬‘璁�
+ workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
}
if (reqVO.getWorkstationId() != null) {
workstationService.validateWorkstationExistsAndEnable(reqVO.getWorkstationId());
--
Gitblit v1.9.3