From 8e52d3e600ff49869cc612fd9bf1cc64ac304f50 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 30 五月 2026 17:20:48 +0800
Subject: [PATCH] feat(sales): 添加销售报价单ID查询条件支持
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 0ac0254..6086121 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -10,7 +10,7 @@
</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
@@ -22,6 +22,7 @@
<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,
@@ -54,6 +55,16 @@
<if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
AND qi.check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
</if>
+ <if test="qualityInspect.purchaseContractNo != null and qualityInspect.purchaseContractNo != '' ">
+ AND pl.purchase_contract_number like concat('%',#{qualityInspect.purchaseContractNo},'%')
+ </if>
+ <if test="qualityInspect.workOrderNo != null and qualityInspect.workOrderNo != '' ">
+ AND pot.work_order_no like concat('%',#{qualityInspect.workOrderNo},'%')
+ </if>
+ <if test="qualityInspect.salesContractNo != null and 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
</select>
--
Gitblit v1.9.3