From e2f665dc8c040444e3a8a91778e8dcc966f5cc24 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 18 Feb 2025 16:38:44 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E4=BD=8D=E5=8F=AF=E4=BB=A5=E6=94=BE=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IBstIvtCutpointivtService.java    |  2 ++
 .../dao/mapper/BstIvtCutpointivtMapper.java   |  2 ++
 .../dao/mapper/BstIvtCutpointivtMapper.xml    | 26 +++++++++++++++++++
 .../impl/BstIvtCutpointivtServiceImpl.java    |  5 ++++
 .../service/impl/SlitterServiceImpl.java      |  5 ++--
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
index 38d0c44c4..c8c0566d6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
@@ -132,4 +132,6 @@ public interface IBstIvtCutpointivtService extends IService<BstIvtCutpointivt> {
      * @return /
      */
     List<BstIvtCutpointivt> getPintByAgvCodesByPointTypeAndArea(String area, List<String> types);
+
+    List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
index 257f2d933..fc638ef7a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
@@ -25,4 +25,6 @@ public interface BstIvtCutpointivtMapper extends BaseMapper<BstIvtCutpointivt> {
     List<BstIvtCutpointivt> getReallyQzzSameDevice(String resourceName);
 
     List<BstIvtCutpointivt> getAreaNotTaskPointByStatusNotCheckPickUpCompleted(String type, String pointStatus, String area, String sort);
+
+    List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
index 67f068412..593a5bc74 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
@@ -136,4 +136,30 @@
             ORDER BY bic.sort_seq DESC
         </if>
     </select>
+    <select id="getNBJCanUsePoint" resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
+        SELECT bic.*
+        FROM bst_ivt_cutpointivt bic
+        WHERE bic.point_type = #{type}
+        AND bic.is_used = '1'
+        AND bic.point_status = #{pointStatus}
+        AND bic.point_location = #{area}
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status <![CDATA[ < ]]> '07'
+        AND t.is_delete = '0'
+        AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code)
+        )
+        AND 0 = (SELECT COUNT(*)
+        FROM sch_base_task t
+        WHERE t.task_status = '071'
+        AND t.is_delete = '0'
+        AND t.point_code2 = bic.point_code
+        )
+        <if test="sort == '1'">
+            ORDER BY bic.sort_seq ASC
+        </if>
+        <if test="sort == '2'">
+            ORDER BY bic.sort_seq DESC
+        </if>
+    </select>
 </mapper>
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
index fc302a2cb..377b679f6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
@@ -153,4 +153,9 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl<BstIvtCutpointivtM
                 .eq(BstIvtCutpointivt::getProduct_area, area)
                 .in(BstIvtCutpointivt::getPoint_type, types));
     }
+
+    @Override
+    public List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort) {
+        return bstIvtCutpointivtMapper.getNBJCanUsePoint(type, pointStatus, area, sort);
+    }
 }
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 79baa0730..066b03c91 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
@@ -1048,8 +1048,9 @@ public class SlitterServiceImpl implements SlitterService {
             List<String> collect = plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList());
             taskParam.put("containers", collect);
         }
-        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
-                "1", "0", "2");
+//        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
+//                "1", "0", "2");
+        List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getNBJCanUsePoint("1", "1", "0", "2");
         if (areaEmptyNotTaskPoint.size() == 0) {
             throw new BadRequestException("请求搬运失败，内包间没有可存放位置！");
         }