From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index ed01cad..29cc361 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -5,23 +5,24 @@
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,
- po_sales.sales_contract_no
+ COALESCE(sl.sales_contract_no, po_sales.sales_contract_no) as sales_contract_no
</otherwise>
</choose>
FROM
quality_inspect qi
<choose>
- <when test="qualityInspect.inspectType == 0 ">
+ <when test="qualityInspect.inspectType != 2 ">
LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
</when>
<otherwise>
LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
LEFT JOIN production_operation_task pot ON ppm.production_operation_task_id = pot.id
+ LEFT JOIN sales_ledger sl ON sl.id = qi.sales_ledger_id
left join production_order po ON po.id = pot.production_order_id
left join (
select po2.id as order_id,
@@ -61,9 +62,10 @@
AND pot.work_order_no like concat('%',#{qualityInspect.workOrderNo},'%')
</if>
<if test="qualityInspect.salesContractNo != null and qualityInspect.salesContractNo != '' ">
- AND po_sales.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%')
+ 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">
@@ -469,5 +471,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