Merge remote-tracking branch 'origin/test' into test

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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java

@@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable {
     @ApiParam(value = "IP地址")
     private String nodeIP;
 
+    @Column(name = "CHANNEL")
+    @ApiParam("通道")
+    private String channel;
+
+    @Column(name = "DEVICE")
+    @ApiParam("终端")
+    private String device;
+
+    @Column(name = "OPC_URL")
+    @ApiParam("OPCUA路径")
+    private String opcUrl;
+
+    @Column(name = "NAME_SPACE_INDEX")
+    @ApiParam("空间索引")
+    private Integer nameSpaceIndex = 2;
+
     @Column(name = "CHANNEL_NAME")
     @ApiParam(value = "通道名称")
     private String channelName;
@@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable {
     @ApiParam(value = "标签类型")
     private String tagType;
 
+    @Column(name = "DATA_TYPE")
+    @ApiParam("标签数据类型")
+    private String dataType;
+
     @Column(name = "GROUP_NO")
     @ApiParam(value = "分组号")
     private String groupNo;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable {
     private String msgType;
 
     @ApiModelProperty("消息数据")
-    private Map<String, Object> msgData;
+    private Map<String, Object> msgData = new HashMap<>();
 
     @ApiModelProperty("流程状态集合")
     private List<AndonRouteStatus> routeStatusList;

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,219 @@ 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;
+        }
+    }
+
+    /**
+     * 质检单审批处理意见
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_ORDER_APPROVAL_CHOICE {
+
+        STOP_LINE(10, "停线"),
+        RELEASE(20, "放行");
+
+        private int value;
+        private String description;
+
+        QC_ORDER_APPROVAL_CHOICE(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;
+        }
+    }
+
+    /**
+     * 整体检测结果状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_RESULT {
+
+        PASS(10, "通过"),
+        NON_PASS(20, "不通过"),
+        CONCESSION_PRODUCTION(30, "让步生产");
+
+        private int value;
+        private String description;
+
+        CHECK_RESULT(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;
+        }
+    }
+
+    /**
+     * 整体检测结果状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_ORDER_APPROVAL_TYPE {
+
+        STOP_LINE(10, "停线"),
+        RELEASE(20, "放行");
+
+        private int value;
+        private String description;
+
+        QC_ORDER_APPROVAL_TYPE(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;
+        }
+    }
+
+    /**
+     * 检测单明细的检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_ORDER_DETAIL_CHECK_RESULT {
+
+        OK(10, "OK"),
+        NG(20, "NG");
+
+        private int value;
+        private String description;
+
+        QC_ORDER_DETAIL_CHECK_RESULT(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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -80,7 +80,9 @@ public class MesPcnEnumUtil {
             return value;
         }
 
-        public String getData() { return data; }
+        public String getData() {
+            return data;
+        }
 
         public String getDescription() {
             return description;
@@ -1884,7 +1886,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;
@@ -3783,7 +3786,7 @@ public class MesPcnEnumUtil {
      * 整体检测结果状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum CHECK_REULST {
+    public enum CHECK_RESULT {
 
         PASS(10, "通过"),
         NON_PASS(20, "不通过"),
@@ -3792,7 +3795,7 @@ public class MesPcnEnumUtil {
         private int value;
         private String description;
 
-        CHECK_REULST(int value, String description) {
+        CHECK_RESULT(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -5212,6 +5215,138 @@ 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;
+        }
+    }
+
+    /**
+     * 过程检测数据源类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_DATA_SOURCE {
+        MANUAL_INPUT(10, "10", "人工输入"),
+        DB(30, "30", "数据库"),
+        PLC(20, "20", "PLC");
+
+        private int value;
+        private String description;
+        private String code;
+
+        QC_CHECK_DATA_SOURCE(int value, String code, String description) {
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 过程检测检测对象数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_VALUE_TYPE {
+        STRING(10, "字符串"),
+        INTEGER(20, "数值");
+
+        private int value;
+        private String description;
+
+        QC_CHECK_VALUE_TYPE(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;
+        }
+    }
+
+    /**
+     * 过程检测检测检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_VALUE_RESULT {
+        OK(10),
+        NOT_OK(20),
+        MANUAL(30);
+
+        private int value;
+
+        QC_CHECK_VALUE_RESULT(int value) {
+            this.value = value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
+    /**
      * 中航DB数据检查配置-DB复核项
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5251,5 +5386,4 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
-
 }

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

@@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -88,6 +85,14 @@ public class MesBom extends BaseBean implements Serializable {
     @ApiParam("BOM代码")
     private String bomCode;
 
+    @Transient
+    @ApiParam(value = "过程条码")
+    public String serialNumber;
+
+    @Transient
+    @ApiParam(value = "已拆解数量")
+    public Double scrapQty = 0d;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/11 14:29
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CHECK_DATA_CFG", indexes = {
+        @Index(columnList = "CHECK_CFG_NO")
+})
+@Api("检测数据源配置")
+public class MesCheckDataCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5608847087804566577L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "CHECK_CFG_NO")
+    @ApiParam("检测值配置编号")
+    private String checkCfgNo;
+
+
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_GENERATE_QC_ORDER")
+@Api("待生成检验单")
+public class MesGenerateQcOrder extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 14873669015484197L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @Column(name = "IS_GENERATED")
+    @ApiParam("是否生成了末检单")
+    private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "GENERATE_TIME")
+    @ApiParam("生成时间")
+    private String generateTime;
+
+
+}

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

@@ -44,9 +44,13 @@ public class MesLoopQcGenerateDetail extends BaseBean  implements Serializable {
     @ApiParam("检测项")
     private String checkItem;
 
-    @Column(name = "LASR_TIME")
+    @Column(name = "CHECK_ORDER_TYPE")
+    @ApiParam("任务单类型")
+    private String checkOrderType;
+
+    @Column(name = "LAST_TIME")
     @ApiParam("末次时间")
-    private String lasrTime;
+    private String lastTime;
 
     @ApiParam(value = "物料号")
     @Transient

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

@@ -64,18 +64,6 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("频率")
     private String checkFrequency;
 
-    @Transient
-    @ApiParam("物料名称")
-    private String partName;
-
-    @Transient
-    @ApiParam("检测结果")
-    private String checkResult;
-
-    @Transient
-    @ApiParam("检测值")
-    private String checkValue;
-
     @Column(name = "CHECK_ITEM_TYPE")
     @ApiParam("检测项类型")
     private String checkItemType;
@@ -86,12 +74,36 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
 
     @Column(name = "IS_CONCESSION")
     @ApiParam("是否允许让步")
-    private Integer isConcession = 0;
+    private Integer isConcession;
 
     @Column(name = "NUMBER_FLAG")
     @ApiParam("数量标识")
     private String numberFlag;
 
+    @Column(name = "QTY")
+    @ApiParam("检测数量")
+    private Integer qty;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CHECK_ORDER_TYPE")
+    @ApiParam("任务单类型")
+    private String checkOrderType;
+
+    @Column(name = "DATA_SOURCE")
+    @ApiParam("数据来源")
+    private String dataSource;
+
+    @Column(name = "CHECK_VALUE_TYPE")
+    @ApiParam("任务单类型")
+    private String checkValueType;
+
+    @Column(name = "CHECK_CFG_NO")
+    @ApiParam("检测值配置编号")
+    private String checkCfgNo;
+
     @Column(name = "MAXIMUM")
     @ApiParam("最大数")
     private Double maximum = 0d;
@@ -100,6 +112,22 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("最小数")
     private Double minimum = 0d;
 
+    @Column(name = "IS_KEY_CHECK_ITEM")
+    @ApiParam("是否关键检测项")
+    private Integer isKeyCheckItem;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("检测结果")
+    private String checkResult;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;

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

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -84,9 +85,9 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name = "CHECK_REULST")
+    @Column(name = "CHECK_RESULT")
     @ApiParam("检测整体结果")
-    private Integer checkReulst = 0;
+    private Integer checkResult = 0;
 
     @Column(name = "MEMO")
     @ApiParam("备注")
@@ -112,9 +113,18 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("样本类型")
     private Integer sampleType;
 
+    @Column(name = "CHECK_ORDER_TYPE")
+    @ApiParam("任务单类型")
+    private String checkOrderType;
+
+    @Deprecated
     @ApiParam(value = "检测结果")
     @Transient
-    private String reulstStatus;
+    private String resultStatus;
+
+    @ApiParam(value = "显示按钮")
+    @Transient
+    private List<String> buttons;
 
     @ApiParam(value = "产品条码")
     @Transient

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

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QC_ORDER_APPROVAL_STATUS")
+@Api("检测单审批状态表")
+public class MesQcOrderApprovalStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3157480917343280506L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name = "PLAN_QTY")
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检验类型")
+    private Integer checkType;
+
+    @Column(name = "QC_USER")
+    @ApiParam("检查人")
+    private String qcUser;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private String checkResult;
+
+    @Column(name = "IS_KEY_CHECK_ITEM")
+    @ApiParam("是否关键检测")
+    private Integer isKeyCheckItem;
+
+    @Column(name = "QUALITY_APPROVAL_STATUS")
+    @ApiParam("质量经理审批状态")
+    private Integer qualityApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "QUALITY_CHOICE")
+    @ApiParam("质量经理审批状态")
+    private Integer qualityChoice;
+
+    @Column(name = "PRODUCE_APPROVAL_STATUS")
+    @ApiParam("生产经理审批状态")
+    private Integer produceApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "PRODUCE_CHOICE")
+    @ApiParam("生产经理审批状态")
+    private Integer produceChoice;
+
+    @Column(name = "APPROVAL_STATUS")
+    @ApiParam("生产经理审批状态")
+    private Integer approvalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+
+}

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

@@ -64,10 +64,6 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
     @ApiParam("是否允许让步")
     private Integer isConcession = 0;
 
-    @Column(name = "CHECK_REULST")
-    @ApiParam("判定结果")
-    private Integer checkReulst = 0;
-
     @Column(name = "ITEM_NO")
     @ApiParam("检验行号")
     private Integer itemNo = 0;
@@ -76,17 +72,13 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name = "CHECK_VALUE")
+    @Column(name = "QTY")
-    @ApiParam("检测值")
+    @ApiParam("数量")
-    private String checkValue;
+    private Integer qty;
 
-    @ApiParam(value = "已完成数量")
+    @Column(name = "FINISH_QTY")
-    @Transient
+    @ApiParam("已检数量")
-    private Integer finishQty = 0;
+    private Integer finishQty;
-
-    @ApiParam(value = "检测项类型名称")
-    @Transient
-    private String businessTypeName;
 
     @Column(name = "MAXIMUM")
     @ApiParam("最大数")
@@ -95,4 +87,41 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
     @Column(name = "MINIMUM")
     @ApiParam("最小数")
     private Double minimum = 0d;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "DATA_SOURCE")
+    @ApiParam("数据源")
+    private String dataSource;
+
+    @Column(name = "CHECK_VALUE_TYPE")
+    @ApiParam("检测值类型")
+    private String checkValueType;
+
+    @Column(name = "IS_KEY_CHECK_ITEM")
+    @ApiParam("是否关键检测项")
+    private Integer isKeyCheckItem;
+
+    @ApiParam(value = "检测项类型名称")
+    @Transient
+    private String businessTypeName;
+
+    @Column(name = "CHECK_CFG_NO")
+    @ApiParam("检测值配置编号")
+    private String checkCfgNo;
+
+    @Transient
+    @ApiParam("判定结果")
+    private Integer checkResult = 0;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
 }

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QC_ORDER_RECORD", indexes = {
+        @Index(columnList = "QC_ORDER_DETAIL_ID"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "ORDER_NO")
+})
+@Api("MES_检验单检验记录")
+public class MesQcOrderRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5245624982023882232L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("判定结果")
+    private Integer checkResult = 0;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检测值")
+    private String checkValue;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "CHECK_SEQ")
+    @ApiParam("检测顺序")
+    private Integer checkSeq;
+
+    @Column(name = "QC_ORDER_DETAIL_ID")
+    @ApiParam("质检单明细id")
+    private Long qcOrderDetailId;
+
+}

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/MesQueueOrder.java

@@ -168,7 +168,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
 
     public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty,
                                Integer queueType,Integer status,String createUser,
-                         String createDatetime,String modifyUser,String modifyDatetime,String workType) {
+                         String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo) {
         this.seq = seq;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -180,6 +180,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.workType = workType;
+        this.orderNo = orderNo;
     }
 
 }

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/PaintOnLineModel.java

@@ -29,6 +29,9 @@ public class PaintOnLineModel {
     @ApiParam("物料名称")
     private String partNameRdd;
 
+    @ApiParam("颜色代码")
+    private String colorCode;
+
     @ApiParam("颜色")
     private String color;
 
@@ -47,9 +50,24 @@ public class PaintOnLineModel {
     @ApiParam("圈数")
     private Integer rounds;
 
+    @ApiParam("小车号")
+    private  String smallCarNo;
+
+    @ApiParam("车数")
+    private  Integer smallCarAmount;
+
     @ApiParam("过程条码")
     private String serialNumber;
 
     @ApiParam("是否虚拟件")
     private Integer isFictive = 2;
+
+    @ApiParam("反喷标识")
+    private String reverseSprayMark;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("工单类型")
+    private String workType;
 }

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/16 00:24
+ * @desc
+ */
+@Data
+public class QcOrderCheckDataDetailModel {
+
+    private Integer checkType;
+
+    private String checkItem;
+
+    private String checkStandard;
+
+    private Integer checkCount;
+
+    private Integer isConcession;
+
+    private Integer isKeyCheckItem;
+
+    private Double max;
+
+    private Double min;
+
+    private String checkValue;
+
+    private Integer checkResult;
+
+
+    public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount,
+                                       Integer isConcession, Integer isKeyCheckItem, Double max, Double min,
+                                       String checkValue, Integer checkResult) {
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkCount = checkCount;
+        this.isConcession = isConcession;
+        this.isKeyCheckItem = isKeyCheckItem;
+        this.max = max;
+        this.min = min;
+        this.checkValue = checkValue;
+        this.checkResult = checkResult;
+    }
+}

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;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCheckDataCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesCheckDataCfgRepository extends BaseRepository<MesCheckDataCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesGenerateQcOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesGenerateQcOrderRepository extends BaseRepository<MesGenerateQcOrder, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderApprovalStatus;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesQcOrderApprovalStatusRepository extends BaseRepository<MesQcOrderApprovalStatus, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesQcOrderRecordRepository extends BaseRepository<MesQcOrderRecord, Long> {
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -465,20 +465,16 @@ public class MesPcnHqlPack {
     }
 
     /**
-     * 获取工作中心下所有的投料数据
+     * 获取检测单下的所有检测明细
      *
-     * @param mesQcOrderDetail
+     * @param qcOrder
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) {
+    public static DdlPackBean getMesQcOrderDetail(MesQcOrder qcOrder, String organizeCode) {
-        DdlPackBean packBean = getAllBaseData(organizeCode);
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean);
-        DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean);
+        DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
-        DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean);
-        if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) {
-            DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean);
-        }
         return packBean;
     }
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java

@@ -88,6 +88,11 @@ public class WmsCSRange extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     public String areaNo;
 
+    @Transient
+    @ApiParam("存储区")
+    @AnnoOutputColumn(hidden = true)
+    public String basZoneNo;
+
     public WmsCSRange(){}
 
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
@@ -96,8 +101,9 @@ public class WmsCSRange extends BaseBean {
         this.partNameRdd = partNameRdd;
     }
 
-    public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) {
+    public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) {
         this.zoneNo = zoneNo;
+        this.basZoneNo = basZoneNo;
         this.areaNo = areaNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java

@@ -247,7 +247,7 @@ public class WmsStockQuan extends BaseBean {
 
     public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName,
                         Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
-                        Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+                        Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
         this.organizeCode = organizeCode;
         this.whNo = whNo;
         this.zoneNo = zoneNo;
@@ -262,7 +262,7 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
-        this.sumQty = sumQty;
+        this.totalQty = totalQty;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1203,7 +1203,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean);
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean);
-        if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
+        if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) {
             List<String> columnNames = new ArrayList<>();
             columnNames.add("srcZoneNo");
             columnNames.add("destZoneNo");

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./