From 77775b9f3d7179f251ce85421fb9a21d106f1446 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 06 一月 2026 17:56:35 +0800
Subject: [PATCH] 协同办公-发货审批页面，开发接口。优化添加发货信息接口，勾连发货审批。优化销售产品查询接口，多表联查数据。添加发货车牌号、发货日期、审批状态、返回数据。
---
src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
index 45f6109..9edbea4 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
@@ -18,10 +18,20 @@
T1.tenant_id,
T2.customer_contract_no,
T3.customer_name,
- T2.contract_amount
+ T2.contract_amount,
+ CASE WHEN T4.noInvoiceAmountTotal IS NULL THEN 0 ELSE T4.noInvoiceAmountTotal END AS noInvoiceAmountTotal
FROM invoice_registration T1
LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
LEFT JOIN customer T3 ON T1.customer_id = T3.id
+ LEFT JOIN (
+ SELECT
+ SUM( no_invoice_amount ) AS noInvoiceAmountTotal ,
+ invoice_registration_id
+ FROM
+ invoice_registration_product
+ GROUP BY
+ invoice_registration_id
+ ) T4 ON T1.id = T4.invoice_registration_id
</select>
<select id="invoiceRegisAndProductExcelDtoList" resultType="com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto">
--
Gitblit v1.9.3