From ca56c19d78846bfe0d2affc975bedd6be438fa68 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Sun, 5 Jan 2025 17:35:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=B8=80=E5=AF=B9=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java    | 2 +-
 .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml     | 2 +-
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 f7313a42f..1ca942f2b 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
@@ -22,7 +22,7 @@ public enum SlitterEnum {
     TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803"
             , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807"
             , "备货区送纸管", "010808", "分切机下料桁架任务", "010809", "分切机下料AGV到内包间", "010810", "套轴异常处理AGV任务", "010811"
-    , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813"));
+    , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813", "拔轴完毕出轴", "010814"));
     private Map<String, String> 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 75b69819b..f8eea79df 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
@@ -63,7 +63,7 @@
         WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07' 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)
         )
-        ORDER BY ABS(bcp.sort_seq - #{sortSeq})
+        AND 0 = ABS(bcp.sort_seq - #{sortSeq})
     </select>
     <select id="getReadyShaftPoint"
             resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
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 e982903ed..73ca8abd4 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
@@ -368,7 +368,7 @@ public class SlitterServiceImpl implements SlitterService {
                         ? cutPoint.getTruss_point_code1() : cutPoint.getTruss_point_code2());
                 taskParam.put("vehicle_code1", SlitterConstant.SLITTER_SHAFT_UP.equals(demoPlan.getUp_or_down()) ? qzzNo : "");
                 taskParam.put("vehicle_code2", SlitterConstant.SLITTER_SHAFT_DOWN.equals(demoPlan.getUp_or_down()) ? qzzNo : "");
-                taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位"));
+                taskParam.put("task_type", "010814");
                 taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
                 trussSendAirShaftTask.createTask(taskParam);
             } else {