From fb3a5d1f1c77848dfe5fd47d0cb4132ad25c1564 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 24 六月 2026 13:09:12 +0800
Subject: [PATCH] 客户往来,供应商往来优化

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index a818160..bac1534 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -81,13 +81,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
@@ -120,6 +120,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