Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -1257,14 +1257,14 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         //校验工序作业明细的加工设备和加工车间的代号是否为空
         if (checkDeviceAndOrgCode) {
             //查询坯料计划对应的所有工序作业明细
-            List<ApsProcessOperationProcessEquDo> list = apsProcessOperationProcessEquService.list(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getBlankid, blankId).ne(ApsProcessOperationProcessEquDo::getClosestatus, "已完工"));
+            List<ApsProcessOperationProcessEquDo> list = apsProcessOperationProcessEquService.list(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getBlankid, blankId).eq(ApsProcessOperationProcessEquDo::getClosestatus, "待开工"));
             if (ObjectUtil.isEmpty(list)) {
                 return R.ok();
             }
             //获取所有工序作业明细的加工设备
             Set<String> deviceIds = list.stream().filter(item -> ObjectUtil.isNotEmpty(item.getProcessdeviceid())).map(ApsProcessOperationProcessEquDo::getProcessdeviceid).collect(Collectors.toSet());
             if (ObjectUtil.isEmpty(deviceIds)) {
-                return R.error("存在未排程的工序作业明细，未分配加工设备");
+                return R.error("存在待开工的工序作业明细，未分配加工设备");
             }
             //查询设备对应的代号
             List<AspCheckItemsDo> deviceList = aspCheckItemsService.list(new QueryWrapper<AspCheckItemsDo>().lambda().in(AspCheckItemsDo::getId, deviceIds));