From 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 17 六月 2026 15:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
index f1f5c5b..f4d6284 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"
@@ -87,12 +88,14 @@
</select>
<select id="existsByStockInRecordId" resultType="java.lang.Boolean">
- SELECT COUNT(*) > 0
+ SELECT COUNT(*) > 0
FROM account_payment_application
- WHERE
- <foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
- FIND_IN_SET(#{id}, stock_in_record_ids)
- </foreach>
+ WHERE status != 2
+ AND (
+ <foreach collection="stockInRecordIds" item="id" separator=" OR ">
+ FIND_IN_SET(#{id}, stock_in_record_ids) > 0
+ </foreach>
+ )
</select>
</mapper>
--
Gitblit v1.9.3