From ef944ce8aaabb423be714f4c7febebc3d47d1b6d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 04 五月 2025 07:50:40 +0800
Subject: [PATCH] #修改 1. 订单页面优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index 1017e0e..46aaaef 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -4,16 +4,15 @@
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
+
import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -79,6 +78,9 @@
@ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double anfme;
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
+
/**
* 宸叉敹鏁伴噺
*/
@@ -90,6 +92,9 @@
*/
@ApiModelProperty(value= "鐗╂祦鍗曞彿")
private String logisNo;
+
+ @ApiModelProperty("娉㈡ID")
+ private Long waveId;
/**
* 棰勮鍒拌揪鏃堕棿
@@ -143,6 +148,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;
/**
@@ -156,6 +162,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;
/**
@@ -302,5 +309,18 @@
return null;
}
}
+ public String getNtyStatus$(){
+ if (null == this.ntyStatus){ return "error"; }
+ switch (this.ntyStatus){
+ case 0:
+ return "鏈笂鎶�";
+ case 1:
+ return "宸蹭笂鎶�";
+ case 2:
+ return "閮ㄥ垎涓婃姤";
+ default:
+ return "error";
+ }
+ }
}
--
Gitblit v1.9.1