From 2756f7581ad6743ff796670a26787b85b8aaa2b2 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 12:58:50 +0800
Subject: [PATCH] fix(mes): 修复工艺路线【本工序产出】保存不生效 - 后端补齐 outputs 字段与 JSON 存储/解析

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java                   |   54 +++++++-
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java           |  140 +++++++++++++++++-----
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java                              |    5 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java                            |    9 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java    |    3 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java |    3 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java              |    7 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/util/MesOutputItemUtils.java                                           |   77 ++++++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProProcessOutputItemVO.java   |   37 ++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java   |   16 +-
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java       |    7 +
 11 files changed, 296 insertions(+), 62 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
index 1bc0813..49b6f05 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
@@ -6,6 +6,7 @@
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessBomItemVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessOutputItemVO;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
@@ -146,48 +147,52 @@
         list.forEach(item -> { if (item.getNextProcessId() != null) processIds.add(item.getNextProcessId()); });
         Map<Long, MesProProcessDO> processMap = convertMap(
                 processService.getProcessList(new ArrayList<>(processIds)), MesProProcessDO::getId);
-        // 2. 鎵归噺鑾峰彇浜у嚭浜у搧鐗╂枡淇℃伅锛堣В鏋愰�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
-        Set<Long> allOutputItemIds = new HashSet<>();
-        Map<Long, List<Long>> voOutputItemIdsMap = new HashMap<>();
-        for (int i = 0; i < list.size(); i++) {
-            String outputItemIdStr = list.get(i).getOutputItemId();
-            if (outputItemIdStr != null && !outputItemIdStr.isBlank()) {
-                List<Long> ids = Arrays.stream(outputItemIdStr.split(","))
-                        .map(String::trim).filter(s -> !s.isEmpty())
-                        .map(Long::valueOf).collect(Collectors.toList());
-                voOutputItemIdsMap.put((long) i, ids);
-                allOutputItemIds.addAll(ids);
+        // 2. 瑙f瀽浜у嚭閰嶇疆锛圝SON 鏁扮粍 鎴� 鏃х殑閫楀彿鍒嗛殧锛夛紝鏀堕泦鍏ㄩ儴鐗╂枡/浜у搧缂栧彿
+        List<List<MesProProcessOutputItemVO>> outputsPerRow = new ArrayList<>();
+        Set<Long> allItemIds = new HashSet<>();
+        for (MesProRouteProcessDO row : list) {
+            List<MesProProcessOutputItemVO> outs = parseOutputsRaw(row.getOutputItemId());
+            outputsPerRow.add(outs);
+            for (MesProProcessOutputItemVO out : outs) {
+                if (out.getItemId() != null) {
+                    allItemIds.add(out.getItemId());
+                }
+                if (out.getProductId() != null) {
+                    allItemIds.add(out.getProductId());
+                }
             }
         }
-        Map<Long, MesMdItemDO> outputItemMap = allOutputItemIds.isEmpty()
-                ? Collections.emptyMap() : mdItemService.getItemMap(allOutputItemIds);
-        // 3. 鎷兼帴 VO
-        List<MesProRouteProcessRespVO> result = BeanUtils.toBean(list, MesProRouteProcessRespVO.class);
+        Map<Long, MesMdItemDO> outputItemMap = allItemIds.isEmpty()
+                ? Collections.emptyMap() : mdItemService.getItemMap(allItemIds);
+        // 3. 鎷兼帴 VO锛堝厛鎶� output_item_id 缃┖锛岄伩鍏� String 杞� Long 鎶� NumberFormatException锛涗骇鍑哄崟鐙~鍏咃級
+        List<MesProRouteProcessDO> safeList = BeanUtils.toBean(list, MesProRouteProcessDO.class);
+        safeList.forEach(row -> row.setOutputItemId(null));
+        List<MesProRouteProcessRespVO> result = BeanUtils.toBean(safeList, MesProRouteProcessRespVO.class);
         for (int i = 0; i < result.size(); i++) {
             MesProRouteProcessRespVO vo = result.get(i);
             MapUtils.findAndThen(processMap, vo.getProcessId(),
                     process -> vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
             MapUtils.findAndThen(processMap, vo.getNextProcessId(),
                     nextProcess -> vo.setNextProcessName(nextProcess.getName()));
-            // 浜у嚭浜у搧锛堟敮鎸佸閫夛級
-            List<Long> ids = voOutputItemIdsMap.getOrDefault((long) i, Collections.emptyList());
-            if (!ids.isEmpty()) {
-                vo.setOutputItemIds(ids);
-                List<String> names = ids.stream()
-                        .map(id -> {
-                            MesMdItemDO item = outputItemMap.get(id);
-                            return item != null ? item.getName() : String.valueOf(id);
-                        }).collect(Collectors.toList());
-                vo.setOutputItemNames(String.join(", ", names));
-                // 鍚戝悗鍏煎锛氱涓�涓骇鍑轰骇鍝�
-                Long firstId = ids.get(0);
-                vo.setOutputItemId(firstId);
-                MesMdItemDO firstItem = outputItemMap.get(firstId);
-                if (firstItem != null) {
-                    vo.setOutputItemCode(firstItem.getCode());
-                    vo.setOutputItemName(firstItem.getName());
-                }
+            // 浜у嚭鐗╂枡锛堟敮鎸佸閫夛紝鍚綊灞炰骇鍝侊級
+            List<MesProProcessOutputItemVO> outs = outputsPerRow.get(i);
+            for (MesProProcessOutputItemVO out : outs) {
+                fillOutputItemInfo(out, outputItemMap);
             }
+            if (!outs.isEmpty()) {
+                List<Long> ids = outs.stream().map(MesProProcessOutputItemVO::getItemId)
+                        .filter(Objects::nonNull).collect(Collectors.toList());
+                vo.setOutputItemIds(ids);
+                vo.setOutputItemNames(outs.stream().map(MesProProcessOutputItemVO::getItemName)
+                        .filter(Objects::nonNull).collect(Collectors.joining(", ")));
+                // 鍚戝悗鍏煎锛氱涓�涓骇鍑虹墿鏂�
+                MesProProcessOutputItemVO first = outs.get(0);
+                vo.setOutputItemId(first.getItemId());
+                vo.setOutputItemCode(first.getItemCode());
+                vo.setOutputItemName(first.getItemName());
+            }
+            // 鍓嶇涓荤敤锛歰utputs锛堝惈褰掑睘浜у搧锛�
+            vo.setOutputs(outs);
         }
         return result;
     }
@@ -199,4 +204,73 @@
         return buildRouteProcessRespVOList(ListUtil.of(routeProcess)).get(0);
     }
 
+    /**
+     * 瑙f瀽 output_item_id 涓轰骇鍑洪厤缃垪琛紙涓嶅惈鍚嶇О锛�
+     * 鍏煎 JSON 鏁扮粍 [{"itemId":231,"productId":231}] 涓庨�楀彿鍒嗛殧 "231,232" 涓ょ鏍煎紡
+     */
+    private List<MesProProcessOutputItemVO> parseOutputsRaw(String raw) {
+        List<MesProProcessOutputItemVO> result = new ArrayList<>();
+        if (raw == null || raw.isBlank()) {
+            return result;
+        }
+        String text = raw.trim();
+        if (text.startsWith("[")) {
+            try {
+                cn.hutool.json.JSONArray array = cn.hutool.json.JSONUtil.parseArray(text);
+                for (Object element : array) {
+                    if (!(element instanceof cn.hutool.json.JSONObject)) {
+                        continue;
+                    }
+                    cn.hutool.json.JSONObject m = (cn.hutool.json.JSONObject) element;
+                    Long itemId = m.getLong("itemId");
+                    if (itemId == null) {
+                        continue;
+                    }
+                    MesProProcessOutputItemVO vo = new MesProProcessOutputItemVO();
+                    vo.setItemId(itemId);
+                    vo.setProductId(m.getLong("productId"));
+                    result.add(vo);
+                }
+                return result;
+            } catch (Exception ignored) {
+                // 瑙f瀽澶辫触鎸夐�楀彿鍏滃簳
+                result.clear();
+            }
+        }
+        for (String s : text.split(",")) {
+            String t = s.trim();
+            if (t.isEmpty()) {
+                continue;
+            }
+            try {
+                MesProProcessOutputItemVO vo = new MesProProcessOutputItemVO();
+                vo.setItemId(Long.valueOf(t));
+                result.add(vo);
+            } catch (NumberFormatException ignored) {
+                // 璺宠繃闈炴硶鍊�
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 濉厖浜у嚭鐗╂枡鐨勭紪鐮併�佸悕绉颁笌褰掑睘浜у搧鍚嶇О
+     */
+    private void fillOutputItemInfo(MesProProcessOutputItemVO vo, Map<Long, MesMdItemDO> itemMap) {
+        if (vo.getItemId() == null) {
+            return;
+        }
+        MesMdItemDO item = itemMap.get(vo.getItemId());
+        if (item != null) {
+            vo.setItemCode(item.getCode());
+            vo.setItemName(item.getName());
+        }
+        if (vo.getProductId() != null) {
+            MesMdItemDO product = itemMap.get(vo.getProductId());
+            if (product != null) {
+                vo.setProductName(product.getName());
+            }
+        }
+    }
+
 }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProProcessOutputItemVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProProcessOutputItemVO.java
new file mode 100644
index 0000000..59257ab
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProProcessOutputItemVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 宸ュ簭浜у嚭鐗╂枡褰掑睘 VO
+ *
+ * 涓�涓伐搴忓彲浠ヤ骇鍑哄涓墿鏂欙紝姣忎釜鐗╂枡鍙綊灞炲埌鏌愪釜浜у搧锛堟垨銆岄�氱敤銆嶏級銆�
+ * 涓庡墠绔� RouteOutputAttribution 缁勪欢鐨� { itemId, productId } 缁撴瀯瀵瑰簲銆�
+ */
+@Schema(description = "宸ュ簭浜у嚭鐗╂枡褰掑睘 VO")
+@Data
+public class MesProProcessOutputItemVO {
+
+    @Schema(description = "浜у嚭鐗╂枡缂栧彿", example = "231")
+    private Long itemId;
+
+    @Schema(description = "浜у嚭鐗╂枡缂栫爜", example = "ITEM_20261102008")
+    private String itemCode;
+
+    @Schema(description = "浜у嚭鐗╂枡鍚嶇О", example = "閽㈢粸绾�")
+    private String itemName;
+
+    @Schema(description = "褰掑睘浜у搧缂栧彿锛涗负绌鸿〃绀哄浜у搧閫氱敤", example = "231")
+    private Long productId;
+
+    @Schema(description = "褰掑睘浜у搧鍚嶇О")
+    private String productName;
+
+    @Schema(description = "鎺掑簭", example = "1")
+    private Integer sort;
+
+    @Schema(description = "澶囨敞")
+    private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java
index ce2aee4..98574ac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java
@@ -83,6 +83,9 @@
     @Schema(description = "宸ュ簭鎶曟枡BOM鍒楄〃")
     private List<MesProProcessBomItemVO> bomItems;
 
+    @Schema(description = "浜у嚭鐗╂枡褰掑睘閰嶇疆锛堝惈褰掑睘浜у搧锛�")
+    private List<MesProProcessOutputItemVO> outputs;
+
     @Schema(description = "鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java
index 400d5a5..b341318 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java
@@ -54,6 +54,9 @@
     @Schema(description = "浜у嚭浜у搧鐗╂枡缂栧彿鍒楄〃锛堝閫夛紝涓虹┖鏃堕粯璁ょ敤宸ュ崟鎴愬搧锛�", example = "[100, 101]")
     private List<Long> outputItemIds;
 
+    @Schema(description = "浜у嚭鐗╂枡褰掑睘閰嶇疆锛堝惈褰掑睘浜у搧锛屽墠绔富鐢級")
+    private List<MesProProcessOutputItemVO> outputs;
+
     @Schema(description = "澶囨敞")
     private String remark;
 
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 5bc87c5..ea38de0 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
@@ -30,6 +30,7 @@
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.util.MesOutputItemUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -251,7 +252,11 @@
                     items.add(bom);
                 }
             }
-            processBomMap.put(Long.valueOf(process.getOutputItemId().split(",")[0].trim()), items);
+            Long outputItemId = MesOutputItemUtils.firstItemId(process.getOutputItemId());
+            if (outputItemId == null) {
+                continue;
+            }
+            processBomMap.put(outputItemId, items);
         }
 
         // 2. 鍙栨渶鍚庝竴閬撳伐搴忥紙sort 鏈�澶э級浣滀负灞曞紑璧风偣锛岄�愬眰鍚戝墠閫掓帹
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
index 1cb8944..cfc2b18 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
@@ -18,6 +18,7 @@
 import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
+import cn.iocoder.yudao.module.mes.util.MesOutputItemUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -135,15 +136,12 @@
         processIds.addAll(nextProcessIds);
         Map<Long, MesProProcessDO> processMap = CollUtil.isNotEmpty(processIds)
                 ? processService.getProcessMap(processIds) : Collections.emptyMap();
-        // 鑾峰彇浜у嚭鐗╂枡锛堣В鏋愰�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
+        // 鑾峰彇浜у嚭鐗╂枡锛堝吋瀹� JSON 褰掑睘閰嶇疆涓庢棫閫楀彿鍒嗛殧鏍煎紡锛�
         Set<Long> allOutputItemIds = new HashSet<>();
         Map<Long, List<Long>> voOutputItemIdsMap = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
-            String outputItemIdStr = list.get(i).getOutputItemId();
-            if (outputItemIdStr != null && !outputItemIdStr.isBlank()) {
-                List<Long> ids = Arrays.stream(outputItemIdStr.split(","))
-                        .map(String::trim).filter(s -> !s.isEmpty())
-                        .map(Long::valueOf).collect(Collectors.toList());
+            List<Long> ids = MesOutputItemUtils.parseItemIds(list.get(i).getOutputItemId());
+            if (!ids.isEmpty()) {
                 voOutputItemIdsMap.put((long) i, ids);
                 allOutputItemIds.addAll(ids);
             }
@@ -175,8 +173,10 @@
             });
         }));
 
-        // 3. 鎷兼帴 VO
-        List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class);
+        // 3. 鎷兼帴 VO锛堝厛缃┖ output_item_id锛岄伩鍏� String 杞� Long 寮傚父锛涗骇鍑轰笅闈㈠崟鐙~鍏咃級
+        List<MesProWorkOrderProcessDO> safeList = BeanUtils.toBean(list, MesProWorkOrderProcessDO.class);
+        safeList.forEach(row -> row.setOutputItemId(null));
+        List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(safeList, MesProWorkOrderProcessRespVO.class);
         for (int i = 0; i < result.size(); i++) {
             MesProWorkOrderProcessRespVO vo = result.get(i);
             MapUtils.findAndThen(processMap, vo.getProcessId(), process -> {
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 b68c0de..dc8064d 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
@@ -30,6 +30,7 @@
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
+import cn.iocoder.yudao.module.mes.util.MesOutputItemUtils;
 import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -576,9 +577,7 @@
             process.setCheckFlag(rp.getCheckFlag());
             process.setBackflushFlag(rp.getBackflushFlag());
             if (rp.getOutputItemId() != null && !rp.getOutputItemId().isBlank()) {
-                process.setOutputItemIds(Arrays.stream(rp.getOutputItemId().split(","))
-                        .map(String::trim).filter(s -> !s.isEmpty())
-                        .map(Long::valueOf).collect(Collectors.toList()));
+                process.setOutputItemIds(MesOutputItemUtils.parseItemIds(rp.getOutputItemId()));
             }
             process.setColorCode(rp.getColorCode());
             // 甯﹀叆宸ュ簭鎶曟枡BOM
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 4957169..a7459be 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessOutputItemVO;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
@@ -14,9 +15,11 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -63,12 +66,8 @@
 
         // 2. 鎻掑叆
         MesProRouteProcessDO routeProcess = BeanUtils.toBean(createReqVO, MesProRouteProcessDO.class);
-        if (CollUtil.isNotEmpty(createReqVO.getOutputItemIds())) {
-            routeProcess.setOutputItemId(
-                createReqVO.getOutputItemIds().stream()
-                    .map(String::valueOf)
-                    .collect(Collectors.joining(",")));
-        }
+        // 浜у嚭閰嶇疆锛堝惈褰掑睘浜у搧锛夊簭鍒楀寲涓� JSON 瀛樺叆 output_item_id锛涘吋瀹规棫鐨� outputItemIds 骞抽摵鏍煎紡
+        routeProcess.setOutputItemId(serializeOutputs(createReqVO.getOutputs(), createReqVO.getOutputItemIds()));
         routeProcessMapper.insert(routeProcess);
 
         // 3. 鏇存柊宸ュ簭閾�
@@ -98,11 +97,10 @@
 
         // 2. 鏇存柊
         MesProRouteProcessDO updateObj = BeanUtils.toBean(updateReqVO, MesProRouteProcessDO.class);
-        if (CollUtil.isNotEmpty(updateReqVO.getOutputItemIds())) {
-            updateObj.setOutputItemId(
-                updateReqVO.getOutputItemIds().stream()
-                    .map(String::valueOf)
-                    .collect(Collectors.joining(",")));
+        // 浜у嚭閰嶇疆锛氬彧瑕佸墠绔樉寮忎紶浜� outputs / outputItemIds 灏辫鐩栵紙浼犵┖鏁扮粍琛ㄧず娓呯┖锛�
+        if (updateReqVO.getOutputs() != null || updateReqVO.getOutputItemIds() != null) {
+            String serialized = serializeOutputs(updateReqVO.getOutputs(), updateReqVO.getOutputItemIds());
+            updateObj.setOutputItemId(serialized == null ? "" : serialized);
         }
         routeProcessMapper.updateById(updateObj);
 
@@ -245,4 +243,38 @@
         routeProcessMapper.deleteByRouteId(routeId);
     }
 
+    /**
+     * 浜у嚭閰嶇疆搴忓垪鍖栧埌 output_item_id 瀛楁锛圝SON 鏁扮粍锛�
+     * 鏍煎紡锛歔{"itemId":231,"productId":231}]
+     */
+    private String serializeOutputs(List<MesProProcessOutputItemVO> outputs, List<Long> outputItemIds) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (CollUtil.isNotEmpty(outputs)) {
+            for (MesProProcessOutputItemVO vo : outputs) {
+                if (vo == null || vo.getItemId() == null) {
+                    continue;
+                }
+                Map<String, Object> m = new LinkedHashMap<>();
+                m.put("itemId", vo.getItemId());
+                if (vo.getProductId() != null) {
+                    m.put("productId", vo.getProductId());
+                }
+                list.add(m);
+            }
+        } else if (CollUtil.isNotEmpty(outputItemIds)) {
+            for (Long id : outputItemIds) {
+                if (id == null) {
+                    continue;
+                }
+                Map<String, Object> m = new LinkedHashMap<>();
+                m.put("itemId", id);
+                list.add(m);
+            }
+        }
+        if (list.isEmpty()) {
+            return null;
+        }
+        return cn.hutool.json.JSONUtil.toJsonStr(list);
+    }
+
 }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
index 88956ea..a518bc7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
@@ -36,6 +36,7 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderParamRecordService;
+import cn.iocoder.yudao.module.mes.util.MesOutputItemUtils;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -151,8 +152,9 @@
             MesProRouteProcessDO routeProcess = routeProcessService
                     .getRouteProcessByRouteIdAndProcessId(createReqVO.getRouteId(), createReqVO.getProcessId());
             if (routeProcess != null && routeProcess.getOutputItemId() != null) {
-                itemId = Long.valueOf(routeProcess.getOutputItemId().split(",")[0].trim());
-            } else {
+                itemId = MesOutputItemUtils.firstItemId(routeProcess.getOutputItemId());
+            }
+            if (itemId == null) {
                 itemId = workOrder.getProductId();
             }
         }
