From f5cc69d226d73878bfb9a67b3835ff1842732ffe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 11:15:23 +0800
Subject: [PATCH] 1.质检规则优化
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 94ed278..23bf709 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -22,6 +22,7 @@
SELECT
pl.id,
pl.purchase_contract_number,
+ pl.master_contract_no,
pl.sales_contract_no,
pl.supplier_id,
pl.supplier_name,
@@ -82,13 +83,13 @@
sir.stock_in_num
FROM stock_in_record sir
INNER JOIN quality_inspect qi
- ON TRIM(sir.record_type) = '10'
+ ON TRIM(sir.record_type) IN ('6', '10')
AND sir.record_id = qi.id
INNER JOIN sales_ledger_product slp
ON slp.type = 2
AND slp.sales_ledger_id = qi.purchase_ledger_id
AND slp.product_model_id = qi.product_model_id
- WHERE sir.approval_status = 1
+ WHERE qi.inspect_state = 1
) rel
GROUP BY rel.sales_ledger_product_id
) approved_qty ON approved_qty.sales_ledger_product_id = slp.id
@@ -100,6 +101,9 @@
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
AND pl.purchase_contract_number LIKE CONCAT('%', #{c.purchaseContractNumber}, '%')
</if>
+ <if test="c.masterContractNo != null and c.masterContractNo != ''">
+ AND pl.master_contract_no LIKE CONCAT('%', #{c.masterContractNo}, '%')
+ </if>
<if test="c.approvalStatus != null and c.approvalStatus != ''">
AND pl.approval_status = #{c.approvalStatus}
</if>
--
Gitblit v1.9.3