From 0f1a0887db74631c151f2f241c3ff1ceef2656e6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 24 三月 2026 17:30:46 +0800
Subject: [PATCH] feat(sales): 优化发货和销售台账相关功能
---
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 3f80dc0..8b5fc76 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -7,6 +7,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -18,12 +19,6 @@
@TableName("shipping_info")
public class ShippingInfo {
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "閿�鍞彴璐d")
- private Long salesLedgerId;
-
@TableField(exist = false)
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
@@ -34,11 +29,40 @@
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ @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,4 +89,12 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @TableField(value = "is_all_send")
+ @ApiModelProperty(value = "鏄惁鍏ㄩ儴鍙戣揣 1鍏ㄩ儴鍙戣揣 0涓嶅叏閮ㄥ彂璐�")
+ private Integer isAllSend;
+
+ @ApiModelProperty(value = "閮ㄥ垎鍙戣揣鏁伴噺")
+ @TableField(value = "part_send_amount")
+ private BigDecimal partSendAmount;
+
}
--
Gitblit v1.9.3