From d33dae14dcfe49afd283bcf4c0798341dba07d46 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 9 Sep 2020 16:53:57 +0800
Subject: [PATCH] =?UTF-8?q?jsp=E8=AE=A1=E7=AE=97bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     |  4 ++-
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 38 ++++++++++++++++++++++
 .../pojo/mes/bean/MesQueueJitPlanDetail.java       | 23 +++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

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 19e6a45..3da9998 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
@@ -4484,7 +4484,9 @@ public class MesEnumUtil {
     public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
-        CANCEL(30, "取消");
+        CANCEL(30, "取消"),
+        OFFLINE(40, "下线"),
+        SHIPMENT(50, "发运");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 952b144..6c6be4c 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -5102,4 +5102,42 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 客户JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        CANCEL(30, "取消"),
+        OFFLINE(40, "下线"),
+        SHIPMENT(50, "发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_STATUS(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/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
index d290454..b2631fb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -58,4 +59,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "FORMULA_CONTENT")
     @ApiParam("配方内容")
     private String formulaContent;
+
+    @Transient
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Transient
+    @ApiParam("子物料名称")
+    private String itemPartNo;
+
+    @Transient
+    @ApiParam("数量")
+    private long qty;
+
+    public MesQueueJitPlanDetail() {
+
+    }
+
+    public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) {
+        this.partNo = partNo;
+        this.itemPartNo = itemPartNo;
+        this.qty = qty;
+    }
 }