From af2e3ac16cadc0c609043b06b449ca5acf8da310 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 29 九月 2026 17:45:06 +0800
Subject: [PATCH] 新疆-融邦 销售台账、采购台账新增付款类别字段（授信账期/先款后货）：实体/DTO/列表SQL，含数据库迁移脚本
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 95cb482..3263cd0 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -44,6 +44,7 @@
T1.oil_depot_name,
T1.tank_id,
T1.tank_no,
+ T1.tonnage,
T1.approval_status,
T1.entry_person,
T1.remarks,
@@ -53,6 +54,7 @@
T1.execution_date,
T2.nick_name AS entry_person_name,
T1.payment_method,
+ T1.payment_category,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff
FROM
sales_ledger T1
@@ -84,6 +86,7 @@
T1.oil_depot_name,
T1.tank_id,
T1.tank_no,
+ T1.tonnage,
T1.approval_status,
T1.entry_person,
T1.remarks,
@@ -95,19 +98,45 @@
T1.execution_date,
T2.nick_name AS entry_person_name,
T1.payment_method,
+ T1.payment_category,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
+ <!-- 鏄惁鍙戣揣鏀规寜鍒拌揣璁板綍绠楋紝鍒嗕袱绉嶅彴璐︼細
+ 鍗栨补锛氳鍙拌处 type=1 鏄庣粏鐨勫悎鍚屾暟閲忔�诲拰 <= 宸插埌璐ф暟閲忔�诲拰 鎵嶇畻鍙戝畬锛�
+ 浠ｅ偍锛氭病鏈� type=1 鏄庣粏锛屽熀鍑嗙嚎鏀逛负銆岃鍙拌处鍏ㄩ儴宸插鎵规补鍝佸嚭搴撳崟鐨勫嚭搴撻噺鎬诲拰銆嶏紝鍚屾牱銆屽叏閮ㄥ埌璐с�嶆墠绠楀彂瀹屻��
+ 涓や釜鍒嗘敮鍚勮嚜閮借姹傚熀鍑嗙嚎 > 0锛屽惁鍒� 0 <= 0 浼氳鍒ゆ垚銆屽凡鍙戣揣銆� -->
LEFT JOIN (
- SELECT sales_ledger_id,
+ SELECT sl.id AS sales_ledger_id,
CASE
- WHEN SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) = 0 THEN TRUE
+ WHEN IFNULL(d.total_qty, 0) > 0 AND IFNULL(d.total_qty, 0) <= IFNULL(a.total_arrival, 0) THEN TRUE
+ WHEN IFNULL(d.total_qty, 0) = 0 AND IFNULL(o.total_out, 0) > 0
+ AND IFNULL(o.total_out, 0) <= IFNULL(a.total_arrival, 0) THEN TRUE
ELSE FALSE
END AS is_all_shipped
- FROM shipping_info
+ FROM sales_ledger sl
+ LEFT JOIN (
+ SELECT sales_ledger_id, SUM(quantity) AS total_qty
+ FROM sales_ledger_product
+ WHERE type = 1
GROUP BY sales_ledger_id
+ ) d ON d.sales_ledger_id = sl.id
+ LEFT JOIN (
+ SELECT sales_ledger_id, SUM(arrival_quantity) AS total_arrival
+ FROM sales_ledger_arrival
+ GROUP BY sales_ledger_id
+ ) a ON a.sales_ledger_id = sl.id
+ <!-- 浠ｅ偍娌℃湁缁戝畾琛紝鍑哄簱鍗曠殑鍗曞�煎垪 sales_ledger_id 鍗充负鏉冨▉瀵瑰簲鍏崇郴 -->
+ LEFT JOIN (
+ SELECT sor.sales_ledger_id, SUM(sor.stock_out_num) AS total_out
+ FROM stock_out_record sor
+ WHERE sor.approval_status = 1
+ AND (sor.type IS NULL OR sor.type = '')
+ AND sor.sales_ledger_id IS NOT NULL
+ GROUP BY sor.sales_ledger_id
+ ) o ON o.sales_ledger_id = sl.id
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
<where>
@@ -151,15 +180,17 @@
FROM sales_ledger
GROUP BY customer_name
</select>
+ <!-- 宸插彂璐х殑鍙拌处锛氬彛寰勪笌 is_fh 涓�鑷达紝鏀逛负銆屾湁鍒拌揣璁板綍鐨勫彴璐︺�� -->
<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
- where si.status = '宸插彂璐�'
- <if test="ew.customerName != null and ew.customerName != '' ">
- and sl.customer_name like concat('%',#{ew.customerName},'%')
- </if>
+ inner join sales_ledger_product slp on sl.id = slp.sales_ledger_id
+ inner join sales_ledger_arrival sla on sla.sales_ledger_product_id = slp.id
+ <where>
+ <if test="ew.customerName != null and ew.customerName != '' ">
+ sl.customer_name like concat('%',#{ew.customerName},'%')
+ </if>
+ </where>
order by sl.execution_date desc
</select>
<select id="selectPurchaseReportVoPage" resultType="com.ruoyi.purchase.vo.PurchaseReportVo">
--
Gitblit v1.9.3