From 23c8604bc54ba3f20b0bf00a2649895c8e096a05 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 09 六月 2026 14:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
index 99b16d2..7884e75 100644
--- a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
+++ b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
@@ -25,6 +25,7 @@
AND A.apply_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
</where>
+ order by A.id desc
</select>
<select id="getOutboundBatchesByCustomer"
resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo">
@@ -64,7 +65,7 @@
<select id="existsByStockOutRecordId" resultType="java.lang.Boolean">
SELECT COUNT(*) > 0
FROM account_invoice_application
- WHERE
+ WHERE status!=2
<foreach collection="stockOutRecordIds" item="id" open="(" separator=" OR " close=")">
FIND_IN_SET(#{id}, stock_out_record_ids)
</foreach>
--
Gitblit v1.9.3