From 46944d762174e5b7e7a627c59928e2a3c9e03dd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 30 五月 2026 15:23:11 +0800
Subject: [PATCH] feat(quality): 增加检验管理功能并完善库存预警
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index ed01cad..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,
@@ -61,7 +62,8 @@
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
</select>
--
Gitblit v1.9.3