From 4fa6b3346bb47d813740c292d8c9510838b17b7f Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Mon, 11 May 2026 14:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/heai/modules/pms/mapper/QcMapper.java |  6 +++
 .../pms/service/Impl/QcServiceImpl.java       | 38 ++++++++++++------
 src/main/resources/mapper/pms/QcMapper.xml    | 40 +++++++++++++++++++
 3 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/heai/modules/pms/mapper/QcMapper.java b/src/main/java/com/heai/modules/pms/mapper/QcMapper.java
index 9293ea6..c4e8e14 100644
--- a/src/main/java/com/heai/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/heai/modules/pms/mapper/QcMapper.java
@@ -162,6 +162,12 @@ public interface QcMapper {
 
     QcSamplingInspectionPlanData selectSamplingPlanByNo(QcSamplingInspectionPlanData data);
 
+    QcSamplingInspectionPlanData selectSamplingPlanByOutNo(QcSamplingInspectionPlanData data);
+
+    List<QcSamplingInspectionPlanData> selectSamplingPlanByNoList(QcSamplingInspectionPlanData data);
+
+    List<QcSamplingInspectionPlanData> selectSamplingPlanByDescList(QcSamplingInspectionPlanData data);
+
     String queryLastSamplingPlanNo(QcSamplingInspectionPlanData data);
 
     List<QcInspectionTypeData> inspectionTypeSearch(QcInspectionTypeData data);
diff --git a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
index 4d50085..e4f4559 100644
--- a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
@@ -458,14 +458,14 @@ public class QcServiceImpl implements QcService {
 //            throw new RuntimeException("工厂和部门有误!");
 //        }
         // 根据三个编码查方案
-//        QcSamplingInspectionPlanData samplingPlanData = qcMapper.selectSamplingPlanByNo(data);
-//        QcSamplingInspectionPlanData samplingPlanData2 = qcMapper.selectSamplingPlanByDesc(data);
-//        if (samplingPlanData != null) {
-//            throw new RuntimeException("该矩阵内容已存在!");
-//        }
-//        if (samplingPlanData2 != null) {
-//            throw new RuntimeException("该矩阵名称已存在!");
-//        }
+        QcSamplingInspectionPlanData samplingPlanData = qcMapper.selectSamplingPlanByNo(data);
+        QcSamplingInspectionPlanData samplingPlanData2 = qcMapper.selectSamplingPlanByDesc(data);
+        if (samplingPlanData != null) {
+            throw new RuntimeException("该矩阵内容已存在!");
+        }
+        if (samplingPlanData2 != null) {
+            throw new RuntimeException("该矩阵名称已存在!");
+        }
         // 查询最大编码，自增后赋值
         String s = qcMapper.queryLastSamplingPlanNo(data);
         if (s == null) {
@@ -490,11 +490,25 @@ public class QcServiceImpl implements QcService {
 //            throw new RuntimeException("工厂和部门有误!");
 //        }
         // 根据三个编码查方案
-        QcSamplingInspectionPlanData samplingPlanData = qcMapper.selectSamplingPlanByNo(data);
-        if (samplingPlanData != null) {
-            throw new RuntimeException("该检验方案已存在!");
+        QcSamplingInspectionPlanData samplingPlanData = qcMapper.selectSamplingPlanByOutNo(data);
+        if (samplingPlanData != null  ) {
+            List<QcSamplingInspectionPlanData> samplingPlanData1 = qcMapper.selectSamplingPlanByNoList(data);
+            List<QcSamplingInspectionPlanData> samplingPlanData2 = qcMapper.selectSamplingPlanByDescList(data);
+            if (samplingPlanData1 != null && samplingPlanData1.size() > 0) {
+                for (QcSamplingInspectionPlanData planData:samplingPlanData1) {
+                    if (!planData.getSamplingPlanNo().equals(data.getSamplingPlanNo())) {
+                        throw new RuntimeException("该矩阵内容已存在!");
+                    }
+                }
+            }
+            if (samplingPlanData2 != null && samplingPlanData2.size() > 0) {
+                throw new RuntimeException("该矩阵名称已存在!");
+            }
+            qcMapper.samplingInspectionPlanUpdate(data);
+        }else {
+            throw new RuntimeException("该检验方案不存在!");
         }
-        qcMapper.samplingInspectionPlanUpdate(data);
+
     }
 
     /**
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 611d13c..c3abffa 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -316,6 +316,31 @@
 
     <!-- 根据三个编码查矩阵 -->
     <select id="selectSamplingPlanByNo" resultType="com.heai.modules.pms.data.QcSamplingInspectionPlanData" parameterType="com.heai.modules.pms.data.QcSamplingInspectionPlanData">
+ SELECT top 1
+        site,
+        bu_no,
+        sampling_plan_no,
+        sampling_qty_no,
+        sampling_qty_rank_no,
+        sampling_level_no,
+        sampling_plan_active
+        FROM qc_sampling_inspection_plan
+        WHERE sampling_qty_no = #{samplingQtyNo} AND sampling_qty_rank_no = #{samplingQtyRankNo} AND sampling_level_no = #{samplingLevelNo} AND site = #{site} and bu_no = #{buNo}
+    </select>
+    <select id="selectSamplingPlanByOutNo" resultType="com.heai.modules.pms.data.QcSamplingInspectionPlanData">
+        SELECT top 1
+        site,
+        bu_no,
+        sampling_plan_no,
+        sampling_qty_no,
+        sampling_qty_rank_no,
+        sampling_level_no,
+        sampling_plan_active
+        FROM qc_sampling_inspection_plan
+        WHERE  site = #{site} and bu_no = #{buNo} and sampling_plan_no = #{samplingPlanNo}
+    </select>
+    <select id="selectSamplingPlanByNoList"
+            resultType="com.heai.modules.pms.data.QcSamplingInspectionPlanData">
         SELECT
             site,
             bu_no,
@@ -327,6 +352,19 @@
         FROM qc_sampling_inspection_plan
         WHERE sampling_qty_no = #{samplingQtyNo} AND sampling_qty_rank_no = #{samplingQtyRankNo} AND sampling_level_no = #{samplingLevelNo} AND site = #{site} and bu_no = #{buNo}
     </select>
+    <select id="selectSamplingPlanByDescList"
+            resultType="com.heai.modules.pms.data.QcSamplingInspectionPlanData">
+        SELECT
+        site,
+        bu_no,
+        sampling_plan_no,
+        sampling_qty_no,
+        sampling_qty_rank_no,
+        sampling_level_no,
+        sampling_plan_active
+        FROM qc_sampling_inspection_plan
+        WHERE sampling_plan_desc = #{samplingPlanDesc} AND site = #{site} and bu_no = #{buNo} and sampling_plan_no != #{samplingPlanNo}
+    </select>
 
     <!-- 根据名称查矩阵 -->
     <select id="selectSamplingPlanByDesc" resultType="com.heai.modules.pms.data.QcSamplingInspectionPlanData" parameterType="com.heai.modules.pms.data.QcSamplingInspectionPlanData">
@@ -362,6 +400,7 @@
         SET sampling_qty_rank_no = #{samplingQtyRankNo},
             sampling_level_no = #{samplingLevelNo},
             sampling_qty_no = #{samplingQtyNo},
+            sampling_plan_desc = #{samplingPlanDesc},
             sampling_plan_active = #{samplingPlanActive},
             update_date = getDate(),
             update_by = #{updateBy}
@@ -6343,6 +6382,7 @@
         </where>
         ORDER BY OperationDesc
     </select>
+
 </mapper>