From bc31cda78817c62aa552be40f39eccaa03262923 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:22 +0800
Subject: [PATCH] feat: 补齐排产约束与缺料校验，新增风险监测，优化隐患通知与招投标联动
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 148 insertions(+), 19 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 8c8d2fd..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
@@ -5,11 +5,14 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
@@ -22,11 +25,8 @@
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;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -78,14 +78,41 @@
return success(buildRouteProcessRespVO(routeProcess));
}
- // TODO @鑺嬭壙锛氬埌搴曞彨 list-by-item 杩樻槸 list-by-product锛�
@GetMapping("/list-by-product")
- @Operation(summary = "鎸変骇鍝佽幏寰楀伐搴忓垪琛�", description = "鏍规嵁浜у搧鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾匡紝杩斿洖璇ヨ矾绾跨殑宸ュ簭鍒楄〃")
+ @Operation(summary = "鎸変骇鍝佽幏寰楀伐搴忓垪琛�", description = "鏍规嵁浜у搧鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾匡紝杩斿洖璇ヨ矾绾跨殑宸ュ簭鍒楄〃锛堝惈鍚勫伐搴忕殑鎶曟枡BOM锛�")
@Parameter(name = "productId", description = "浜у搧缂栧彿", required = true, example = "1")
@PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<List<MesProRouteProcessRespVO>> getRouteProcessListByProduct(@RequestParam("productId") Long productId) {
List<MesProRouteProcessDO> list = routeProcessService.getRouteProcessListByProductId(productId);
- return success(buildRouteProcessRespVOList(list));
+ List<MesProRouteProcessRespVO> result = buildRouteProcessRespVOList(list);
+
+ // 鏌ヨ閰嶇疆鎶曟枡骞舵寜宸ュ簭濉厖
+ Map<Long, List<MesProRouteProductBomDO>> bomByProcess = routeProcessService.getRouteProcessBomMapByProductId(productId);
+ if (!bomByProcess.isEmpty()) {
+ Set<Long> itemIds = bomByProcess.values().stream()
+ .flatMap(List::stream)
+ .map(MesProRouteProductBomDO::getItemId)
+ .collect(Collectors.toSet());
+ Map<Long, MesMdItemDO> itemMap = mdItemService.getItemMap(itemIds);
+ for (MesProRouteProcessRespVO vo : result) {
+ List<MesProRouteProductBomDO> processBoms = bomByProcess.get(vo.getProcessId());
+ if (CollUtil.isNotEmpty(processBoms)) {
+ vo.setBomItems(processBoms.stream().map(bom -> {
+ MesProProcessBomItemVO itemVO = new MesProProcessBomItemVO();
+ itemVO.setItemId(bom.getItemId());
+ itemVO.setQuantity(bom.getQuantity());
+ itemVO.setRemark(bom.getRemark());
+ MesMdItemDO item = itemMap.get(bom.getItemId());
+ if (item != null) {
+ itemVO.setItemCode(item.getCode());
+ itemVO.setItemName(item.getName());
+ }
+ return itemVO;
+ }).collect(Collectors.toList()));
+ }
+ }
+ }
+ return success(result);
}
@GetMapping("/list-by-route")
@@ -120,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) {
@@ -144,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