工序可选设备调整

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -174,7 +174,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDoList = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
 
             //工艺路线对应的可选设备
-            List<ApsCraftRouteStepEquDo> apsCraftRouteStepEquDoList = apsCraftRouteStepEquService.listByMap(map).stream().collect(Collectors.toList());
+            Map<String, Object> equmap = new HashMap<>();
+            equmap.put("DELETED", "0");
+            List<ApsCraftRouteStepEquDo> apsCraftRouteStepEquDoList = apsCraftRouteStepEquService.listByMap(equmap).stream().collect(Collectors.toList());
 
             //工艺路线对应的思维导图
             List<SysMindMappingDo> sysMindMappingDos = new ArrayList<>();
@@ -323,7 +325,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             //没有后道工序作业，计划成品卷数=计划输出卷数-计划备料卷数
                             if (StringUtils.isBlank(apsCraftRouteStepDo.getNextstepid())) {
                                 apsProcessOperationOutMaterDo.setPlanprodrollnum(apsProcessOperationDo.getPlanprocessrall());
-                            } else{
+                            } else {
                                 apsProcessOperationOutMaterDo.setPlanprodrollnum(0);
                             }
                             apsProcessOperationOutMaterDo.setMainid(processId);