From 0c9ee949b6a7ea8ce2bbc42cbbd2c64fb977e509 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 14:58:39 +0800
Subject: [PATCH] Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯pro
---
src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
index f1f5c5b..267de0b 100644
--- a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
+++ b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
@@ -44,6 +44,7 @@
AND A.apply_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
</where>
+ order by A.id desc
</select>
<select id="getInboundBatchesBySupplier"
@@ -89,7 +90,7 @@
<select id="existsByStockInRecordId" resultType="java.lang.Boolean">
SELECT COUNT(*) > 0
FROM account_payment_application
- WHERE
+ WHERE status != 2
<foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
FIND_IN_SET(#{id}, stock_in_record_ids)
</foreach>
--
Gitblit v1.9.3