fix: 气胀轴送暂存区代数校验错误

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java

@@ -1,6 +1,7 @@
 package org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
 
 import java.util.List;
@@ -29,5 +30,5 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper<BstIvtShafttubeivt>
      * @param startPoint 点位信息（包含：尺寸、类型、位置）
      * @return /
      */
-    List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint);
+    List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(@Param("startPoint") BstIvtShafttubeivt startPoint);
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml

@@ -40,9 +40,11 @@
         FROM `bst_ivt_shafttubeivt` b
         WHERE b.have_qzz = '0'
           AND b.point_type = '6'
-          AND b.qzz_size = #{qzz_size}
-          AND b.qzz_generation = #{qzz_generation}
-          AND b.point_location = #{point_location}
+          AND b.qzz_size = #{startPoint.qzz_size}
+          <if test="startPoint.qzz_size != 6">
+              AND b.qzz_generation = #{startPoint.qzz_generation}
+          </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_code1 = b.point_code)
         ORDER BY b.sort_seq ASC
     </select>