From b55906ced0c1890396bed84e329162d5bc4f9693 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Thu, 27 Dec 2018 17:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 31 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/model/wms/OptionModel.java   | 11 ++++++++
 .../pojo/wms/bean/WmsActionGroupDetails.java       |  8 ++++++
 .../i3plus/pojo/wms/bean/WmsActionLogDetails.java  |  8 ++++++
 .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java |  6 +++++
 5 files changed, 64 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 7bd9a7a..58a362e 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
@@ -1838,5 +1838,36 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 可选项类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPTION_TYPE {
+        OPTIONS(10, "OPTIONS", "可选项"),
+        BUTTON(20, "BUTTON", "按钮");
+
+        private String code;
+        private String description;
+        int value;
+
+        OPTION_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java
index 78b9c4b..7ab343e 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java
@@ -17,4 +17,15 @@ public class OptionModel {
     private String name;
 
     private Integer value;
+
+    /**
+     * 10=复选框，20=按钮，显示到查看历史左侧
+     */
+    private Integer type;
+
+    /**
+     * 当Type=20时，此值代表需要跳转的步骤，前台要把此值放到
+     * OperationBean. barcode字段并反馈给后台，流程管家使用此值处理
+     */
+    private String content;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
index f41bf15..ca66d67 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
@@ -73,5 +73,13 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "流程名称")
     private String agName;
 
+    @Column(name = "GOTO_BTN_CODE")
+    @ApiParam(value = "跳转按钮代码")
+    private String goToBtnCode;
+
+    @Column(name = "GOTO_BTN_NAME")
+    @ApiParam(value = "跳转按钮名称")
+    private String goToBtnName;
+
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
index 6a3b866..dbc8b0b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
@@ -101,6 +101,14 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "结束执行时间")
     public String endTime;
 
+    @Column(name = "GOTO_BTN_CODE")
+    @ApiParam(value = "跳转按钮代码")
+    private String goToBtnCode;
+
+    @Column(name = "GOTO_BTN_NAME")
+    @ApiParam(value = "跳转按钮名称")
+    private String goToBtnName;
+
     public WmsActionLogDetails() {
 
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 39c3971..4ccbc47 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -122,4 +122,10 @@ public class WmsMoveDetails extends BaseBean {
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
     }
+
+    public WmsMoveDetails(String partNo, double qty ,double transQty){
+        this.partNo = partNo;
+        this.qty = qty;
+        this.transQty = transQty;
+    }
 }