From fc830b7f62af651acedb8c11f1e2634fe2a3e497 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 14:20:46 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 5db186a..b2a18d8 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -11,7 +11,7 @@
t3.shipping_date
FROM
sales_ledger_product T1
- left join shipping_info t3 on T1.id = t3.sales_ledger_id
+ left join shipping_info t3 on T1.id = t3.sales_ledger_product_id
<where>
1=1
<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
@@ -67,9 +67,10 @@
<select id="listPagePurchaseLedger" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
select slp.*,
sl.project_name,
- sl.customer_name,
+ sl.supplier_name,
+ sl.supplier_id,
sl.sales_contract_no,
- sl.customer_contract_no
+ sl.purchase_contract_number
from sales_ledger_product slp
left join purchase_ledger sl on slp.sales_ledger_id = sl.id
<where>
--
Gitblit v1.9.3