From 7ec9b6c159fcb52b35910bca508ad730ab645267 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 17:19:51 +0800
Subject: [PATCH] feat(sales): 新增售后台账功能并优化发货流程
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 2e04dde..90e87ee 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -118,11 +118,15 @@
FROM sales_ledger
GROUP BY customer_name
</select>
- <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
- select distinct sl.id as 'disId', sl.* from
- sales_ledger sl
- left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
- left join shipping_info si on slp.id = si.sales_ledger_product_id
+ <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.AfterSalesLedgerDto">
+ select
+ si.*,sl.sales_contract_no,sl.customer_contract_no,
+ sl.project_name,sl.entry_date,sl.salesman,sl.customer_id,sl.customer_name,
+ sl.entry_person,sl.remarks,sl.attachment_materials,sl.tenant_id,
+ sl.contract_amount,sl.execution_date,sl.payment_method,sl.delivery_date
+ from shipping_info si
+ left join sales_ledger_product slp on slp.id = si.sales_ledger_product_id
+ left join sales_ledger sl on sl.id = slp.sales_ledger_id
where si.status = '宸插彂璐�'
<if test="ew.customerName != null and ew.customerName != '' ">
and sl.customer_name like concat('%',#{ew.customerName},'%')
--
Gitblit v1.9.3