作业调整

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

@@ -1046,17 +1046,17 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     previousProcessVo.setApsProcessOperationOutMaterDos(apsProcessOperationOutMaterDoList1);
                     newProcessIds.add(previousProcessVo);
 
-                    //本道工序的可选设备
-                    List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(omd -> apsProcessOperationDo.getId().equals(omd.getMainid())).collect(Collectors.toList());
-                    for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
-                        ApsProcessOperationEquDo processOperationEquDo = BeanUtil.toBean(apsProcessOperationEquDo, ApsProcessOperationEquDo.class);
-                        processOperationEquDo.setId(SecurityUtil.getUUID());
-                        processOperationEquDo.setMainid(processId);
-                        processOperationEquDo.setBlankid(blanckdata.getStr("ID"));
-                        apsProcessOperationEquDoList.add(processOperationEquDo);
-                    }
-
                     if (hasFirst) {
+                        //本道工序的可选设备
+                        List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(omd -> apsProcessOperationDo.getId().equals(omd.getMainid())).collect(Collectors.toList());
+                        for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
+                            ApsProcessOperationEquDo processOperationEquDo = BeanUtil.toBean(apsProcessOperationEquDo, ApsProcessOperationEquDo.class);
+                            processOperationEquDo.setId(SecurityUtil.getUUID());
+                            processOperationEquDo.setMainid(processId);
+                            processOperationEquDo.setBlankid(blanckdata.getStr("ID"));
+                            apsProcessOperationEquDoList.add(processOperationEquDo);
+                        }
+
                         //本道工序思维导图
                         List<SysMindMappingDo> sysMindMappingDos1 = sysMindMappingDos.stream().filter(mind -> mind.getId().equals(apsProcessOperationDo.getId())).collect(Collectors.toList());
                         SysMindMappingDo sysMindMappingDo1 = sysMindMappingDos1.get(0);