From 9781bbcc99d16c8b5721aa472bd947800641f3d5 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 17 Jun 2025 17:58:39 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=97=A0=E7=82=B9=E4=BD=8D=E5=88=9B=E5=BB=BA=E5=8D=8A=E6=9D=A1?= =?UTF-8?q?=E4=BB=BB=E5=8A=A12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/TrussCallAirShaftTask.java | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java index bf7167160..8940903ee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java @@ -56,6 +56,8 @@ public class TrussCallAirShaftTask extends AbstractAcsTask { private IBstIvtShafttubeivtService shafttubeivtService; @Autowired private TrussSendAirShaftTask trussSendAirShaftTask; + @Autowired + private SendNBJExceptionPointTask sendNBJExceptionPointTask; @Override public List addTask() { /* @@ -122,24 +124,34 @@ public class TrussCallAirShaftTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(startPointObj.getQzz_no1()) && ObjectUtil.isEmpty(startPointObj.getQzz_no2())) { // 查找半条任务，并创建下发 List list = taskService.list(new LambdaQueryWrapper() - .eq(SchBaseTask::getTask_type, "010814") + .in(SchBaseTask::getTask_type, "010814", "010812") .eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode()) .eq(SchBaseTask::getIs_delete, "0") .orderByAsc(SchBaseTask::getCreate_time)); if (list.size() > 0) { SchBaseTask schBaseTask = list.get(0); - JSONObject requestParam = JSONObject.parseObject(schBaseTask.getRequest_param()); - if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "A".equals(requestParam.getString("needPosition"))) { - schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition")); + if ("010814".equals(schBaseTask.getTask_type())) { + JSONObject requestParam = JSONObject.parseObject(schBaseTask.getRequest_param()); + if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "A".equals(requestParam.getString("needPosition"))) { + schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition")); + } + if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "B".equals(requestParam.getString("needPosition"))) { + schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition")); + } + schBaseTask.setRemark("AGV取货完成触发!"); + schBaseTask.setUpdate_time(DateUtil.now()); + schBaseTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); + taskService.updateById(schBaseTask); + trussSendAirShaftTask.immediateNotifyAcs(schBaseTask.getTask_id()); + } else if ("010812".equals(schBaseTask.getTask_type())) { + schBaseTask.setRemark("AGV取货完成触发!"); + schBaseTask.setPoint_code2(task.getPoint_code1() + "_A"); + schBaseTask.setUpdate_time(DateUtil.now()); + schBaseTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); + taskService.updateById(schBaseTask); + sendNBJExceptionPointTask.immediateNotifyAcs(schBaseTask.getTask_id()); } - if (ObjectUtil.isNotEmpty(requestParam.getString("needPosition")) && "B".equals(requestParam.getString("needPosition"))) { - schBaseTask.setPoint_code2(task.getPoint_code1() + "_" + requestParam.getString("needPosition")); - } - schBaseTask.setRemark("AGV取货完成触发!"); - schBaseTask.setUpdate_time(DateUtil.now()); - schBaseTask.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); - taskService.updateById(schBaseTask); - trussSendAirShaftTask.immediateNotifyAcs(schBaseTask.getTask_id()); + } } }