Merge remote-tracking branch 'origin/master_merge' into master_merge

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

@@ -13,6 +13,7 @@
           AND 0 = (SELECT COUNT(*)
                    FROM sch_base_task t
                    WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
+                     AND t.is_delete = '0'
                      AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code
                               OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1
                               OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2)
@@ -42,6 +43,7 @@
           AND 0 = (SELECT COUNT(*)
                    FROM sch_base_task t
                    WHERE t.task_status <![CDATA[ < ]]> '07'
+                     AND t.is_delete = '0'
                      AND (t.point_code1 = bc.truss_point_code1 OR t.point_code1 = bc.truss_point_code2))
     </select>
     <select id="getAreaNotTaskPointByLocationAreaAndStatus"
@@ -56,7 +58,7 @@
         AND bic.point_location = #{location}
         AND 0 = (SELECT COUNT(*)
         FROM sch_base_task t
-        WHERE t.task_status <![CDATA[ < ]]> '07'
+        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
         OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1
         OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2)
@@ -81,7 +83,7 @@
         FROM
         sch_base_task t
         WHERE
-        t.task_status <![CDATA[ < ]]> '07'
+        t.task_status <![CDATA[ < ]]> '07' AND t.is_delete = '0'
         AND (
             t.point_code1 = bic.point_code
             OR t.point_code2 = bic.point_code
@@ -122,7 +124,7 @@
         AND bic.point_location = #{area}
         AND 0 = (SELECT COUNT(*)
         FROM sch_base_task t
-        WHERE t.task_status <![CDATA[ < ]]> '07'
+        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
         OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1
         OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2)

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java

@@ -1,6 +1,7 @@
 package org.nl.b_lms.sch.tasks.slitter.auto;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -128,7 +129,7 @@ public class AutoCallAirShaftTask {
                 makePullShaft(empty, specification);
                 return;
             }
-            log.info("获取过滤后的分切计划数据：{}", plans);
+            log.info("获取过滤后的分切计划数据：{}", JSON.toJSONString(plans));
             // 查看套轴对接位是否满了
             // todo: 这里需要注意不要去校验071的任务，不然提前释放货位没意义。
             List<BstIvtCutpointivt> emptyShaftPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
@@ -167,6 +168,7 @@ public class AutoCallAirShaftTask {
                     .findFirst()
                     .orElse(null);
             if (planDto == null) {
+                log.warn("过滤3/6寸和代数输出结果为空，跳过此次套轴。此时点位对应代数：{}", specification);
                 return;
             }
             log.info("此时获取的分切计划dto: {}", planDto);