From ec0278c4d914114b8d4c9aee059b53d59cbbb0ae Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 15 Jul 2024 00:06:08 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20sql=E6=94=B9=E8=BF=9B=EF=BC=8C=E8=80=83?=
 =?UTF-8?q?=E8=99=91=E6=94=B9=E5=88=87=E7=9A=84=E5=88=86=E5=88=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cutpointivt/service/IBstIvtCutpointivtService.java   | 1 +
 .../service/dao/mapper/BstIvtCutpointivtMapper.xml       | 4 +++-
 .../sch/tasks/slitter/auto/AutoCallAirShaftTask.java     | 2 ++
 .../nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml  | 9 ++++++---
 .../tasks/slitter/service/impl/SlitterServiceImpl.java   | 1 +
 5 files changed, 13 insertions(+), 4 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 acf2378e1..38d0c44c4 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
@@ -112,6 +112,7 @@ public interface IBstIvtCutpointivtService extends IService<BstIvtCutpointivt> {
 
     /**
      * 校验相同母卷、相同设备、相同组的数据
+     * 这里的母卷可能是来源子卷号
      * @param dto /
      * @return /
      */
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 834a66c9d..be8f14989 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
@@ -98,7 +98,9 @@
         LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bc.qzz_no1 OR p.qzzno = bc.qzz_no2
         WHERE bc.point_type = '1' AND bc.point_status = '2' AND (IFNULL(bc.qzz_no1,'') <![CDATA[ <> ]]> '' OR IFNULL(bc.qzz_no2,'') <![CDATA[ <> ]]> ''
         ) AND (IFNULL(bc.qzz_no1,'') = '' OR IFNULL(bc.qzz_no2,'') = '')
-        AND p.resource_name = #{resource_name} AND p.parent_container_name = #{parent_container_name} AND p.split_group = #{split_group}
+        AND p.resource_name = #{resource_name}
+        AND (p.restruct_container_name = #{parent_container_name} OR p.parent_container_name = #{parent_container_name})
+        AND p.split_group = #{split_group}
     </select>
     <select id="getReallyQzzSameDevice"
             resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index 733d8d31e..19dacb3ab 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -406,6 +406,7 @@ public class AutoCallAirShaftTask {
      * @param qzzSize   气涨轴尺寸
      */
     private void saveCutPlanMessage(BstIvtShafttubeivt empty, List<PdmBiSlittingproductionplan> needPlans, String qzzSize) {
+        log.info("正在保存套轴信息 - {} , 尺寸 - {} 到点位 - {}", needPlans, qzzSize, empty);
         empty.setHave_qzz(SlitterConstant.SLITTER_YES);
         empty.setQzz_size(qzzSize);
         TaskUtils.updateOptMessageByBShaftPoint(empty);
@@ -440,6 +441,7 @@ public class AutoCallAirShaftTask {
             TaskUtils.updateOptMessageBySlitterPlan(p);
         });
         slittingproductionplanService.updateBatchById(needPlans);
+        log.info("保存完毕，并且分切计划已经更改");
     }
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
index 844f500f6..c4af65626 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
@@ -9,8 +9,10 @@
         FROM
             `bst_ivt_cutpointivt` bct
                 LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bct.qzz_no1 OR p.qzzno = bct.qzz_no2
-        WHERE bct.point_status = '2' AND p.parent_container_name = #{parent_container_name} AND p.split_group = #{split_group}
-          AND (LENGTH(bct.qzz_no1) = 0 OR LENGTH(bct.qzz_no2) = 0)
+        WHERE bct.point_status = '2'
+          AND p.restruct_container_name = #{restruct_container_name} AND p.parent_container_name = #{parent_container_name}
+          AND p.split_group = #{split_group}
+          AND (IFNULL(bct.qzz_no1,'') = '' OR IFNULL(bct.qzz_no2,'') = '')
           AND (LENGTH(bct.qzz_no1) <![CDATA[ > ]]> 0 OR LENGTH(bct.qzz_no2) <![CDATA[ > ]]> 0)
           AND bct.point_type = '1'
           AND bct.is_used = '1'
@@ -21,7 +23,8 @@
         FROM sch_base_task t
         LEFT JOIN pdm_bi_slittingproductionplan p ON t.vehicle_code = p.qzzno OR t.vehicle_code2 = p.qzzno
         WHERE t.task_status <![CDATA[ < ]]> '07' AND t.handle_class = 'org.nl.b_lms.sch.tasks.slitter.TrussSendAirShaftTask'
-        AND p.parent_container_name = #{parent_container_name} AND p.split_group = #{split_group}
+          AND p.restruct_container_name = #{restruct_container_name} AND p.parent_container_name = #{parent_container_name}
+          AND p.split_group = #{split_group}
     </select>
     <select id="getAreaFullVolume" resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
         SELECT bct.*
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 d89bb0a78..fc2e32723 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
@@ -256,6 +256,7 @@ public class SlitterServiceImpl implements SlitterService {
                 .in(PdmBiSlittingproductionplan::getContainer_name, collect)
                 .eq(PdmBiSlittingproductionplan::getStatus, "01")
                 .eq(PdmBiSlittingproductionplan::getIs_delete, "0"));
+        // 去异常位
         if (plans.size() == 0) {
             log.error("找不到[{}]对应的分切计划，分切计划可能被删除或者拼接!", collect);
             // 移动到异常处理位