From 094b7104fcf6da95ec412b65ac270dade63591d3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 17 Jun 2025 17:49:12 +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=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/SendNBJExceptionPointTask.java | 4 +- .../service/impl/SlitterServiceImpl.java | 63 +++++++++++++------ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java index 7e5a28ded..11ff574cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendNBJExceptionPointTask.java @@ -121,7 +121,9 @@ public class SendNBJExceptionPointTask extends AbstractAcsTask { SchBaseTask task = new SchBaseTask(); task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr()); task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr()); - task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); + task.setTask_status(ObjectUtil.isNotEmpty(form.getString("task_status")) + ? form.getString("task_status") + : TaskStatusEnum.START_AND_POINT.getCode()); task.setPoint_code1(form.getString("point_code1")); task.setPoint_code2(form.getString("point_code2")); task.setVehicle_code(form.getString("vehicle_code1")); 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 0efc52077..b83a5fc76 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 @@ -366,7 +366,20 @@ public class SlitterServiceImpl implements SlitterService { } else { stepTipLogs.add("套轴完成->[" + collect + "]对应的分切计划状态已更改，无暂存位置，创建任务失败!"); redisUtils.set("ERROR" + deviceCode, stepTipLogs); - throw new BadRequestException("[" + collect + "]对应的分切计划状态已更改，无暂存位置!"); + JSONObject exParam = new JSONObject(); + exParam.put("point_code1", startPoint.getPoint_code()); + exParam.put("point_code2", "-"); + exParam.put("vehicle_code1", collect); + exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务")); + exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + exParam.put("task_status", TaskStatusEnum.SURE_START.getCode()); + exParam.put("acs_task_type", "6"); + sendNBJExceptionPointTask.createTask(exParam); + res.put("status", HttpStatus.HTTP_OK); + res.put("message", "请求成功"); + res.put("msg", msg); + return res; +// throw new BadRequestException("[" + collect + "]对应的分切计划状态已更改，无暂存位置!"); } } // 分切计划设置纸卷重量 @@ -1142,13 +1155,29 @@ public class SlitterServiceImpl implements SlitterService { // 判断是不是内包间的点位 if (task.getPoint_code1().startsWith("TZZC")) { // 查找半条任务，并创建下发 - List list = taskService.list(new LambdaQueryWrapper() - .eq(SchBaseTask::getTask_type, "010814") - .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); + doCreatTrussSendShaftTask(task); + } + startPointObj.setPoint_status("1"); + startPointObj.setQzz_no1(""); + startPointObj.setQzz_no2(""); + startPointObj.setRemark(""); + TaskUtils.updateOptMessageByBCutPoint(startPointObj); + bcutpointivtService.updateById(startPointObj); + task.setTask_status(TaskStatusEnum.PICK_UP_COMPLETED.getCode()); + TaskUtils.updateOptMessageByTask(task); + taskService.updateById(task); + return result; + } + + public void doCreatTrussSendShaftTask(SchBaseTask task) { + List list = taskService.list(new LambdaQueryWrapper() + .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); + 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")); @@ -1161,18 +1190,16 @@ public class SlitterServiceImpl implements SlitterService { 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()); } + } - startPointObj.setPoint_status("1"); - startPointObj.setQzz_no1(""); - startPointObj.setQzz_no2(""); - startPointObj.setRemark(""); - TaskUtils.updateOptMessageByBCutPoint(startPointObj); - bcutpointivtService.updateById(startPointObj); - task.setTask_status(TaskStatusEnum.PICK_UP_COMPLETED.getCode()); - TaskUtils.updateOptMessageByTask(task); - taskService.updateById(task); - return result; } @Override