diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java index 1066a9c6d..feff28d31 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java @@ -187,7 +187,7 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl tasks = taskService.list(new LambdaQueryWrapper() + .eq(SchBaseTask::getTask_code, "010206") + .eq(SchBaseTask::getIs_delete, "0") + .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode())); + for (SchBaseTask task : tasks) { + JSONObject cache_param = JSONObject.parseObject(task.getRequest_param()); + JSONObject cache_jo = WQL.getWO("PDA_COOLIN").addParamMap(cache_param).process().uniqueResult(0); + if (ObjectUtil.isEmpty(cache_jo) || ObjectUtil.isEmpty(cache_jo.getString("point_code"))) { + log.info("烘箱对接位:{} 没找到暂存位!", task.getPoint_code1()); + return; + } + task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); + task.setPoint_code2(cache_jo.getString("point_code")); + task.setRemark("-"); + task.setUpdate_time(DateUtil.now()); + task.setTask_type("010204"); + taskService.updateById(task); + new InHotTask().immediateNotifyAcs(task.getTask_id()); + } + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 54ac8813e..0ea31edde 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -205,7 +205,7 @@ public class CallEmpReelTask extends AbstractAcsTask { if (jsonTask.getString("task_type").equals("010104")) { // 校验终点是否存在 JSONObject jsonIvt2 = point_tab.query("point_code ='" + point_code4 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) { + if (ObjectUtil.isEmpty(jsonIvt2)) { throw new BadRequestException("终点未找到可用点位:" + point_code2); } @@ -217,17 +217,35 @@ public class CallEmpReelTask extends AbstractAcsTask { cache_param.put("product_area", jsonIvt.getString("product_area")); JSONObject cache_jo = WQL.getWO("PDA_COOLIN").addParamMap(cache_param).process().uniqueResult(0); if (ObjectUtil.isEmpty(cache_jo) || ObjectUtil.isEmpty(cache_jo.getString("point_code"))) { - throw new BadRequestException("未查询到可用的冷却区暂存位!"); + // 创建半条任务 + JSONObject jo = new JSONObject(); + jo.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); + jo.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); + jo.put("task_type", "010206"); + jo.put("task_status", TaskStatusEnum.SURE_START.getCode()); + jo.put("point_code1", point_code4); + jo.put("point_code2", ""); + jo.put("material_code", jsonTask.getString("material_code")); + jo.put("product_area", jsonTask.getString("product_area")); + jo.put("handle_class", InHotTask.class.getName()); + jo.put("remark", "未查询到可用的冷却区暂存位"); + jo.put("request_param", cache_param); + jo.put("type", "3"); + jo.put("priority", "1"); + jo.put("create_time", DateUtil.now()); + jo.put("acs_task_type", "6"); + taskTab.insert(jo); +// throw new BadRequestException("未查询到可用的冷却区暂存位!"); + } else { + JSONObject param = new JSONObject(); + param.put("point_code1", point_code4); + param.put("point_code2", cache_jo.getString("point_code")); + param.put("material_code", jsonTask.getString("material_code")); + param.put("product_area", jsonTask.getString("product_area")); + param.put("type", "3"); + InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); + inHotTask.createTask(param); } - JSONObject param = new JSONObject(); - param.put("point_code1", point_code4); - param.put("point_code2", cache_jo.getString("point_code")); - param.put("material_code", jsonTask.getString("material_code")); - param.put("product_area", jsonTask.getString("product_area")); - param.put("type", "3"); - InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); - inHotTask.createTask(param); - // 更新点位库存状态 jsonIvt2.put("point_status", "2"); jsonIvt2.put("material_code", jsonTask.getString("material_code"));