From c16a5f590db461391a4441e520f3264526c11905 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 15 六月 2026 13:13:56 +0800
Subject: [PATCH] feat(sales): 优化发货信息管理功能
---
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index fce7148..79d3478 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -18,13 +18,6 @@
@TableName("shipping_info")
public class ShippingInfo {
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "閿�鍞彴璐d")
- private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
- private Long salesLedgerProductId;
@TableField(exist = false)
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
@@ -35,11 +28,50 @@
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ /** 鍙戣揣鏃ユ湡鏌ヨ寮�濮� */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙戣揣鏃ユ湡寮�濮�")
+ private String shippingDateStart;
+
+ /** 鍙戣揣鏃ユ湡鏌ヨ缁撴潫 */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙戣揣鏃ユ湡缁撴潫")
+ private String shippingDateEnd;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
+ private Long salesLedgerProductId;
+
+ @ApiModelProperty(value = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃 宸插彂璐�")
+ @Excel(name = "鐘舵��")
+ private String status;
+
@ApiModelProperty(value = "鍙戣揣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date shippingDate;
+
+ @ApiModelProperty(value = "鍙戣揣缂栧彿")
+ @Excel(name = "鍙戣揣缂栧彿")
+ private String shippingNo;
+
+ @ApiModelProperty(value = "蹇�掑崟鍙�")
+ @Excel(name = "蹇�掑崟鍙�")
+ private String expressNumber;
+
+ @ApiModelProperty(value = "蹇�掑叕鍙�")
+ @Excel(name = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @ApiModelProperty(value = "鍙戣揣绫诲瀷")
+ @Excel(name = "鍙戣揣绫诲瀷")
+ private String type;
@ApiModelProperty(value = "鍙戣揣杞︾墝鍙�")
@Excel(name = "鍙戣揣杞︾墝鍙�")
@@ -65,8 +97,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "瀹℃壒浜篿d")
- @TableField(exist = false)
- private Integer approverId;
}
--
Gitblit v1.9.3