From 00fce0bded8c96989fd446d8db89e448b54033eb Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 15 Apr 2020 16:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8F=91=E5=BE=80=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 50 ++++++++++++++++++++++
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java |  5 ---
 .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java  |  4 ++
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index ecb1651..5a5ff71 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -6087,4 +6087,54 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 星期
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WEEK_TYPE {
+        MONDAY(10, "星期一"),
+        TUESDAY(20, "星期二"),
+        WEDNESDAY(30, "星期三"),
+        THURSDAY(40, "星期四"),
+        FRIDAY(50, "星期五"),
+        SATURDAY(60, "星期六"),
+        SUNDAY(70, "星期七");
+
+        private int value;
+        private String description;
+
+        WEEK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static WEEK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
index a33715f..c87d03b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
@@ -112,11 +112,6 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String terminalNo;
 
-    @Column(name = "NEW_BOM_VERSION")
-    @ApiParam(value = "新版本号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-    private String newBomVersion;
-
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java
index 5b53055..65a6608 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java
@@ -37,6 +37,10 @@ public class WmsCustWindow extends BaseBean {
     @ApiParam(value = "窗口时间")
     private String custWindowTime;
 
+    @Column(name = "WEEKS")
+    @ApiParam(value = "星期")
+    private String weeks;
+
     @Column(name = "DELAY_HOUR")
     @ApiParam(value = "容差")
     private Integer delayHour;