diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 0e0da7f78..19049135e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -311,16 +311,6 @@ public class SlitterServiceImpl implements SlitterService { String material1 = param.getString("material1"); String weight2 = param.getString("weight2"); String material2 = param.getString("material2"); - // 判断是否有未完成的任务 - List list = taskService.list(new LambdaQueryWrapper() - .eq(SchBaseTask::getPoint_code1, deviceCode) - .lt(SchBaseTask::getTask_status, "07")); - if (list.size() > 0) { - log.error("点位[{}]存在未完成得任务!", deviceCode); - stepTipLogs.add("套轴完成->点位[" + deviceCode + "]存在未完成得任务!"); - redisUtils.set("ERROR" + deviceCode, stepTipLogs); - throw new BadRequestException("点位[" + deviceCode + "]存在未完成得任务!"); - } BstIvtShafttubeivt startPoint = shafttubeivtService.getOne(new LambdaQueryWrapper() .eq(BstIvtShafttubeivt::getPoint_code, deviceCode)); // 获取分切计划 @@ -337,6 +327,17 @@ public class SlitterServiceImpl implements SlitterService { .in(PdmBiSlittingproductionplan::getContainer_name, collect) .eq(PdmBiSlittingproductionplan::getStatus, "01") .eq(PdmBiSlittingproductionplan::getIs_delete, "0")); + // 判断是否有未完成的任务 + List list = taskService.list(new LambdaQueryWrapper() + .eq(SchBaseTask::getPoint_code1, deviceCode) + .like(SchBaseTask::getRequest_param, collect.get(0)) + .lt(SchBaseTask::getTask_status, "07")); + if (list.size() > 0) { + log.error("点位[{}]存在未完成得任务!", deviceCode); + stepTipLogs.add("套轴完成->点位[" + deviceCode + "]存在未完成得任务!"); + redisUtils.set("ERROR" + deviceCode, stepTipLogs); + throw new BadRequestException("点位[" + deviceCode + "]存在未完成得任务!"); + } // 去异常位 if (plans.size() == 0) { log.error("找不到[{}]对应的分切计划,分切计划可能被删除或者拼接!", collect); @@ -356,6 +357,7 @@ public class SlitterServiceImpl implements SlitterService { exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务")); exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); exParam.put("acs_task_type", "6"); + exParam.put("containers", collect); sendNBJExceptionPointTask.createTask(exParam); res.put("status", HttpStatus.HTTP_OK); res.put("message", "创建送至异常处理位!"); @@ -371,6 +373,7 @@ public class SlitterServiceImpl implements SlitterService { exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); exParam.put("task_status", TaskStatusEnum.SURE_START.getCode()); exParam.put("acs_task_type", "6"); + exParam.put("containers", collect); sendNBJExceptionPointTask.createTask(exParam); res.put("status", HttpStatus.HTTP_OK); res.put("message", "请求成功"); @@ -435,6 +438,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("vehicle_code1", SlitterConstant.SLITTER_SHAFT_UP.equals(demoPlan.getUp_or_down()) ? qzzNo : ""); taskParam.put("vehicle_code2", SlitterConstant.SLITTER_SHAFT_DOWN.equals(demoPlan.getUp_or_down()) ? qzzNo : ""); taskParam.put("task_type", "010814"); + taskParam.put("containers", collect); taskParam.put("task_status", TaskStatusEnum.SURE_START.getCode()); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); taskParam.put("immediateNotifyAcs", "0"); @@ -450,6 +454,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("vehicle_code1", SlitterConstant.SLITTER_SHAFT_UP.equals(demoPlan.getUp_or_down()) ? qzzNo : ""); taskParam.put("vehicle_code2", SlitterConstant.SLITTER_SHAFT_DOWN.equals(demoPlan.getUp_or_down()) ? qzzNo : ""); taskParam.put("task_type", "010814"); + taskParam.put("containers", collect); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); taskParam.put("immediateNotifyAcs", "1"); trussSendAirShaftTask.createTask(taskParam); @@ -487,6 +492,7 @@ public class SlitterServiceImpl implements SlitterService { // 判断是否有未完成的任务 List list = taskService.list(new LambdaQueryWrapper() .eq(SchBaseTask::getPoint_code1, deviceCode) + .eq(SchBaseTask::getTask_type, SlitterEnum.TASK_TYPE.code("穿拔轴位<>气胀轴缓存位")) .lt(SchBaseTask::getTask_status, "07")); if (list.size() > 0) { stepTipLogs.add(">>>气胀轴入库请求异常:点位[" + deviceCode + "]存在未完成的任务,无法创建到气涨轴暂存位的任务!");