From 177e192a5c47f1d6322ee7b2642239f54526aef7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 26 三月 2022 09:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/zy/cloud/wms/manager/entity/Pickout.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
index 7533277..38877ab 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
@@ -92,6 +92,27 @@
@ApiModelProperty(value= "")
private String memo;
+ @TableField("order_qty")
+ private Integer orderQty;
+
+ @TableField("order_nos")
+ private String orderNos;
+
+ @TableField("wave_no")
+ private String waveNo;
+
+ @TableField("print_times")
+ private Integer printTimes;
+
+ @TableField("pick_staff")
+ private Long pickStaff;
+
+ @TableField("pick_start")
+ private Date pickStart;
+
+ @TableField("pick_end")
+ private Date pickEnd;
+
public Pickout() {}
@@ -110,14 +131,15 @@
public String getWrkSts$(){
if (this.wrkSts == 1) {
- return "鏈嫞璐�";
+ return "鏈墦鍗�";
}
if (this.wrkSts == 2) {
- return "鏈墦鍗�";
+ return "鎷ｈ揣涓�";
}
if (this.wrkSts == 3) {
return "宸插畬鎴�";
}
+
return "";
}
public Long getId() {
@@ -179,6 +201,7 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@@ -222,5 +245,17 @@
this.memo = memo;
}
+ public String getPickStart$() {
+ if (Cools.isEmpty(this.pickStart)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pickStart);
+ }
+ public String getPickEnd$() {
+ if (Cools.isEmpty(this.pickEnd)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pickEnd);
+ }
}
--
Gitblit v1.9.1