aps-导入导出修改

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

@@ -2725,8 +2725,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         List<ApsRollerTypeDo> allRollerList = apsRollerTypeService.list();
         //查询所有待开工的作业明细
         List<ApsProcessOperationProcessEquDoAndWidthVo> apsProcessOperationProcessEquDoList = this.baseMapper.getAllWaitDoList();
-        apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-                .eq(ApsProcessOperationProcessEquDo::getWorkstatus, "待开工"));
+//        apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+//                .eq(ApsProcessOperationProcessEquDo::getWorkstatus, "待开工"));
 
         //==================数据处理======================
         List<String> errorMessageList = new LinkedList<>();
@@ -2748,6 +2748,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             //如果没有找到，则遍历下一个作业明细
             ApsProcessOperationProcessEquDoAndWidthVo equDo = apsProcessOperationProcessEquDoList.stream().filter(item -> item.getId().equals(workShopExportVo.getId())).findFirst().orElse(null);
             if (equDo == null) {
+                errorMessageList.add("第" + num + "行作业明细已开工或已报工；");
                 continue;
             }
             //记录一下对应的工序ID