From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填,有时候可能不含税

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

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 3fed962..8c23d7c 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -25,8 +25,27 @@
         from purchase_ledger pl
         left join product_record pr on pl.id = pr.purchase_ledger_id
         <where>
+            1 = 1
+            <if test="c.isInvoice != null and c.isInvoice != '' ">
+                AND  pl.is_invoice = #{c.isInvoice}
+            </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>
         </where>
         group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,

--
Gitblit v1.9.3