From b5e1bceabb36fe1d1e5e88397280d12e7044c6dd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 15:32:31 +0800
Subject: [PATCH] 完善设备采集、安全管理及采购业务
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 115 insertions(+), 16 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 e02cb8a..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;
@@ -24,11 +25,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -150,21 +147,54 @@
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> outputItemIds = convertSet(list, MesProRouteProcessDO::getOutputItemId);
- outputItemIds.remove(null);
- Map<Long, MesMdItemDO> outputItemMap = outputItemIds.isEmpty()
- ? Collections.emptyMap()
- : mdItemService.getItemMap(outputItemIds);
- // 3. 鎷兼帴 VO
- return BeanUtils.toBean(list, MesProRouteProcessRespVO.class, vo -> {
+ // 2. 瑙ｆ瀽浜у嚭閰嶇疆锛圝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 = 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()));
- MapUtils.findAndThen(outputItemMap, vo.getOutputItemId(),
- item -> vo.setOutputItemCode(item.getCode()).setOutputItemName(item.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;
}
private MesProRouteProcessRespVO buildRouteProcessRespVO(MesProRouteProcessDO routeProcess) {
@@ -174,4 +204,73 @@
return buildRouteProcessRespVOList(ListUtil.of(routeProcess)).get(0);
}
+ /**
+ * 瑙ｆ瀽 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) {
+ // 瑙ｆ瀽澶辫触鎸夐�楀彿鍏滃簳
+ 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());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3