From 94733d795bd531171b4d043993f126ec019143fd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 30 六月 2026 14:11:41 +0800
Subject: [PATCH] 出厂检验同步返回销售总合同号
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 74b3e98..8880860 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -10,7 +10,8 @@
</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
@@ -65,7 +67,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 +473,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