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

@@ -6474,4 +6474,40 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT预装队列 工单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
+        SPARE_PART_PRODUCTION(10, "备件生产"),
+        REPRODUCTION_RMS(20, "重新生产-报功"),
+        REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
+
+        private Integer value;
+        private String description;
+
+        QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2407,6 +2407,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java

@@ -126,10 +126,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "JIT_SEQ")
 	@ApiParam("jit排序号")
-	private String jitSeq;
+	private Double jitSeq;
 
 	@Column(name = "JIT_TYPE_FLAG")
-	@ApiParam("jit类型标识")
+	@ApiParam("JIT类型标识")
 	private String jitTypeFlag;
 
 	@Column(name = "CUST_POINT_DATE")
@@ -138,7 +138,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "CUST_PLANT_CODE")
 	@ApiParam("客户工厂代码")
-	private String custPlantDate;
+	private String custPlantCode;
 
 	@Column(name = "DOCK_NO")
 	@ApiParam("道口")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java

@@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_PART_NAME")
     @ApiParam("客户零件描述")
     private String customerPartName;
+
+    @Column(name = "CUSTOMER_CFG_CODE")
+    @ApiParam("客戶配置代碼")
+    private String customerCfgCode;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java

@@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
 
     @Column(name = "JIT_SEQ")
     @ApiParam("JIT排序号")
-    private String jitSeq;
+    private Double jitSeq;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
@@ -105,6 +105,10 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @ApiParam("解析文件路径")
     private String fileUrl;
 
+    @Column(name = "WORK_ORDER_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
     @Transient
     @ApiParam("计划上线开始时间")
     private String planStartDate;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java

@@ -44,7 +44,7 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "PART_NAME")
-    @ApiParam("产品名称")
+    @ApiParam("物料名称")
     private String partName;
 
     @Column(name = "PRODUCE_CTGY_CODE")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java

@@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private String partNo;
 
     @ApiParam("物料名称")
-    private String partNameRdd;
+    private String partName;
 
     @ApiParam("颜色代码")
     private String colorCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("状态机代码")
     private String smCode;
 
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +