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/procurementrecord/ProcurementRecordOutMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 8c35ffc..ec91c53 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -7,6 +7,7 @@
         t3.supplier_name,
         t2.product_category,
         t1.id,
+        t1.code,
         t2.specification_model,
         t2.unit,
         t2.tax_rate,
@@ -14,8 +15,9 @@
         t2.tax_inclusive_total_price,
         t2.tax_exclusive_total_price,
         t1.inbound_num,
-        t1.create_date,
-        t1.create_by
+        t1.create_time,
+        t1.create_by,
+        t2.warn_num
         from  procurement_record_out t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
         left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -23,6 +25,9 @@
             1 = 1
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
+            </if>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
         </where>
     </select>
@@ -38,7 +43,8 @@
             t2.tax_inclusive_total_price,
             t2.tax_exclusive_total_price,
             t1.inbound_num,
-            t1.create_date,
+            t1.create_time,
+            t1.create_time as time,
             t1.create_by
         from  procurement_record_out t1
                   left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id

--
Gitblit v1.9.3