From 8f47bed08e3b186e0da4fc719a891e6a640ac6a6 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 7 Jan 2025 10:26:47 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20B2=E5=88=86=E5=88=87=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E4=BD=8D=E4=B8=8B=E6=96=99=E6=A0=A1=E9=AA=8C=E8=B5=B7=E7=82=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java | 7 +++++++ .../nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml | 8 ++++++++ .../nl/b_lms/sch/task/service/IschBaseTaskService.java | 7 +++++++ .../sch/task/service/impl/SchBaseTaskServiceImpl.java | 5 +++++ .../nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 2 +- .../tasks/slitter/service/impl/SlitterServiceImpl.java | 6 +++--- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java index 2a9dbc3d5..dd5960fcb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java @@ -27,4 +27,11 @@ public interface SchBaseTaskMapper extends BaseMapper { * @return / */ List getTaskByPlanQzzNoAndDevice(String resourceName); + + /** + * 检测点位起点的任务是否存在 + * @param code + * @return + */ + List checkHaveStartTask(String code); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml index 2bb3eb947..0732f1748 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml @@ -7,6 +7,7 @@ SELECT * FROM sch_base_task WHERE task_status '071' AND task_status ]]> '07' + AND is_delete = '0' AND ( point_code1 = #{code} OR point_code2 = #{code} OR point_code3 = #{code} @@ -20,4 +21,11 @@ AND p.resource_name = #{resourceName} AND IFNULL(p.qzzno, '') ]]> '' + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java index 06cf7e932..13b3e98b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java @@ -87,6 +87,13 @@ public interface IschBaseTaskService extends IService { * @return / */ Boolean checkHaveTaskByZcPoint(BstIvtCutpointivt point); + + /** + * 判断是否有起点未完成的任务 + * @param pointCode + * @return + */ + List checkHaveStartTask(String pointCode); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java index 2cff1f339..e7c0c6ce1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -161,6 +161,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl 0; } + @Override + public List checkHaveStartTask(String pointCode) { + return schBaseTaskMapper.checkHaveStartTask(pointCode); + } + } 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 f8eea79df..7f8d7e2f5 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 @@ -60,7 +60,7 @@ AND bcp.point_location = #{location} AND 0 = ( SELECT COUNT(*) FROM sch_base_task t - WHERE t.task_status '071' AND t.task_status ]]> '07' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1 + WHERE t.task_status '071' AND t.task_status ]]> '07' AND t.is_delete = '0' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1 OR t.point_code4 = bcp.truss_point_code1 OR t.point_code2 = bcp.truss_point_code2 OR t.point_code4 = bcp.truss_point_code2) ) AND 0 = ABS(bcp.sort_seq - #{sortSeq}) 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 73ca8abd4..ea6aecb3b 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 @@ -530,8 +530,8 @@ public class SlitterServiceImpl implements SlitterService { device.getSort_seq(), getPointLocationInCutDevice(getNumberByResourceCode(demoPlan.getResource_name()), area)); if (emptyPoints.size() == 0) { - log.error("分切机【" + device.getExt_code() + "】找不到对应的对接位!"); - throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位!"); + log.error("分切机【" + device.getExt_code() + "】找不到对应的对接位, 或已存在任务!"); + throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位，或已存在任务!"); } // 枷锁 BstIvtCutpointivt emptyPoint = emptyPoints.get(0); @@ -1549,7 +1549,7 @@ public class SlitterServiceImpl implements SlitterService { // param: point_code String pointCode = param.getString("point_code"); // 校验是否存在任务 - List taskList = taskService.checkHaveTask(pointCode); + List taskList = taskService.checkHaveStartTask(pointCode); if (taskList.size() > 0) { throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的任务!"); }