From 74db7e79e0fe4e1fb719ab0a28ecc26c727c1ef3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 22 Jun 2024 17:26:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E5=88=87?= =?UTF-8?q?=E4=B8=8B=E6=96=99AGV=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=A6=81=E7=94=A8=E7=82=B9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java | 4 ++++ .../nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java | 4 ++-- .../org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java | 2 +- .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 1 + .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java index b6b9015f5..0dde816da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java @@ -13,6 +13,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -76,6 +77,9 @@ public class SlitterDownAgvTask extends AbstractAcsTask { task.setTask_status(TaskStatusEnum.EXECUTING.getCode()); } if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + if (TaskStatusEnum.FINISHED.getCode().equals(task.getTask_status())) { + throw new BadRequestException("任务[" + task.getTask_code() + "]已经完成！"); + } task.setTask_status(TaskStatusEnum.FINISHED.getCode()); // 互换资源 String startPoint = task.getPoint_code1(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java index 95e346bbd..6d3c220ea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java @@ -97,9 +97,9 @@ public class AutoUpShaftTrussTask { if (ObjectUtil.isNotEmpty(nextUpPlan) && ObjectUtil.isNotEmpty(nextDownPlan)) { // 双轴任务参数构建 - param.put("point_code1", newCutPoint.getTruss_point_code2()); + param.put("point_code1", newCutPoint.getTruss_point_code1()); param.put("point_code2", device.getUp_point_code()); - param.put("point_code3", newCutPoint.getTruss_point_code1()); + param.put("point_code3", newCutPoint.getTruss_point_code2()); param.put("point_code4", device.getDown_point_code()); param.put("vehicle_code1", newCutPoint.getQzz_no1()); param.put("vehicle_code2", newCutPoint.getQzz_no2()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java index bb13f020f..626d53979 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java @@ -21,7 +21,7 @@ public enum SlitterEnum { */ TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803" , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807" - , "备货区送纸管", "010808")); + , "备货区送纸管", "010808", "分切机下料桁架任务", "010809")); private Map code; public String code(String desc) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index e1c36a0fa..f2c289916 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -27,6 +27,7 @@ FROM `bst_ivt_cutpointivt` bct WHERE bct.point_type IN ('2', '3') AND bct.point_status = '3' + AND bct.is_used = '1' AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' 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 f1e8f4e6a..8b9841694 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 @@ -414,6 +414,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("truss_type", "1"); taskParam.put("empty_site", "0"); } + taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); // 分切计划修改状态 05 -> 06 currentPlans.forEach(plan -> { @@ -505,6 +506,7 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("错误表达式"); } // 创建任务 + taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); slitterDownTrussTask.createTask(taskParam); // 下来的分切计划修改状态：05 -> 06