From b181cf2ac3658ad42c716ac7e0261e9e521734d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Wed, 20 Nov 2019 17:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=8B=89=E5=8A=A8=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 47 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java     |  4 ++
 .../wms/modelbean/WmsMoveUnfinishedOrderModel.java |  3 ++
 3 files changed, 54 insertions(+)

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 a4862cb..bfdf7d7 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
@@ -4229,4 +4229,51 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 拉动方式维护
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_WAY_STATUS {
+        SAFETY_STOCK_PULL(10, "安全库存拉动"),
+        ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"),
+        LINE_PULL(30, "巡线拉动"),
+        PLANNED_PULL(40, "计划拉动");
+
+        private int value;
+        private String description;
+
+        PULL_WAY_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PULL_WAY_STATUS 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/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index a4d969b..3f08e96 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -187,6 +187,10 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
+    @Column(name = "PULL_WAY")
+    @ApiParam(value = "拉动方式", example = "0")
+    private Integer pullWay = 0;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java
index 66eda83..f87e945 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java
@@ -36,6 +36,9 @@ public class WmsMoveUnfinishedOrderModel extends  BaseBean{
     @ApiParam("关联单号")
     private String refSrc;
 
+    public WmsMoveUnfinishedOrderModel(){
+    }
+
     public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;