From 8bb01e7f9170c594da319f4ab1f18ae0351817fd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 30 六月 2026 14:22:05 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
index 3c74a44..4121614 100644
--- a/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
+++ b/src/main/resources/mapper/account/sales/AccountInvoiceApplicationMapper.xml
@@ -72,5 +72,26 @@
</foreach>
)
</select>
+ <select id="selectAccountInvoiceApplicationList"
+ resultType="com.ruoyi.account.bean.vo.sales.AccountInvoiceApplicationVo">
+ select
+ *
+ from (
+ select aia.*,
+ asi.id AS sales_invoice_id,
+ asi.status AS sales_invoice_status,
+ c.customer_name,
+ GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
+ from account_invoice_application aia
+ left join customer c on aia.customer_id = c.id
+ left join stock_out_record sour on FIND_IN_SET(sour.id, aia.stock_out_record_ids) > 0
+ left join account_sales_invoice asi on aia.id = asi.account_invoice_application_id
+ GROUP BY aia.id
+ )A
+ WHERE A.customer_id = #{customerId}
+ AND (COALESCE(A.sales_invoice_id,'') = '' OR A.sales_invoice_status = 1)
+ AND A.status = 1
+ order by A.id desc
+ </select>
</mapper>
--
Gitblit v1.9.3