From 2f4bd64a9197f111c4538f881bf016527061fef4 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 4 Jun 2025 17:13:16 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=A5=97=E8=BD=B4=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8DSQL-=E5=88=A4=E7=A9=BA?=
 =?UTF-8?q?=E3=80=81=E8=BF=87=E6=BB=A4=E7=BB=84=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/BstIvtCutpointivtMapper.xml    | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

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 e8f0fdb1d..51f3a1ccb 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,14 +98,33 @@
     <select id="getCachePointSame" resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
         SELECT bc.*
         FROM bst_ivt_cutpointivt bc
-        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.restruct_container_name = #{parent_container_name} AND p.parent_container_name = #{parent_container_name})
-        AND p.split_group = #{split_group}
-        AND p.is_delete = '0'
-        AND bc.is_used = '1'
+                 LEFT JOIN pdm_bi_slittingproductionplan p
+                     ON IFNULL(p.qzzno, '') <![CDATA[ <> ]]> '' AND (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.is_delete = '0'
+          AND bc.is_used = '1'
+        UNION
+        SELECT bc.*
+        FROM bst_ivt_cutpointivt bc
+                 LEFT JOIN pdm_bi_slittingproductionplan p
+                     ON IFNULL(p.qzzno, '') <![CDATA[ <> ]]> '' AND (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.restruct_container_name = #{parent_container_name}
+          AND p.split_group = #{split_group}
+          AND p.is_delete = '0'
+          AND bc.is_used = '1'
     </select>
     <select id="getReallyQzzSameDevice"
             resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">