排产相关-sjx

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"/>

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>

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);