From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误

---
 src/main/resources/mapper/quality/QualityTestStandardMapper.xml |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index 96448f5..5c20733 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -7,18 +7,29 @@
         FROM quality_test_standard
         where
         1=1
-        <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
-            AND product_id = #{qualityTestStandard.productId}
+        <if test="c.standardNo != null and c.standardNo != '' ">
+            AND standard_no like concat('%',#{c.standardNo},'%')
+        </if>
+        <if test="c.standardName != null and c.standardName != '' ">
+            AND standard_name like concat('%',#{c.standardName},'%')
+        </if>
+        <if test="c.state != null ">
+            AND state =#{c.state}
+        </if>
+        <if test="c.inspectType != null ">
+            AND inspect_type =#{c.inspectType}
         </if>
     </select>
-    <select id="qualityTestStandardList" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
-        SELECT
-        *
-        FROM quality_test_standard
-        where
-        1=1
-        <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
-            AND product_id = #{qualityTestStandard.productId}
+    <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
+        SELECT qts.*
+        FROM quality_test_standard qts
+                 left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
+                 left join product_process pp on qts.process_id = pp.id
+        WHERE qtsb.product_id = #{productId}
+          AND qts.inspect_type = #{inspectType}
+        <if test="process!='' and process!=null">
+            and pp.name = #{process}
         </if>
+        order by qts.id desc
     </select>
 </mapper>

--
Gitblit v1.9.3