From 275a99159356e8005f248dbf8bc043511a24f642 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Tue, 14 May 2019 10:44:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
index 5b4c453..91149c5 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
@@ -28,12 +28,16 @@ import javax.persistence.Table;
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name="ORDER_NO")
-    @ApiParam("工单号")
+    @ApiParam("主队列编号")
     private String orderNo;
 
     @Column(name="PART_NO")
     @ApiParam("物料号")
-    private Integer partNo;
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
 
     @Column(name="SERIAL_NUMBER")
     @ApiParam("产品条码")
@@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="WORK_TYPE")
     @ApiParam("生产类型")
-    private String workType;
+    private String workOrderType;
 
     @Column(name="PRODUCE_CATEGORY")
     @ApiParam("产品类型")

From c7e5fc732e8c923c366c4fbfa8a03020879246ec Mon Sep 17 00:00:00 2001
From: "yiming.gu" <yiming.gu@estsh.com>
Date: Tue, 14 May 2019 11:03:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?mes=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AD=89=E7=BA=A7=E6=9E=9A=E4=B8=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 84e4777..437d602 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
@@ -578,9 +578,9 @@ public class MesEnumUtil {
     public enum PROD_ORG_LEVEL{
 
         LEVEL_ONE(1,"一级目录"),
-        LEVEL_TWO(1,"二级目录"),
-        LEVEL_THREE(1,"三级目录"),
-        LEVEL_FOUR(1,"四级目录");
+        LEVEL_TWO(2,"二级目录"),
+        LEVEL_THREE(3,"三级目录"),
+        LEVEL_FOUR(4,"四级目录");
 
         private int value;
         private String description;