From 3f31d6aa87063f91fd3c2678d32638b3cb3000f6 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 25 三月 2022 16:53:28 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/entity/Pickout.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 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 804a8f3..38877ab 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
@@ -101,6 +101,18 @@
     @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() {}
 
 
@@ -122,14 +134,12 @@
             return "鏈墦鍗�";
         }
         if (this.wrkSts == 2) {
-            return "鏈嫞璐�";
+            return "鎷h揣涓�";
         }
         if (this.wrkSts == 3) {
-            return "寮�濮嬫嫞璐�";
+            return "宸插畬鎴�";
         }
-        if (this.wrkSts == 4) {
-            return "鎷h揣瀹屾垚";
-        }
+
         return "";
     }
     public Long getId() {
@@ -191,6 +201,7 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
     }
 
+
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
@@ -234,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