From ffb7c59cadfb8a043a41849fd6d093f7967ea4cb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 06 八月 2026 10:24:59 +0800
Subject: [PATCH] feat(quality): 增加不合格品拒收处理功能
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index c2e5ee3..f5b5ffc 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -5,12 +5,13 @@
SELECT
qi.*,
<choose>
- <when test="qualityInspect.inspectType == 0">
+ <when test="qualityInspect.inspectType != 2">
pl.purchase_contract_number as purchase_contract_no
</when>
<otherwise>
pot.work_order_no,
- COALESCE(sl.sales_contract_no, po_sales.sales_contract_no) as sales_contract_no
+ COALESCE(sl.sales_contract_no, po_sales.sales_contract_no) as sales_contract_no,
+ COALESCE(sl.master_contract_no, po_sales.master_contract_no) as master_contract_no
</otherwise>
</choose>
FROM
@@ -26,7 +27,8 @@
left join production_order po ON po.id = pot.production_order_id
left join (
select po2.id as order_id,
- group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as sales_contract_no
+ group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as sales_contract_no,
+ group_concat(distinct sl2.master_contract_no order by sl2.master_contract_no separator ',') as master_contract_no
from production_order po2
left join production_plan pp2
on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
@@ -49,6 +51,9 @@
<if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
AND qi.product_name like concat('%',#{qualityInspect.productName},'%')
</if>
+ <if test="qualityInspect.checkName != null and qualityInspect.checkName != '' ">
+ AND qi.check_name like concat('%',#{qualityInspect.checkName},'%')
+ </if>
<if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' ">
AND qi.check_time >= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
</if>
@@ -65,7 +70,7 @@
AND (sl.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%')
OR po_sales.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%'))
</if>
- ORDER BY qi.check_time DESC
+ ORDER BY qi.create_time DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
@@ -471,5 +476,16 @@
</select>
+ <select id="selectProductModelById" resultType="com.ruoyi.basic.pojo.ProductModel">
+ SELECT id, product_id, model, unit
+ FROM product_model
+ WHERE id = #{id}
+ </select>
+
+ <select id="selectProductById" resultType="com.ruoyi.basic.pojo.Product">
+ SELECT id, product_name
+ FROM product
+ WHERE id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3