Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;

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("产品类型")