@@ -563,7 +565,8 @@
         List<Long> taskIds = new java.util.ArrayList<>();
         for (MesProRouteProcessDO rp : routeProcesses) {
             cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO proc = procMap.get(rp.getProcessId());
-            Long itemId = rp.getOutputItemId() != null ? Long.valueOf(rp.getOutputItemId().split(",")[0].trim()) : workOrder.getProductId();
+            Long outputItemId = rp.getOutputItemId() != null ? MesOutputItemUtils.firstItemId(rp.getOutputItemId()) : null;
+        Long itemId = outputItemId != null ? outputItemId : workOrder.getProductId();
             cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO item = itemService.validateItemExists(itemId);
             MesProTaskDO task = new MesProTaskDO()
                     .setWorkOrderId(workOrder.getId())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
index 936c385..c32c99d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
@@ -22,6 +22,7 @@
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
 import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
 import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;
+import cn.iocoder.yudao.module.mes.util.MesOutputItemUtils;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -252,9 +253,9 @@
                     }
                     Long itemId = order.getProductId();
                     if (process.getOutputItemId() != null && !process.getOutputItemId().isBlank()) {
-                        String[] output = process.getOutputItemId().split(",");
-                        if (output.length != 1) throw new IllegalArgumentException("澶氫骇鍑哄伐搴忚浣跨敤鎵嬪伐鎺掍骇纭鍚勪骇鍑烘暟閲�");
-                        itemId = Long.valueOf(output[0].trim());
+                        List<Long> outputIds = MesOutputItemUtils.parseItemIds(process.getOutputItemId());
+                        if (outputIds.size() != 1) throw new IllegalArgumentException("澶氫骇鍑哄伐搴忚浣跨敤鎵嬪伐鎺掍骇纭鍚勪骇鍑烘暟閲�");
+                        itemId = outputIds.get(0);
                     }
                     var item = itemService.validateItemExists(itemId);
                     if (!Objects.equals(item.getStatus(), 0)) throw new IllegalArgumentException("宸ュ簭浜у嚭浜у搧宸插仠鐢�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/util/MesOutputItemUtils.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/util/MesOutputItemUtils.java
new file mode 100644
index 0000000..7b08d97
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/util/MesOutputItemUtils.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.mes.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MES 宸ュ簭浜у嚭鐗╂枡閰嶇疆瑙f瀽宸ュ叿
+ *
+ * <p>mes_pro_route_process.output_item_id / mes_pro_work_order_process.output_item_id 瀛楁
+ * 鍚屾椂鍏煎涓ょ瀛樺偍鏍煎紡锛�
+ * <ul>
+ *     <li>鏂版牸寮忥紙鍚綊灞炰骇鍝侊級锛歔{"itemId":231,"productId":231}]</li>
+ *     <li>鏃ф牸寮忥紙绾墿鏂欑紪鍙凤紝閫楀彿鍒嗛殧锛夛細231,232</li>
+ * </ul>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class MesOutputItemUtils {
+
+    private MesOutputItemUtils() {
+    }
+
+    /**
+     * 瑙f瀽瀛楁涓殑鍏ㄩ儴浜у嚭鐗╂枡缂栧彿锛堜笉鍚綊灞炰骇鍝侊級
+     */
+    public static List<Long> parseItemIds(String raw) {
+        List<Long> ids = new ArrayList<>();
+        if (raw == null || raw.isBlank()) {
+            return ids;
+        }
+        String text = raw.trim();
+        if (text.startsWith("[")) {
+            try {
+                JSONArray array = JSONUtil.parseArray(text);
+                for (Object element : array) {
+                    if (!(element instanceof JSONObject)) {
+                        continue;
+                    }
+                    Long itemId = ((JSONObject) element).getLong("itemId");
+                    if (itemId != null) {
+                        ids.add(itemId);
+                    }
+                }
+                return ids;
+            } catch (Exception ignored) {
+                // 瑙f瀽澶辫触鎸夐�楀彿鍒嗛殧鍏滃簳
+                ids.clear();
+            }
+        }
+        for (String s : text.split(",")) {
+            String t = s.trim();
+            if (t.isEmpty()) {
+                continue;
+            }
+            try {
+                ids.add(Long.valueOf(t));
+            } catch (NumberFormatException ignored) {
+                // 璺宠繃闈炴硶鍊�
+            }
+        }
+        return ids;
+    }
+
+    /**
+     * 鍙栫涓�涓骇鍑虹墿鏂欑紪鍙凤紝瑙f瀽涓嶅埌杩斿洖 null
+     */
+    public static Long firstItemId(String raw) {
+        List<Long> ids = parseItemIds(raw);
+        return CollUtil.isEmpty(ids) ? null : ids.get(0);
+    }
+
+}

--
Gitblit v1.9.3