From d1b5cafeaf5d26a762350c04ebb02ea5b3b8ee7c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 24 七月 2025 10:39:15 +0800
Subject: [PATCH] 运费优化
---
main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java | 11 ++-
main-business/src/main/java/com/ruoyi/business/vo/SalesRecordExportVo.java | 11 ++-
main-business/src/main/resources/db/migration/postgresql/V20250611160300__create_table_sales_record.sql | 131 +++++++++++++++++++++++++++----------------
3 files changed, 97 insertions(+), 56 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
index b2bb962..7bd1688 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
@@ -102,10 +102,15 @@
@TableField(value = "net_profit")
private BigDecimal netProfit;
/**
- * 杩愯垂
+ * 閲囪喘杩愯垂
*/
- @TableField(value = "freight")
- private BigDecimal freight;
+ @TableField(value = "purchasing_freight")
+ private BigDecimal purchasingFreight;
+ /**
+ * 閿�鍞繍璐�
+ */
+ @TableField(value = "sales_freight")
+ private BigDecimal salesFreight;
/**
* 鐧昏浜篿d
*/
diff --git a/main-business/src/main/java/com/ruoyi/business/vo/SalesRecordExportVo.java b/main-business/src/main/java/com/ruoyi/business/vo/SalesRecordExportVo.java
index c0f6308..23b6155 100644
--- a/main-business/src/main/java/com/ruoyi/business/vo/SalesRecordExportVo.java
+++ b/main-business/src/main/java/com/ruoyi/business/vo/SalesRecordExportVo.java
@@ -76,10 +76,15 @@
@Excel(name = "鍑�鍒╂鼎")
private BigDecimal netProfit;
/**
- * 杩愯垂
+ * 閲囪喘杩愯垂
*/
- @Excel(name = "杩愯垂")
- private BigDecimal freight;
+ @Excel(name = "閲囪喘杩愯垂")
+ private BigDecimal purchasingFreight;
+ /**
+ * 閿�鍞繍璐�
+ */
+ @Excel(name = "閿�鍞繍璐�")
+ private BigDecimal salesFreight;
/**
* 鐧昏浜�
*/
diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250611160300__create_table_sales_record.sql b/main-business/src/main/resources/db/migration/postgresql/V20250611160300__create_table_sales_record.sql
index 6e28b8a..4fca79d 100644
--- a/main-business/src/main/resources/db/migration/postgresql/V20250611160300__create_table_sales_record.sql
+++ b/main-business/src/main/resources/db/migration/postgresql/V20250611160300__create_table_sales_record.sql
@@ -1,60 +1,91 @@
+DROP TABLE IF EXISTS sales_record;
-- 鍒涘缓閿�鍞褰曡〃
CREATE TABLE sales_record
(
- id BIGSERIAL PRIMARY KEY, -- 涓婚敭ID
- sale_date DATE NOT NULL, -- 閿�鍞棩鏈�
- customer_id BIGINT, -- 瀹㈡埛id
- customer VARCHAR(255) NOT NULL, -- 瀹㈡埛
- coal_id BIGINT NOT NULL, -- 鐓ょ id
- price_including_tax DECIMAL(10, 2) NOT NULL, -- 鍗曚环锛堝惈绋庯級
- inventory_quantity DECIMAL(10, 0) NOT NULL, -- 搴撳瓨鏁伴噺
- unit VARCHAR(100) NOT NULL, -- 鍗曚綅
- sale_quantity DECIMAL(10, 2) NOT NULL, -- 閿�鍞暟閲�
- sale_price DECIMAL(10, 2) NOT NULL, -- 閿�鍞崟浠� (鍚◣)
- total_amount DECIMAL(10, 2) NOT NULL, -- 閿�鍞�讳环 (鍚◣)
- freight DECIMAL(10, 2) NOT NULL, -- 杩愯垂
- tax_coal VARCHAR(36), -- 璐攢鐓ょ◣鐜�13%
- tax_trans VARCHAR(36), -- 杩愯緭绋庣巼9%
- gross_profit DECIMAL(10, 2), -- 姣涘埄娑�
- net_profit DECIMAL(10, 2), -- 鍑�鍒╂鼎
- registrant_id BIGINT, -- 鐧昏浜篿d
- registrant VARCHAR(255) , -- 鐧昏浜�
- registration_date DATE , -- 鐧昏鏃ユ湡
- is_add BOOLEAN NOT NULL DEFAULT FALSE, -- 鏄惁娣诲姞鑷冲緟琛ュ簱
+ id BIGSERIAL PRIMARY KEY, -- 涓婚敭ID
+ sale_date DATE NOT NULL, -- 閿�鍞棩鏈�
+ customer_id BIGINT, -- 瀹㈡埛id
+ customer VARCHAR(255) NOT NULL, -- 瀹㈡埛
+ coal_id BIGINT NOT NULL, -- 鐓ょ id
+ price_including_tax DECIMAL(10, 2) NOT NULL, -- 鍗曚环锛堝惈绋庯級
+ inventory_quantity DECIMAL(10, 0) NOT NULL, -- 搴撳瓨鏁伴噺
+ unit VARCHAR(100) NOT NULL, -- 鍗曚綅
+ sale_quantity DECIMAL(10, 2) NOT NULL, -- 閿�鍞暟閲�
+ sale_price DECIMAL(10, 2) NOT NULL, -- 閿�鍞崟浠� (鍚◣)
+ total_amount DECIMAL(10, 2) NOT NULL, -- 閿�鍞�讳环 (鍚◣)
+ purchasing_freight DECIMAL(10, 2) NOT NULL, -- 閲囪喘杩愯垂
+ sales_freight DECIMAL(10, 2) NOT NULL, -- 閿�鍞繍璐�
+ tax_coal VARCHAR(36), -- 璐攢鐓ょ◣鐜�13%
+ tax_trans VARCHAR(36), -- 杩愯緭绋庣巼9%
+ gross_profit DECIMAL(10, 2), -- 姣涘埄娑�
+ net_profit DECIMAL(10, 2), -- 鍑�鍒╂鼎
+ registrant_id BIGINT, -- 鐧昏浜篿d
+ registrant VARCHAR(255), -- 鐧昏浜�
+ registration_date DATE, -- 鐧昏鏃ユ湡
+ is_add BOOLEAN NOT NULL DEFAULT FALSE, -- 鏄惁娣诲姞鑷冲緟琛ュ簱
- create_time TIMESTAMP WITHOUT TIME ZONE, -- 涓婁紶鏃堕棿锛岄粯璁ゅ綋鍓嶆椂闂�
- update_time TIMESTAMP WITHOUT TIME ZONE, -- 鏈�鍚庢洿鏂版椂闂达紝榛樿褰撳墠鏃堕棿
- create_by VARCHAR(255), -- 涓婁紶浜虹敤鎴峰悕
- update_by VARCHAR(255), -- 鏈�鍚庝慨鏀逛汉鐢ㄦ埛鍚�
- deleted INT NOT NULL DEFAULT 0 -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
+ create_time TIMESTAMP WITHOUT TIME ZONE, -- 涓婁紶鏃堕棿锛岄粯璁ゅ綋鍓嶆椂闂�
+ update_time TIMESTAMP WITHOUT TIME ZONE, -- 鏈�鍚庢洿鏂版椂闂达紝榛樿褰撳墠鏃堕棿
+ create_by VARCHAR(255), -- 涓婁紶浜虹敤鎴峰悕
+ update_by VARCHAR(255), -- 鏈�鍚庝慨鏀逛汉鐢ㄦ埛鍚�
+ deleted INT NOT NULL DEFAULT 0 -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
);
-- 琛ㄦ敞閲�
-COMMENT ON TABLE sales_record IS '閿�鍞褰曡〃';
+COMMENT
+ON TABLE sales_record IS '閿�鍞褰曡〃';
-- 娣诲姞瀛楁娉ㄩ噴
-COMMENT ON COLUMN sales_record.id IS '涓婚敭ID';
-COMMENT ON COLUMN sales_record.sale_date IS '閿�鍞棩鏈�';
-COMMENT ON COLUMN sales_record.customer IS '瀹㈡埛';
-COMMENT ON COLUMN sales_record.customer_id IS '瀹㈡埛id';
-COMMENT ON COLUMN sales_record.coal_id IS '鐓ょid';
-COMMENT ON COLUMN sales_record.unit IS '鍗曚綅';
-COMMENT ON COLUMN sales_record.price_including_tax IS '鍗曚环锛堝惈绋庯級';
-COMMENT ON COLUMN sales_record.inventory_quantity IS '搴撳瓨鏁伴噺';
-COMMENT ON COLUMN sales_record.sale_quantity IS '閿�鍞暟閲�';
-COMMENT ON COLUMN sales_record.sale_price IS '閿�鍞崟浠� (鍚◣)';
-COMMENT ON COLUMN sales_record.total_amount IS '閿�鍞�讳环 (鍚◣)';
-COMMENT ON COLUMN sales_record.tax_coal IS '璐攢鐓ょ◣鐜�13%';
-COMMENT ON COLUMN sales_record.tax_trans IS '杩愯緭绋庣巼9%';
-COMMENT ON COLUMN sales_record.gross_profit IS '姣涘埄娑�';
-COMMENT ON COLUMN sales_record.net_profit IS '鍑�鍒╂鼎';
-COMMENT ON COLUMN sales_record.registrant IS '鐧昏浜�';
-COMMENT ON COLUMN sales_record.registrant_id IS '鐧昏浜篿d';
-COMMENT ON COLUMN sales_record.registration_date IS '鐧昏鏃ユ湡';
-COMMENT ON COLUMN sales_record.is_add IS '鏄惁娣诲姞鑷冲緟琛ュ簱';
+COMMENT
+ON COLUMN sales_record.id IS '涓婚敭ID';
+COMMENT
+ON COLUMN sales_record.sale_date IS '閿�鍞棩鏈�';
+COMMENT
+ON COLUMN sales_record.customer IS '瀹㈡埛';
+COMMENT
+ON COLUMN sales_record.customer_id IS '瀹㈡埛id';
+COMMENT
+ON COLUMN sales_record.coal_id IS '鐓ょid';
+COMMENT
+ON COLUMN sales_record.unit IS '鍗曚綅';
+COMMENT
+ON COLUMN sales_record.price_including_tax IS '鍗曚环锛堝惈绋庯級';
+COMMENT
+ON COLUMN sales_record.inventory_quantity IS '搴撳瓨鏁伴噺';
+COMMENT
+ON COLUMN sales_record.sale_quantity IS '閿�鍞暟閲�';
+COMMENT
+ON COLUMN sales_record.sale_price IS '閿�鍞崟浠� (鍚◣)';
+COMMENT
+ON COLUMN sales_record.total_amount IS '閿�鍞�讳环 (鍚◣)';
+COMMENT
+ON COLUMN sales_record.tax_coal IS '璐攢鐓ょ◣鐜�13%';
+COMMENT
+ON COLUMN sales_record.tax_trans IS '杩愯緭绋庣巼9%';
+COMMENT
+ON COLUMN sales_record.gross_profit IS '姣涘埄娑�';
+COMMENT
+ON COLUMN sales_record.net_profit IS '鍑�鍒╂鼎';
+COMMENT
+ON COLUMN sales_record.registrant IS '鐧昏浜�';
+COMMENT
+ON COLUMN sales_record.registrant_id IS '鐧昏浜篿d';
+COMMENT
+ON COLUMN sales_record.registration_date IS '鐧昏鏃ユ湡';
+COMMENT
+ON COLUMN sales_record.is_add IS '鏄惁娣诲姞鑷冲緟琛ュ簱';
+COMMENT
+ON COLUMN sales_record.purchasing_freight IS '閲囪喘杩愯垂';
+COMMENT
+ON COLUMN sales_record.sales_freight IS '閿�鍞繍璐�';
-COMMENT ON COLUMN sales_record.deleted IS '杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�';
-COMMENT ON COLUMN sales_record.create_by IS '鍒涘缓璇ヨ褰曠殑鐢ㄦ埛';
-COMMENT ON COLUMN sales_record.create_time IS '璁板綍鍒涘缓鏃堕棿';
-COMMENT ON COLUMN sales_record.update_by IS '鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�';
-COMMENT ON COLUMN sales_record.update_time IS '璁板綍鏈�鍚庢洿鏂版椂闂�';
+COMMENT
+ON COLUMN sales_record.deleted IS '杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�';
+COMMENT
+ON COLUMN sales_record.create_by IS '鍒涘缓璇ヨ褰曠殑鐢ㄦ埛';
+COMMENT
+ON COLUMN sales_record.create_time IS '璁板綍鍒涘缓鏃堕棿';
+COMMENT
+ON COLUMN sales_record.update_by IS '鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�';
+COMMENT
+ON COLUMN sales_record.update_time IS '璁板綍鏈�鍚庢洿鏂版椂闂�';
--
Gitblit v1.9.3