From d46b856eeaae0de7e00abd8d9ade6b391ce44847 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 17 Jan 2025 08:15:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E5=8C=85=E9=97=B4=E6=B0=94?=
 =?UTF-8?q?=E8=83=80=E8=BD=B4=E6=9A=82=E5=AD=98=E5=BA=93=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/mapper/BstIvtShafttubeivtMapper.xml          | 5 +++++
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
index 4d5c5115e..fef818915 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
@@ -48,6 +48,11 @@
           </if>
           AND b.point_location = #{startPoint.point_location}
           AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
+            AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6'
+                <if test="startPoint.qzz_size != 6">
+                    AND b.qzz_generation = #{startPoint.qzz_generation}
+                </if>
+            AND bb.qzz_size = #{startPoint.qzz_size} AND bb.point_location = #{startPoint.point_location} AND bb.sort_seq > b.sort_seq)
         ORDER BY b.sort_seq ASC
     </select>
     <select id="getOtherCBJData" resultType="org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt">
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 341e8816f..a63497329 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
@@ -409,6 +409,8 @@ public class SlitterServiceImpl implements SlitterService {
         if (shafttubeivts.size() == 0) {
             throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
         }
+        // todo: 过滤空位后面是否有轴的位置
+
         BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
         RLock lockPoint = redissonClient.getLock(shafttubeivt.getPoint_code());
         boolean tryLockPoint = lockPoint.tryLock(0, TimeUnit.SECONDS);