工序优化

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

@@ -129,6 +129,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             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("工艺路线图不存在");
+            }
             SysMindMappingDo sysMindMappingDo = BeanUtil.toBean(sysMindMappingDoList.get(0), SysMindMappingDo.class);
             String mindStrId = SecurityUtil.getUUID();
             sysMindMappingDo.setId(mindStrId);
@@ -201,6 +204,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             //本道工序的输出
                             map.put("CRAFTSTEPID", apsCraftRouteStepDo1.getId());
                             List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDo = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
+                            if (apsCraftRouteOutMaterRequestDo.size() == 0) {
+                                return R.error("工艺步骤"+apsCraftRouteStepDo1.getProcessname()+"没输出");
+                            }
                             ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
                             apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
                             if (StringUtils.isBlank(apsProcessOperationOutMaterDo.getProducttypeid())) {
@@ -328,6 +334,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         //本道工序的输出
                         map.put("CRAFTSTEPID", apsCraftRouteStepDo.getId());
                         List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDo = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
+                        if (apsCraftRouteOutMaterRequestDo.size() == 0) {
+                            return R.error("工艺步骤"+apsCraftRouteStepDo.getProcessname()+"没输出");
+                        }
                         ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
                         apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
                         if (StringUtils.isBlank(apsProcessOperationOutMaterDo.getProducttypeid())) {
@@ -627,7 +636,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             boolean bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
             boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoNewList);
             if (bool1 && bool2) {
-                return  operationOutMaterDos;
+                return operationOutMaterDos;
             } else {
                 log.info("更新后面所有工序信息异常");
                 return null;