From a019ee7a4f3cfeebd7afcf05a8216d50794048bb Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 6 Jan 2026 16:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9B=B8=E5=85=B3-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/mapper/ProcessSetMapper.xml         |  3 +--
 .../scheduling/mapper/WorkOrderMapper.xml          |  3 ---
 .../service/impl/WorkOrderServiceImpl.java         | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
index 88c87ef3..a8584a33 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
@@ -5,10 +5,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="processSetResultMap" type="org.springblade.scheduling.scheduling.entity.ProcessSetEntity">
         <result column="NI_VALUE" property="niValue"/>
-        <result column="V_SPEED" property="vSpeed"/>
+        <result column="VI_SPEED" property="viSpeed"/>
         <result column="CYROPACTOR_CONTROL" property="cyropactorControl"/>
         <result column="TEAM" property="team"/>
-        <result column="NEW_COLUMN" property="newColumn"/>
         <result column="ID" property="id"/>
         <result column="CODE" property="code"/>
         <result column="NAME" property="name"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
index 763214f3..86102c30 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
@@ -133,9 +133,6 @@
             <if test="equipName !=null and equipName != ''">
                 and b.equip_name = #{equipName}
             </if>
-            <if test="processName !=null and processName != ''">
-                and d.name = #{processName}
-            </if>
             <if test="partCode !=null and partCode != ''">
                 and a.part_code = #{partCode}
             </if>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index 7d310b8a..ccf892b1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -188,6 +188,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         Map<String, List<WorkOrderDto>> woCodeGroup = list.stream().collect(Collectors.groupingBy(WorkOrderDto::getWoCode));
         List<WorkOrderDto> resultList = new ArrayList<>();
         for (Map.Entry<String, List<WorkOrderDto>> entry : woCodeGroup.entrySet()) {
+            if(StringUtils.isNotEmpty(workOrder.getProcessName())){
+                List<WorkOrderDto> list1 = entry.getValue();
+                List<String> processNameList = list1.stream().map(WorkOrderDto::getProcessName).collect(Collectors.toList());
+                if(processNameList.contains(workOrder.getProcessName())){
+                    WorkOrderDto workOrderDto = new WorkOrderDto();
+                    String woCode = entry.getKey();
+                    workOrderDto.setWoCode(woCode);
+                    workOrderDto.setWorkOrderList(entry.getValue());
+                    resultList.add(workOrderDto);
+                    continue;
+                }else{
+                    continue;
+                }
+            }
             WorkOrderDto workOrderDto = new WorkOrderDto();
             String woCode = entry.getKey();
             workOrderDto.setWoCode(woCode);