客退备件返修

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

@@ -3325,7 +3325,8 @@ public class MesEnumUtil {
         SPARE_PART_PRODUCTION(100, "备件生产"),
         REPRODUCTION_RMS(110, "重新生产-报工"),
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
-        REVERSE_SPRAY_ORDER(130, "反喷工单");
+        REVERSE_SPRAY_ORDER(130, "反喷工单"),
+        SPARE_RETURN_REPAIR(140, "客退备件返修");
 
         private int value;
         private String description;
@@ -7252,4 +7253,74 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT队列明细状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_DETAIL_STATUS {
+        NORMAL(10, "正常"),
+        WASHED_MATERIAL(20, "已冲料");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_DETAIL_STATUS(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;
+        }
+    }
+
+    /**
+     * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIS_BACKFLUSH_STATUS {
+        BACKFLUSH("BACKFLUSH", "正常回冲扣减"),
+        REPAIR("REPAIR", "返修冲料");
+
+        private String value;
+        private String description;
+
+        JIS_BACKFLUSH_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String 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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -1884,7 +1884,8 @@ public class MesPcnEnumUtil {
         SPARE_PART_PRODUCTION(100, "备件生产"),
         REPRODUCTION_RMS(110, "重新生产-报工"),
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
-        REVERSE_SPRAY_ORDER(130, "反喷工单");
+        REVERSE_SPRAY_ORDER(130, "反喷工单"),
+        SPARE_RETURN_REPAIR(140, "客退备件返修");
 
         private int value;
         private String description;
@@ -5211,4 +5212,39 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 是否展示放空队列
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHOW_VENTING_QUEUE {
+        CREATE(10, "显示"),
+        SHIPMENT(20, "不显示");
+
+        private int value;
+        private String description;
+
+        SHOW_VENTING_QUEUE(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/MesQueueJitActualDetail.java

@@ -96,6 +96,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("组件编号")
     private String assyNo;
 
+    @Column(name = "JIS_BACKFLUSH_STATUS")
+    @ApiParam("回冲标识")
+    private String jisBackflushStatus = "BACKFLUSH";
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "IS_EMPTY")
+    @ApiParam("是否放空")
+    private Integer isEmpty;
+
     @Transient
     @ApiParam("工单类型")
     private Integer woType;
@@ -108,6 +124,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("数量")
     private long qty;
 
+    @Transient
+    @ApiParam("是否拆解件")
+    private Integer isDisPart;
+
     public MesQueueJitActualDetail() {
 
     }

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

@@ -128,6 +128,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Column(name = "IS_EMPTY")
+    @ApiParam("是否放空")
+    private Integer isEmpty;
+
+    @Column(name = "JIS_BACKFLUSH_STATUS")
+    @ApiParam("回冲标识")
+    private String jisBackflushStatus;
+
     @Transient
     @ApiParam("Vin")
     private String vinCode;

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

@@ -0,0 +1,102 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/20 9:02 下午
+ * @Modify:
+ */
+@Data
+@Api("JIT队列列表Model")
+public class QueueJitActualModel {
+
+    private Long id;
+    @ApiParam("vin")
+    private String vinCode;
+    @ApiParam("排序号")
+    private Double seq;
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+    @ApiParam("组内编号")
+    private Integer groupNo;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @ApiParam("工单类型")
+    public Integer workType;
+
+    @ApiParam("工单类型")
+    public String workTypeName;
+
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @ApiParam("明细状态名称")
+    private Integer detailStatus;
+
+    @ApiParam("明细状态名称")
+    private String detailStatusName;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("用量")
+    private Double qty = 0d;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料号")
+    private String partName;
+
+
+    public QueueJitActualModel() {
+
+    }
+
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode,
+                               String productSn, Integer detailStatus, String createUser, String createDatetime) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.jisActualNo = jisActualNo;
+        this.workType = workType;
+        this.custProdLineCode = custProdLineCode;
+        this.produceCtgyCode = produceCtgyCode;
+        this.productSn = productSn;
+        this.detailStatus = detailStatus;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
+
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty,
+                               String createUser, String createDatetime) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.jisActualNo = jisActualNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.qty = qty;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
+
+}

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

@@ -1,40 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model;
-
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-/**
- * @Description:
- * @Author: jokelin
- * @Date: 2020/3/20 9:02 下午
- * @Modify:
- */
-@Data
-public class QueueJitActualModule {
-
-    private Long id;
-    @ApiParam("vin")
-    private String vinCode;
-    @ApiParam("排序号")
-    private Double seq;
-    @ApiParam("分组队列编号")
-    private String queueGroupNo;
-    @ApiParam("组内编号")
-    private Integer groupNo;
-    @ApiParam("JIT排序号")
-    private String jitSeq;
-
-    public QueueJitActualModule() {
-
-    }
-
-    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
-        this.id = id;
-        this.vinCode = vinCode;
-        this.seq = seq;
-        this.queueGroupNo = queueGroupNo;
-        this.groupNo = groupNo;
-        this.jitSeq = jitSeq;
-    }
-
-}

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

@@ -106,6 +106,14 @@ public class QueueOrderModel implements Serializable {
     private String jitSeq;
     private Integer status;
 
+    @ApiParam("回冲标识")
+    private String jisBackflushStatus;
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @ApiParam("是否放空")
+    private Integer isEmpty;
+
     public QueueOrderModel() {
     }
 
@@ -350,4 +358,13 @@ public class QueueOrderModel implements Serializable {
         this.jitSeq = jitSeq;
         this.status = status;
     }
+
+    // getQueueJitActualDetailByNo
+    public QueueOrderModel(Long id, String jisActualNo, String serialNumber, String vinCode, String jisBackflushStatus) {
+        this.id = id;
+        this.jisActualNo = jisActualNo;
+        this.serialNumber = serialNumber;
+        this.vinCode = vinCode;
+        this.jisBackflushStatus = jisBackflushStatus;
+    }
 }