From 6306a1daa9e4ae06d6e14752bfd70f8fbbf85510 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 16:19:38 +0800
Subject: [PATCH] 1.新增调休审核枚举
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index a818160..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,
@@ -35,6 +36,7 @@
pl.approve_user_ids,
sm.is_white,
pl.approval_status,
+ pl.status,
pl.payment_method,
pl.remarks,
CASE
@@ -81,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
@@ -98,6 +100,9 @@
<where>
<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}
@@ -120,6 +125,12 @@
<if test="c.supplierId != null">
AND pl.supplier_id = #{c.supplierId}
</if>
+ <if test="c.ids != null and c.ids.size() > 0">
+ AND pl.id IN
+ <foreach collection="c.ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
<if test="c.approvalStatus != null">
AND pl.approval_status = #{c.approvalStatus}
</if>
--
Gitblit v1.9.3