From e38fcb7b8849208c86945919622f8fbfb1f51f24 Mon Sep 17 00:00:00 2001
From: ls <1793460677@qq.com>
Date: Thu, 20 Mar 2025 17:53:05 +0800
Subject: [PATCH] =?UTF-8?q?add:=E9=95=BF=E7=9F=AD=E8=BD=B4=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hot/service/dao/mapper/StIvtHotpointivtMapper.xml    | 3 +--
 .../java/org/nl/wms/quartz/AutoMoveWasteFoilAGVTask.java | 9 +++++----
 .../sch/task_manage/tasks/nbj/PdaSendShaftAGVTask.java   | 4 ++++
 .../task_manage/tasks/slitter/SlitterDownAGVTask.java    | 4 ++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
index bd8d96830..156bfe6be 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
@@ -30,8 +30,7 @@
         SELECT point_code AS device_code,
                product_area
         FROM st_ivt_hotpointivt ivt
-        WHERE is_used = '1'
-          AND ivt.product_area = #{productArea}
+        WHERE  ivt.product_area = #{productArea}
     </select>
     <select id="getNeedBakingPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
         SELECT hot.*
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoMoveWasteFoilAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoMoveWasteFoilAGVTask.java
index 8dc07e0fe..7117035c5 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoMoveWasteFoilAGVTask.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoMoveWasteFoilAGVTask.java
@@ -36,19 +36,20 @@ public class AutoMoveWasteFoilAGVTask {
     private ISchBasePointService pointService;
     public void run() {
         log.info("自动巡航废箔任务开始执行...");
-
+        //自动巡航只有耳波
         JSONObject jsonObject = new JSONObject();
         List<SchBasePoint> fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB",
                 "2", "1", null, null);
         // 筛选一号位
-        List<SchBasePoint> fbPointsFilter = fbPoints.stream()
+        List<SchBasePoint> fbPointsfFilter = fbPoints.stream()
                 .filter(point -> point.getSort()!= null)
                 .filter(point -> point.getSort() .equals(1)).collect(Collectors.toList());
-        if (CollUtil.isEmpty(fbPointsFilter)) {
+        if (CollUtil.isEmpty(fbPointsfFilter)) {
             log.info("自动巡航废箔任务执行异常，无废箔位");
             return;
         }
-        jsonObject.put("point_code", fbPointsFilter.get(0).getPoint_code());
+        jsonObject.put("point_code", fbPointsfFilter.get(0).getPoint_code());
+        jsonObject.put("vehicle_type", "1");
         otherPdaService.startMoveWasteFoilV2(jsonObject);
 
     }
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/PdaSendShaftAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/PdaSendShaftAGVTask.java
index a54b04412..a4607f1d7 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/PdaSendShaftAGVTask.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/PdaSendShaftAGVTask.java
@@ -98,6 +98,10 @@ public class PdaSendShaftAGVTask extends AbstractTask {
         String endPointCode = taskObj.getPoint_code2();
         String startPointCode = taskObj.getPoint_code1();
         StIvtCutpointivt endPoint = stIvtCutpointivtService.getOneByCode(endPointCode);
+        //长短轴需要截取
+        if (startPointCode.contains("_C") || startPointCode.contains("_D")){
+            startPointCode = startPointCode.substring(0,9);
+        }
         BstIvtCutpointivt startPoint = bcutpointivtService.getPintByAgvCode(startPointCode, false);
         //起点点位清空
         startPoint.setQzz_no1("");
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
index 643006fcf..5f49f4ba5 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
@@ -173,6 +173,10 @@ public class SlitterDownAGVTask extends AbstractTask {
         List<PdmBiSlittingproductionplan> list = slittingproductionplanService.getByQzzNos(qzzNo, "06");
         // 终点设置数据
         String endPointCode = taskObj.getPoint_code2();
+        //长短轴需要截取
+        if (endPointCode.contains("_C") || endPointCode.contains("_D")){
+            endPointCode = endPointCode.substring(0,9);
+        }
         BstIvtCutpointivt endPoint = bstIvtCutpointivtService.getPintByAgvCode(endPointCode, false);
         endPoint.setQzz_no1(taskObj.getVehicle_code());
         endPoint.setQzz_no2(taskObj.getVehicle_code2());