From 569df4daf76eb586f1add62707d0ffa2b7ff20f2 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 04 九月 2026 13:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
index 816d104..4957169 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
@@ -27,7 +27,7 @@
/**
* MES 宸ヨ壓璺嚎宸ュ簭 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -81,8 +81,14 @@
public void updateRouteProcess(MesProRouteProcessSaveReqVO updateReqVO) {
// 1.0 宸插惎鐢ㄧ殑宸ヨ壓璺嚎锛屼笉鍏佽鎿嶄綔
routeService.validateRouteNotEnable(updateReqVO.getRouteId());
- // 1.1 鏍￠獙瀛樺湪
- validateRouteProcessExists(updateReqVO.getId());
+ // 1.1 鏍￠獙瀛樺湪锛涢儴鍒嗘洿鏂帮紙濡備粎璋冩暣浜у嚭浜у搧锛夋椂鏈紶鐨勫繀濉瓧娈电敤鐜版湁鍊煎洖濉�
+ MesProRouteProcessDO existing = validateRouteProcessExists(updateReqVO.getId());
+ if (updateReqVO.getProcessId() == null) {
+ updateReqVO.setProcessId(existing.getProcessId());
+ }
+ if (updateReqVO.getSort() == null) {
+ updateReqVO.setSort(existing.getSort());
+ }
// 1.2 鏍￠獙宸ヨ壓璺嚎銆佸伐搴忓瓨鍦�
validateRouteAndProcessExists(updateReqVO.getRouteId(), updateReqVO.getProcessId());
// 1.3 鏍￠獙鍞竴鎬�
--
Gitblit v1.9.3