From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index a4949aa..552b83d 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -56,15 +56,13 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
+ T1.contract_amount as noInvoiceAmountTotal,
T1.execution_date,
T2.nick_name AS entry_person_name,
- T1.payment_method,
- t3.shipping_car_number,
- t3.shipping_date
+ T1.payment_method
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
- left join shipping_info t3 on T1.id = t3.sales_ledger_id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
--
Gitblit v1.9.3