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/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 3 +++
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 2 ++
doc/20260929_add_payment_category_to_sales_and_purchase_ledger.sql | 3 +++
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 2 ++
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 1 +
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 4 ++++
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 7 +++++++
7 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/doc/20260929_add_payment_category_to_sales_and_purchase_ledger.sql b/doc/20260929_add_payment_category_to_sales_and_purchase_ledger.sql
new file mode 100644
index 0000000..93ba118
--- /dev/null
+++ b/doc/20260929_add_payment_category_to_sales_and_purchase_ledger.sql
@@ -0,0 +1,3 @@
+-- 閿�鍞彴璐︺�侀噰璐彴璐︽柊澧炲瓧娈点�屼粯娆剧被鍒�嶏紙鎺堜俊璐︽湡/鍏堟鍚庤揣锛�
+ALTER TABLE `sales_ledger` ADD COLUMN `payment_category` varchar(20) DEFAULT NULL COMMENT '浠樻绫诲埆锛氭巿淇¤处鏈�/鍏堟鍚庤揣' AFTER `payment_method`;
+ALTER TABLE `purchase_ledger` ADD COLUMN `payment_category` varchar(20) DEFAULT NULL COMMENT '浠樻绫诲埆锛氭巿淇¤处鏈�/鍏堟鍚庤揣' AFTER `payment_method`;
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 93812e2..3300bc2 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -201,6 +201,8 @@
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Schema(description = "浠樻绫诲埆锛氭巿淇¤处鏈�/鍏堟鍚庤揣")
+ private String paymentCategory;
@Schema(description = "閲囪喘绫诲埆锛氬瀛樸�佷唬鍌ㄣ�侀噰璐叆搴撱�侀噰璐洿閿�")
private String purchaseCategory;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index cdcfcd9..136414f 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -156,6 +156,13 @@
private String paymentMethod;
/**
+ * 浠樻绫诲埆锛氭巿淇¤处鏈熴�佸厛娆惧悗璐�
+ */
+ @Schema(description = "浠樻绫诲埆")
+ @Excel(name = "浠樻绫诲埆")
+ private String paymentCategory;
+
+ /**
* 閲囪喘绫诲埆锛氬瀛樸�佷唬鍌ㄣ�侀噰璐叆搴撱�侀噰璐洿閿�
*/
@Schema(description = "閲囪喘绫诲埆")
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index b8157c5..1757172 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -59,6 +59,9 @@
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Schema(description = "浠樻绫诲埆锛氭巿淇¤处鏈�/鍏堟鍚庤揣")
+ private String paymentCategory;
+
@Schema(description = "浜よ揣鏃ユ湡")
private LocalDate deliveryDate;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 6cc77f1..4f14a95 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -173,6 +173,10 @@
@Excel(name = "瀹℃壒鐘舵��")
private String approvalStatus;
+ @Schema(description = "浠樻绫诲埆锛氭巿淇¤处鏈�/鍏堟鍚庤揣")
+ @Excel(name = "浠樻绫诲埆")
+ private String paymentCategory;
+
/**
* 瀹㈡埛淇℃墭鍩洪噾锛堟煡璇㈡椂鐢辨湇鍔″眰鎸� customerId 鍥炲～锛屼笉鏄湰琛ㄥ瓧娈碉級
*/
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index fd78a05..71b17dd 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -38,6 +38,7 @@
sm.is_white,
pl.approval_status,
pl.payment_method,
+ pl.payment_category,
pl.remarks,
pl.purchase_category,
pl.pickup_method,
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 366520c..3263cd0 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -54,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
@@ -97,6 +98,7 @@
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
--
Gitblit v1.9.3