fix: 套轴完毕暂存创建任务时过滤任务

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java

@@ -50,4 +50,5 @@ public interface SchBasePointMapper extends BaseMapper<SchBasePoint> {
     List<JSONObject> isBlock(JSONObject whereJson);
 
 
+    SchBasePoint getOneAndNotTask(String productArea);
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml

@@ -147,4 +147,16 @@
             )
 
     </select>
+    <select id="getOneAndNotTask" resultType="org.nl.b_lms.sch.point.dao.SchBasePoint">
+        SELECT
+        *
+        FROM
+        sch_base_point p
+        WHERE p.product_area = #{productArea}
+        AND p.point_type = '6'
+        AND p.is_used = '1'
+        AND p.is_delete = '0'
+        AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.is_delete = '0' AND t.task_status <![CDATA[ <> ]]> '07' AND t.point_code2 = p.point_code)
+        AND p.region_code LIKE '%-FQCR'
+    </select>
 </mapper>

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java

@@ -43,6 +43,7 @@ public interface IschBasePointService extends IService<SchBasePoint> {
     void deleteAll(Set<String> ids);
 
 
+    SchBasePoint getoneAndNotTask(String productArea);
 }
 
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/SchBasePointServiceImpl.java

@@ -79,6 +79,11 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         schBasePointMapper.deleteBatchIds(ids);
     }
 
+    @Override
+    public SchBasePoint getoneAndNotTask(String productArea) {
+        return schBasePointMapper.getOneAndNotTask(productArea);
+    }
+
 
     /**
      * 获取实体基础信息

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java

@@ -236,12 +236,7 @@ public class PaperTrussTask extends AbstractAcsTask {
                         // 判断对应区域的IN点是不是有托盘，并且托盘是一样的位置
                         IschBasePointService pointService = SpringContextHolder.getBean(IschBasePointService.class);
                         PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class);
-                        SchBasePoint inPoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
-                                .eq(SchBasePoint::getProduct_area, product_area)
-                                .eq(SchBasePoint::getPoint_type, "6")
-                                .eq(SchBasePoint::getIs_used, "1")
-                                .eq(SchBasePoint::getIs_delete, "0")
-                                .like(SchBasePoint::getRegion_code, "-FQCR"));
+                        SchBasePoint inPoint = pointService.getoneAndNotTask(product_area);
                         if (ObjectUtil.isNotEmpty(inPoint)) {
                             if (ObjectUtil.isNotEmpty(inPoint.getVehicle_code())) {
                                 // 判断载具是不是同区域