From 50c2258f58ca40d65bfa236a2649d683ce456b51 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, 16 Sep 2020 11:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9D=A1=E4=BB=B6=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 35 ++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java  | 37 ++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index ec7d0e5..77340aa 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -7217,4 +7217,39 @@ public class MesEnumUtil {
         }
 
     }
+
+    /**
+     * 触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP_TRIGGER_TYPE {
+        INTERNAL_TRIGGER(10, "内部触发"),
+        EXTERNAL_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        STEP_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
index bd996b0..eb70530 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@@ -136,6 +136,28 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("产品颜色")
     private String colorName;
 
+    @Transient
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Transient
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Transient
+    @ApiParam("箱数")
+    private Integer boxQty;
+
+    @Transient
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时间")
+    private String endTime;
+
+    public MesQueueOrder(){}
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }
@@ -144,4 +166,19 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         return this.seq == null ? 0.0d : this.seq;
     }
 
+    public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty,
+                               Integer queueType,Integer status,String createUser,
+                         String createDatetime,String modifyUser,String modifyDatetime) {
+        this.seq = seq;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.boxQty = boxQty;
+        this.queueType = queueType;
+        this.status = status;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
 }