From 10ee450a249e4e5698765048472e7793056b7603 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 10:53:13 +0800
Subject: [PATCH] feat(mes): 增加物料编号集合查询参数并优化工艺路线验证逻辑

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java       |    9 +++++++--
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java |    4 ++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java              |    1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java
index ab0a5a6..2d6aa31 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java
@@ -8,6 +8,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -17,6 +18,9 @@
 @ToString(callSuper = true)
 public class MesMdItemPageReqVO extends PageParam {
 
+    @Schema(description = "闄愬畾鐗╂枡缂栧彿闆嗗悎锛岀敤浜庝笟鍔¤寖鍥村唴閫夋嫨", example = "1,2,3")
+    private List<Long> ids;
+
     @Schema(description = "鐗╂枡缂栫爜", example = "ITEM001")
     private String code;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
index 5a5a843..1567a73 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
@@ -28,6 +28,7 @@
 
     default PageResult<MesMdItemDO> selectPage(MesMdItemPageReqVO reqVO, Collection<Long> itemTypeIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MesMdItemDO>()
+                .inIfPresent(MesMdItemDO::getId, reqVO.getIds())
                 .likeIfPresent(MesMdItemDO::getCode, reqVO.getCode())
                 .likeIfPresent(MesMdItemDO::getName, reqVO.getName())
                 .inIfPresent(MesMdItemDO::getItemTypeId, itemTypeIds)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java
index e30fe31..8b6392d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java
@@ -187,8 +187,13 @@
                 .max(Comparator.comparing(MesProRouteProcessDO::getSort)).orElseThrow();
         for (MesProRouteProcessDO process : processList) {
             Set<Long> outputIds = parseOutputItemIds(process.getOutputItemId());
+            boolean last = process.getId().equals(lastProcess.getId());
             if (CollUtil.isEmpty(outputIds)) {
-                throw exception(PRO_ROUTE_PROCESS_OUTPUT_REQUIRED, process.getProcessId());
+                // 涓棿宸ュ簭涓嶄竴瀹氬舰鎴愬彲鍏ュ簱鐨勭嫭绔嬪崐鎴愬搧锛屽厑璁镐笉閰嶇疆浜у嚭锛涙湯閬撳伐搴忓繀椤讳骇鍑烘垚鍝併��
+                if (last) {
+                    throw exception(PRO_ROUTE_LAST_OUTPUT_INVALID, process.getProcessId());
+                }
+                continue;
             }
             for (Long outputId : outputIds) {
                 if (!boundItemIds.contains(outputId)) {
@@ -196,7 +201,7 @@
                     throw exception(PRO_ROUTE_PROCESS_OUTPUT_NOT_BOUND, item.getName());
                 }
             }
-            if (process.getId().equals(lastProcess.getId())) {
+            if (last) {
                 if (finishedItemIds.isEmpty() || !outputIds.equals(finishedItemIds)) {
                     throw exception(PRO_ROUTE_LAST_OUTPUT_INVALID, process.getProcessId());
                 }

--
Gitblit v1.9.3