From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java
index 069424c..fdca335 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.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_loc_revise")
public class LocRevise implements Serializable {
@@ -68,13 +72,17 @@
* 婧愬簱鍖篒D
*/
@ApiModelProperty(value= "婧愬簱鍖篒D")
- private Long orgAreaId;
+ private Long areaId;
/**
* 鍘熷簱鍖哄悕绉�
*/
@ApiModelProperty(value= "鍘熷簱鍖哄悕绉�")
- private String orgAreaName;
+ private String areaName;
+
+ @ApiModelProperty("璋冩暣鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private Date exceTime;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -135,8 +143,8 @@
this.anfme = anfme;
this.reviseQty = reviseQty;
this.exceStatus = exceStatus;
- this.orgAreaId = orgAreaId;
- this.orgAreaName = orgAreaName;
+ this.areaId = orgAreaId;
+ this.areaName = orgAreaName;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -147,28 +155,10 @@
this.memo = memo;
}
-// LocRevise locRevise = new LocRevise(
-// null, // 璋冩暣鍗�
-// null, // 鍗曟嵁绫诲瀷
-// null, // 鍗曟嵁鏁伴噺
-// null, // 瀹為檯鏁伴噺
-// null, // 鎵ц鐘舵��:
-// null, // 婧愬簱鍖篒D
-// null, // 鍘熷簱鍖哄悕绉�
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
public String getType$(){
if (null == this.type){ return null; }
switch (this.type){
- case 0:
+ case 1:
return " 搴撳瓨璋冩暣";
case 2:
return " 鐩樼偣璋冩暣";
--
Gitblit v1.9.1