From e211113fb94de4b54577fbcf6986bd5297b1e19e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:53:33 +0800
Subject: [PATCH] 收货单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 0ff1132..9535a42 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +25,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_wait_pakin_item")
public class WaitPakinItem implements Serializable {
@@ -39,6 +43,36 @@
*/
@ApiModelProperty(value= "涓诲崟ID")
private Long pakinId;
+
+ @ApiModelProperty("璁㈠崟绫诲瀷")
+ private String type;
+
+ @ApiModelProperty("涓氬姟绫诲瀷")
+ private Short wkType;
+
+ /**
+ * 璁㈠崟ID
+ */
+ @ApiModelProperty(value= "璁㈠崟ID")
+ private Long asnId;
+
+ /**
+ * 璁㈠崟缂栫爜
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栫爜")
+ private String asnCode;
+
+ /**
+ * 璁㈠崟鏄庣粏ID
+ */
+ @ApiModelProperty("璁㈠崟鏄庣粏ID")
+ private Long asnItemId;
+
+ /**
+ * 璺熻釜鐮�
+ */
+ @ApiModelProperty("鐗╂枡璺熻釜鐮�")
+ private String trackCode;
/**
* 鐗╂枡鍚嶇О
@@ -104,7 +138,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -124,6 +157,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -137,6 +171,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
--
Gitblit v1.9.1