生产工单增加特殊标示字段

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

@@ -4526,7 +4526,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
-        EMPTYING(20, "放空");
+        EMPTYING(20, "放空"),
+        ERR_PERCH(30, "异常占位");
 
         private int value;
         private String description;
@@ -6659,8 +6660,7 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面"),
-        SPECIAL_SIDE(30, "C", "特殊件");
+        REVERSE_SIDE(20, "B", "背面");
 
         private Integer value;
         private String code;

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

@@ -2165,6 +2165,16 @@ public class MesPcnEnumUtil {
         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;
+        }
     }
 
     /**
@@ -5381,8 +5391,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面"),
-        SPECIAL_SIDE(30, "C", "特殊件");
+        REVERSE_SIDE(20, "B", "背面");
 
         private Integer value;
         private String code;
@@ -5467,4 +5476,40 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT生产队列特殊标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+        NORMAL(10, "正常"),
+        EMPTYING(20, "放空"),
+        ERR_PERCH(30, "异常占位");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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;
+        }
+    }
 }

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

@@ -146,4 +146,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@Column(name = "VERSION")
 	@ApiParam("版本号")
 	private String version;
+
+	@Column(name = "SPECIAL_FLAG")
+	@ApiParam("特殊标识")
+	private Integer specialFlag;
 }

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

@@ -112,6 +112,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("等级代码")
     private String gradeCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Column(name = "SPECIAL_FLAG")
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -91,6 +91,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCategoryCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Transient
+    @ApiParam("状态")
+    private String statusName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0 : this.queueSeq;
     }

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

@@ -113,6 +113,8 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("是否放空")
     private Integer isEmpty;
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
 
     public QueueOrderModel() {
     }
@@ -199,7 +201,8 @@ public class QueueOrderModel implements Serializable {
 
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
-                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) {
+                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq,
+                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -216,6 +219,8 @@ public class QueueOrderModel implements Serializable {
         this.groupSeq = groupSeq;
         this.serialNumber = serialNumber;
         this.custProdLineCode = custProdLineCode;
+        this.specialFlag = specialFlag;
+        this.workType = workType;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -259,7 +264,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
-                           String vinCode, String formulaContent, String queueGroupNo) {
+                           String vinCode, String formulaContent, String queueGroupNo, String jitSeq) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -279,11 +284,13 @@ public class QueueOrderModel implements Serializable {
         this.vinCode = vinCode;
         this.formulaContent = formulaContent;
         this.queueGroupNo = queueGroupNo;
+        this.jitSeq = jitSeq;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent,
+                           String queueGroupNo, String produceCategoryCode, String jitSeq) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -300,6 +307,7 @@ public class QueueOrderModel implements Serializable {
         this.formulaContent = formulaContent;
         this.queueGroupNo = queueGroupNo;
         this.produceCategoryCode = produceCategoryCode;
+        this.jitSeq = jitSeq;
     }
 
     //getAlreadyQueueOrderModelNoSn