Finish Task #2152 Cost:16h

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

@@ -2024,7 +2024,8 @@ public class MesPcnEnumUtil {
 
         NORMAL(10, "正常"),
         CLOSE(20, "关闭"),
-        FINISH(30, "完成");
+        FINISH(30, "完成"),
+        OFF_LINE_REWORK(40, "线下返修");
 
         private int value;
         private String description;
@@ -4210,4 +4211,50 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     *  绑定模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum KEY_BIND_MODE {
+
+        PRODUCE_BOM_BIND(10, "产品BOM绑定"),
+        SCATTER_BOM_BIND(20, "散件BOM绑定");
+
+        private int value;
+        private String description;
+
+        KEY_BIND_MODE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     private String workType;
 
     @Column(name = "PRODUCE_CATEGORY_CODE")
-    @ApiParam("产品类型代码")
+    @ApiParam("产品位置")
     private String produceCategoryCode;
 
     @Column(name = "PRODUCE_CATEGORY_NAME_RDD")
-    @ApiParam("产品类型名称")
+    @ApiParam("产品位置名称")
     private String produceCategoryNameRdd;
 
     @Column(name = "PPT_CODE")
@@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("组件编号")
     private String assyNo;
 
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;

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

@@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
     @ApiParam("显示颜色")
     private String color;
 
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCategoryCode;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0 : this.queueSeq;
     }

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

@@ -40,6 +40,9 @@ public class MesStationBomModel {
     @ApiParam("报废数")
     private Integer scrapQty;
 
+    @ApiParam(value = "是否可重复")
+    private Integer isRepeat;
+
     public MesStationBomModel() {
 
     }
@@ -72,4 +75,19 @@ public class MesStationBomModel {
         this.parentPartNo = parentPartNo;
         this.parentPartName = parentPartName;
     }
+
+    public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName, Integer isRepeat) {
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.qty = qty;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.organizeCode = organizeCode;
+        this.isFeed = isFeed;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.parentPartNo = parentPartNo;
+        this.parentPartName = parentPartName;
+        this.isRepeat = isRepeat;
+    }
 }

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

@@ -81,12 +81,16 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("JIT队列批次")
     private String jitLotNo;
+
     @ApiParam("vin")
     private String vinCode;
 
     @ApiParam("客户JIT队列编号")
     private String jitActualNo;
 
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
     public QueueOrderModel() {
     }
 
@@ -231,9 +235,9 @@ public class QueueOrderModel implements Serializable {
         this.serialNumber=serialNumber;
     }
 
-    //料架分组队列展示组件
+    //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
     public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
-                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
+                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) {
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
         this.orderNo = orderNo;
@@ -242,13 +246,16 @@ public class QueueOrderModel implements Serializable {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.organizeCode = organizeCode;
+        this.vinCode = vinCode;
+        this.produceCategoryCode = produceCategoryCode;
     }
 
-    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
+    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;
         this.organizeCode = organizeCode;
+        this.produceCategoryCode = produceCategoryCode;
     }
 }