From b5cb83f31fbd0c1ee2d148851e2838d49912d2cd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 13:01:35 +0800
Subject: [PATCH] 销售退货新增页面基本信息加上发货类型下拉框，可选货车或者快递。货车 展示发货车牌号，选择快递则展示快递公司，快递单号。对应的列表也要加上相应的字段，采购退货也是一样加下
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 12 ++++++
src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml | 12 ++++++
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java | 12 ++++++
src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseReturnVo.java | 16 ++++++++
src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java | 16 ++++++++
src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java | 12 ++++++
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java | 2 +
sql/product-inventory-management-new-pro.sql | 8 ++++
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 17 +++++---
9 files changed, 100 insertions(+), 7 deletions(-)
diff --git a/sql/product-inventory-management-new-pro.sql b/sql/product-inventory-management-new-pro.sql
index 35c0008..2752b38 100644
--- a/sql/product-inventory-management-new-pro.sql
+++ b/sql/product-inventory-management-new-pro.sql
@@ -3299,6 +3299,10 @@
`no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閫�璐у崟缂栧彿',
`return_type` tinyint NOT NULL DEFAULT 0 COMMENT '閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹',
`supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '渚涘簲鍟唅d',
+ `shipping_type` tinyint NULL DEFAULT NULL COMMENT '鍙戣揣绫诲瀷 1璐ц溅 2蹇��',
+ `truck_plate_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍙戣揣杞︾墝鍙�',
+ `express_company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑叕鍙�',
+ `express_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑崟鍙�',
`project_id` bigint NOT NULL DEFAULT 0 COMMENT '椤圭洰id',
`project_phase` tinyint NOT NULL DEFAULT 0 COMMENT '椤圭洰闃舵',
`prepared_at` datetime NULL DEFAULT NULL COMMENT '鍒跺崟鏃ユ湡',
@@ -3753,6 +3757,10 @@
`return_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閫�璐у崟鍙�',
`customer_id` bigint NULL DEFAULT NULL COMMENT '瀹㈡埛 id',
`shipping_id` bigint NULL DEFAULT NULL COMMENT '鍏宠仈鍙戣揣鍗曞彿',
+ `shipping_type` tinyint NULL DEFAULT NULL COMMENT '鍙戣揣绫诲瀷 1璐ц溅 2蹇��',
+ `truck_plate_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍙戣揣杞︾墝鍙�',
+ `express_company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑叕鍙�',
+ `express_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑崟鍙�',
`project_stage` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '椤圭洰闃舵',
`maker` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍒跺崟浜�',
`make_time` timestamp NULL DEFAULT NULL COMMENT '鍒跺崟鏃堕棿',
diff --git a/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseReturnVo.java b/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseReturnVo.java
index 82a90a3..4c21ac5 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseReturnVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseReturnVo.java
@@ -29,6 +29,22 @@
@Excel(name = "鍏宠仈鍏ュ簱鍗曞彿")
private String inboundBatches;
+ @Schema(description = "鍙戣揣绫诲瀷")
+ @Excel(name = "鍙戣揣绫诲瀷")
+ private Integer shippingType;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
+ @Excel(name = "鍙戣揣杞︾墝鍙�")
+ private String truckPlateNo;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ @Excel(name = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ @Excel(name = "蹇�掑崟鍙�")
+ private String expressNo;
+
@Schema(description = "閫�璐ф棩鏈�")
@Excel(name = "閫�璐ф棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java
index 980d7f8..36f65c4 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java
@@ -29,6 +29,22 @@
@Excel(name = "鍏宠仈鍙戣揣鍗曞彿")
private String shippingNo;
+ @Schema(description = "鍙戣揣绫诲瀷")
+ @Excel(name = "鍙戣揣绫诲瀷")
+ private Integer shippingType;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
+ @Excel(name = "鍙戣揣杞︾墝鍙�")
+ private String truckPlateNo;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ @Excel(name = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ @Excel(name = "蹇�掑崟鍙�")
+ private String expressNo;
+
@Schema(description = "閫�璐ф棩鏈�")
@Excel(name = "閫�璐ф棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java b/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java
index 79b4174..98eb5da 100644
--- a/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java
@@ -27,6 +27,18 @@
@Schema(description = "鍏宠仈鍑哄簱鍗曞彿")
private String shippingNo;
+ @Schema(description = "鍙戣揣绫诲瀷")
+ private Integer shippingType;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
+ private String truckPlateNo;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ private String expressNo;
+
@Schema(description = "椤圭洰鍚嶇О")
private String projectName;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
index 046fb5c..5f04de8 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
@@ -34,6 +34,18 @@
@Schema(description = "鍏宠仈鍑哄簱鍗曞彿Id")
private Long shippingId;
+ @Schema(description = "鍙戣揣绫诲瀷 1璐ц溅 2蹇��")
+ private Integer shippingType;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
+ private String truckPlateNo;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ private String expressNo;
+
@Schema(description = "椤圭洰id")
private Long projectId;
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java
index 68ef597..6736072 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java
@@ -15,6 +15,8 @@
// 閲囪喘鍚堝悓鍙�
private String purchaseContractNumber;
+ private String shippingTypeText;
+
//閫�鏂欎汉濮撳悕
private String returnUserName;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index 936b5b5..abe0b8a 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -44,6 +44,18 @@
@Schema(description = "渚涘簲鍟唅d")
private Long supplierId;
+ @Schema(description = "鍙戣揣绫诲瀷 1璐ц溅 2蹇��")
+ private Integer shippingType;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
+ private String truckPlateNo;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ private String expressNo;
+
@Schema(description = "椤圭洰id")
private Long projectId;
diff --git a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
index 086f8a8..c0e35da 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -6,6 +6,10 @@
select rm.*,
c.customer_name,
si.shipping_no,
+ rm.shipping_type,
+ rm.truck_plate_no,
+ rm.express_company,
+ rm.express_no,
sl.project_name,
sl.sales_contract_no,
sl.salesman,
@@ -58,6 +62,10 @@
select rm.*,
c.customer_name,
si.shipping_no,
+ rm.shipping_type,
+ rm.truck_plate_no,
+ rm.express_company,
+ rm.express_no,
sl.project_name,
sl.sales_contract_no,
sl.salesman
@@ -72,6 +80,10 @@
rm.return_no,
c.customer_name,
si.shipping_no,
+ rm.shipping_type,
+ rm.truck_plate_no,
+ rm.express_company,
+ rm.express_no,
rm.make_time,
rm.refund_amount,
rm.return_reason,
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index a354cc6..4b09890 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -8,6 +8,10 @@
<result column="no" property="no" />
<result column="return_type" property="returnType" />
<result column="supplier_id" property="supplierId" />
+ <result column="shipping_type" property="shippingType" />
+ <result column="truck_plate_no" property="truckPlateNo" />
+ <result column="express_company" property="expressCompany" />
+ <result column="express_no" property="expressNo" />
<result column="project_id" property="projectId" />
<result column="project_phase" property="projectPhase" />
<result column="prepared_at" property="preparedAt" />
@@ -59,6 +63,10 @@
pro.no returnNo,
t.inboundBatches,
sm.supplier_name,
+ pro.shipping_type,
+ pro.truck_plate_no,
+ pro.express_company,
+ pro.express_no,
pro.prepared_at,
pro.total_amount,
CASE pro.return_type WHEN 0 THEN '閫�璐ч��娆�' WHEN 1 THEN '鎷掓敹' END AS returnType,
@@ -163,7 +171,7 @@
prop.purchase_return_order_id,
GREATEST(
sir.stock_in_num
- - COALESCE(rs1.total_return_num1, 0)
+ - COALESCE(rs.total_return_num, 0)
- COALESCE(so.total_sale_out_num, 0),
0
) AS un_quantity,
@@ -176,13 +184,8 @@
LEFT JOIN (SELECT stock_in_record_id,
SUM(return_quantity) AS total_return_num
FROM purchase_return_order_products
- WHERE 1 = 1 and purchase_return_order_id = #{id}
+ WHERE 1 = 1
GROUP BY stock_in_record_id) rs ON rs.stock_in_record_id = sir.id
- LEFT JOIN (SELECT stock_in_record_id,
- SUM(return_quantity) AS total_return_num1
- FROM purchase_return_order_products
- WHERE 1 = 1 and purchase_return_order_id = #{id}
- GROUP BY stock_in_record_id) rs1 ON rs1.stock_in_record_id = sir.id
LEFT JOIN (
SELECT
inv.batch_no,
--
Gitblit v1.9.3