工序优化

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

@@ -149,7 +149,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             mindMap.put("BSID", craftrouteid);
             List<SysMindMappingDo> sysMindMappingDoList = sysMindMappingService.listByMap(mindMap).stream().collect(Collectors.toList());
             Collections.sort(sysMindMappingDoList, Comparator.comparing(SysMindMappingDo::getTreecode, Comparator.nullsFirst(Comparator.naturalOrder())));
-            Collections.sort(sysMindMappingDoList, Comparator.comparing(SysMindMappingDo::getCreatedate));
             if (sysMindMappingDoList.size() == 0) {
                 return R.error("工艺路线图不存在");
             }
@@ -705,8 +704,14 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 }
             }
 
-            boolean bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
-            boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoNewList);
+            boolean bool1 =false;
+            boolean bool2 =false;
+            if(apsProcessOperationDoList.size()>0){
+                bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
+            }
+            if(apsProcessOperationOutMaterDoNewList.size()>0){
+                bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoNewList);
+            }
 
             //更新状态
             CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();