From 3af9874839c8eb0d7e364cddb8788d8ea8ffc78e Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Tue, 16 Jun 2026 13:19:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=9B=B4=E6=96=B0=E6=8A=BD?=
 =?UTF-8?q?=E6=A0=B7=E6=A3=80=E9=AA=8C=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在抽样检验计划查询中添加排除特定计划编号的条件
- 在抽样检验计划更新中添加计划描述字段的更新支持
---
 src/main/resources/mapper/qms/QcMapper.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/mapper/qms/QcMapper.xml b/src/main/resources/mapper/qms/QcMapper.xml
index e27a3d0..48268c9 100644
--- a/src/main/resources/mapper/qms/QcMapper.xml
+++ b/src/main/resources/mapper/qms/QcMapper.xml
@@ -332,6 +332,9 @@
             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}
+        <if test="samplingPlanNo != null and samplingPlanNo != ''">
+            AND sampling_plan_no != #{samplingPlanNo}
+        </if>
     </select>
 
     <!-- 根据名称查矩阵 -->
@@ -366,6 +369,7 @@
     <update id="samplingInspectionPlanUpdate" parameterType="com.xujie.modules.qms.data.QcSamplingInspectionPlanData">
         UPDATE qc_sampling_inspection_plan
         SET sampling_qty_rank_no = #{samplingQtyRankNo},
+            sampling_plan_desc = #{samplingPlanDesc},
             sampling_level_no = #{samplingLevelNo},
             sampling_qty_no = #{samplingQtyNo},
             sampling_plan_active = #{samplingPlanActive},