From acaf0e69a594f36ef9be6749c2b8d66e4ef6123b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 15:54:33 +0800
Subject: [PATCH] feat: 发货审批根据合同号合并到第一条(未审批)的记录中

---
 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 8e01079..0c1ad2f 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -196,6 +196,9 @@
             <if test="req.supplierName != null and req.supplierName != '' ">
                 T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
             </if>
+            <if test="req.purchaseContractNumber != null and req.purchaseContractNumber != '' ">
+                AND T1.purchase_contract_number LIKE CONCAT ('%',#{req.purchaseContractNumber},'%')
+            </if>
         </where>
         GROUP BY T1.supplier_id, T1.supplier_name
     </select>
@@ -216,6 +219,9 @@
             <if test="req.supplierName != null and req.supplierName != '' ">
                 AND T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
             </if>
+            <if test="req.purchaseContractNumber != null and req.purchaseContractNumber != '' ">
+                AND T1.purchase_contract_number LIKE CONCAT ('%',#{req.purchaseContractNumber},'%')
+            </if>
         </where>
         GROUP BY T1.supplier_id, T1.supplier_name, T1.purchase_contract_number, T2.payment_date
     </select>

--
Gitblit v1.9.3