From c4409fac0044cc1efeda07b6a7709c3fde1aa9fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 10:46:32 +0800
Subject: [PATCH] fix(仓储物流): ①出库新增临时跳过租户插件修复 SetOperationList 解析异常 ②库存预警查询补 warningLevel/warningStatus/warningTime/expectedShortageTime/suggestionType/suggestionContent 字段 ③currentStock 别名

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

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 3fed962..e9ee182 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -25,8 +25,30 @@
         from purchase_ledger pl
         left join product_record pr on pl.id = pr.purchase_ledger_id
         <where>
+            1 = 1
+            <if test="c.tenantId != null">
+                AND pl.tenant_id = #{c.tenantId}
+            </if>
             <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
-                pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+               and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+            </if>
+            <if test="c.supplierName != null and c.supplierName != ''">
+                and pl.supplier_name like concat('%',#{c.supplierName},'%')
+            </if>
+            <if test="c.salesContractNo != null and c.salesContractNo != ''">
+                and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
+            </if>
+            <if test="c.projectName != null and c.projectName != ''">
+                and pl.project_name like concat('%',#{c.projectName},'%')
+            </if>
+            <if test="c.entryDateStart != null and c.entryDateStart != '' ">
+                AND pl.entry_date &gt;= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
+                AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
+            </if>
+            <if test="c.recorderId != null and c.recorderId != '' ">
+                AND  pl.recorder_id = #{c.recorderId}
             </if>
         </where>
         group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
@@ -54,4 +76,4 @@
         WHERE
             T4.id = #{id}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3