From 34cf36c90ea3bcc4aa9d9df050eed871c2762292 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 13 Jun 2025 17:24:20 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/SendNBJExceptionPointTask.java | 3 ++- .../slitter/auto/AutoCallAirShaftTask.java | 24 ++++++++++--------- .../service/impl/SlitterServiceImpl.java | 1 + 3 files changed, 16 insertions(+), 12 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 816794014..7e5a28ded 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 @@ -126,7 +126,8 @@ public class SendNBJExceptionPointTask extends AbstractAcsTask { task.setPoint_code2(form.getString("point_code2")); task.setVehicle_code(form.getString("vehicle_code1")); task.setVehicle_code2(form.getString("vehicle_code2")); - task.setAcs_task_type("3"); + // 行家任务给6，AGV给3 + task.setAcs_task_type(ObjectUtil.isNotEmpty(form.getString("acs_task_type")) ? form.getString("acs_task_type") : "3"); task.setIs_delete(SlitterConstant.SLITTER_NO); task.setRequest_param(form.toJSONString()); task.setTask_type(form.getString("task_type")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 0d9a8a338..b319cc042 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -915,18 +915,20 @@ public class AutoCallAirShaftTask extends Prun { ? shafttubeivt.getContainer_name1() : shafttubeivt.getContainer_name2(); // 获取这个子卷号的分切计划 PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName(containerCode); - String parent = SlitterConstant.SLITTER_TYPE_PAPER.equals(byContainerName.getPaper_tube_or_FRP()) - ? byContainerName.getParent_container_name() - : byContainerName.getRestruct_container_name(); - if (byContainerName.getResource_name().equals(dto.getResource_name())) { - // 如果是同设备同母卷、同组，证明是一根轴上的，故允许套轴 - if (parent.equals(dto.getParent_container_name()) - && byContainerName.getSplit_group().equals(dto.getSplit_group())) { - return true; + if (ObjectUtil.isNotEmpty(byContainerName)) { + String parent = "1".equals(byContainerName.getOrder_type()) + ? byContainerName.getParent_container_name() + : byContainerName.getRestruct_container_name(); + if (byContainerName.getResource_name().equals(dto.getResource_name())) { + // 如果是同设备同母卷、同组，证明是一根轴上的，故允许套轴 + if (parent.equals(dto.getParent_container_name()) + && byContainerName.getSplit_group().equals(dto.getSplit_group())) { + return true; + } + stepStr += ",4"; + stepErrorInfo.add("穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了..."); + return false; } - stepStr += ",4"; - stepErrorInfo.add("穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了..."); - return false; } } // 校验是否在拔轴暂存位、分切对接位有相同设备的分切计划信息。 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 23c0e7c93..66dd383a2 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 @@ -347,6 +347,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"); sendNBJExceptionPointTask.createTask(exParam); res.put("status", HttpStatus.HTTP_OK); res.put("message", "创建送至异常处理位!");