From 3938a9d9f636dfa538443fc9883113c697c1f0ff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:48:40 +0800
Subject: [PATCH] fix: 清理配置文件
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index e11ad20..ea98e2b 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -27,7 +27,6 @@
pl.supplier_name,
pl.project_name,
pl.contract_amount,
- pl.net_contract_amount,
pl.entry_date,
pl.execution_date,
pl.recorder_id,
@@ -89,6 +88,23 @@
AND slp.sales_ledger_id = qi.purchase_ledger_id
AND slp.product_model_id = qi.product_model_id
WHERE sir.approval_status = 1
+
+ UNION ALL
+
+ SELECT slp.id AS sales_ledger_product_id,
+ sir.stock_in_num
+ FROM stock_in_record sir
+ INNER JOIN quality_unqualified qu
+ ON TRIM(sir.record_type) = '11'
+ AND sir.record_id = qu.id
+ INNER JOIN quality_inspect qi
+ ON qi.id = qu.inspect_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
+
) rel
GROUP BY rel.sales_ledger_product_id
) approved_qty ON approved_qty.sales_ledger_product_id = slp.id
@@ -121,12 +137,6 @@
<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>
@@ -135,7 +145,7 @@
<if test="c.stockInStatus != null and c.stockInStatus != ''">
WHERE result.stock_in_status = #{c.stockInStatus}
</if>
- ORDER BY result.entry_date DESC
+ ORDER BY result.entry_date DESC, result.purchase_contract_number DESC
</select>
<select id="selectTotalPurchaseAmount" resultType="java.math.BigDecimal">
--
Gitblit v1.9.3