From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 05 五月 2025 16:07:35 +0800 Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java index d5ae471..737661d 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java @@ -4,6 +4,7 @@ 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; @@ -62,6 +63,12 @@ private Short ioStatus; /** + * 鏄惁涓嶈壇鍝� + */ + @ApiModelProperty("鏄惁涓嶈壇鍝�") + private Short flagDefect; + + /** * 鐘舵�� 1: 姝e父 0: 鍐荤粨 */ @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 鍐荤粨 ") @@ -90,6 +97,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; /** @@ -103,6 +111,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; /** @@ -152,6 +161,10 @@ return "寰呭叆搴�"; case 1: return " 鍏ュ簱涓�"; + case 2: + return "浠诲姟鎵ц涓�"; + case 3: + return "浠诲姟瀹屾垚"; default: return String.valueOf(this.ioStatus); } -- Gitblit v1.9.1