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

# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

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

@@ -75,7 +75,7 @@ public class AndonBoardModel implements Serializable {
     private String color;
 
     @ApiParam("停线时间比率")
-    private Integer downtimeRate;
+    private String downtimeRate;
 
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;

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

@@ -3859,6 +3859,43 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 产线管控-过程检验状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_INSPECTION {
+        NOT_CREATE(10, "未创建"),
+        CREATE(20, "已创建"),
+        PROCESS(30, "执行中"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        PROCESS_INSPECTION(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)
@@ -5937,4 +5974,93 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 预装产线，工位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRE_WORK_CENTER_CODE {
+        OP10("OP10", "OP10"),
+        OP20A("OP20a", "OP20a"),
+        OP20B("OP20b", "OP20b");
+
+        private String code;
+        private String description;
+
+        PRE_WORK_CENTER_CODE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PRE_WORK_CENTER_CODE getByCode(String code) {
+            for (PRE_WORK_CENTER_CODE workCenterCode : values()) {
+                if (workCenterCode.getCode().equals(code)) {
+                    return workCenterCode;
+                }
+            }
+            return null;
+        }
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    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/WmsEnumUtil.java

@@ -1891,6 +1891,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
     /**
@@ -2344,6 +2349,21 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
     /**

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

@@ -168,4 +168,13 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.workCenterCode = workCenterCode;
         this.qcStatus = qcStatus;
     }
+
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.packageNo = packageNo;
+        this.itemQty = itemQty;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -111,8 +111,8 @@ public class MesBoardMafactAssessment extends BaseBean implements Serializable {
     @ApiParam("NOV")
     private String nov;
 
-    @Column(name = "DEC")
-    @ApiParam("DEC")
-    private String dec;
+    @Column(name = "DECEMBER")
+    @ApiParam("DECEMBER")
+    private String december;
 
 }

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

@@ -77,4 +77,10 @@ public class MesDefect extends BaseBean implements Serializable {
         this.defectType = defectType;
         this.defectTypeName = defectTypeName;
     }
+
+    public MesDefect(String defectType, String defectCode, String defectName) {
+        this.defectType = defectType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+    }
 }

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

@@ -105,7 +105,26 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("缺陷类型名称")
     private String defectActionTypeName;
 
+    @Transient
+    @ApiParam("缺陷数量")
+    private Integer defectQty;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
+
+    public MesDefectRecord() {
+
+    }
+
+    public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType,
+                           String defectCode, String defectName, Integer defectQty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.workOrderNo = workOrderNo;
+        this.defectActionType = defectActionType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectQty = defectQty;
+    }
 }

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

@@ -39,5 +39,5 @@ public class MesLineFaultRecord extends BaseBean implements Serializable {
 
     @Column(name = "FAULT_TIME")
     @ApiParam("故障时长（分）")
-    private Double faultTime;
+    private Long faultTime;
 }

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

@@ -23,7 +23,13 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
+@Table(name = "MES_PACKAGE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "IS_SEALED")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
 })

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -69,11 +70,11 @@ public class MesQualityStandard extends BaseBean implements Serializable {
 
     @Column(name = "IS_CONCESSION")
     @ApiParam("是否允许让步")
-    private String isConcession;
+    private Integer isConcession;
 
     @Column(name = "CHECK_INTERVAL")
     @ApiParam("间隔时间")
-    private String checkInterval;
+    private Integer checkInterval = 0;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @Column(name = "NUMBER_FLAG")
@@ -99,13 +100,15 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("检验值类型")
     private String checkValueType;
 
-    @Column(name = "DIFFERENCE_MAX_LIMIT")
+    @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公差上限")
-    private BigDecimal differenceMaxLimit;
+    private Double maximum = 0d;
 
-    @Column(name = "DIFFERENCE_MIN_LIMIT")
+    @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公差下限")
-    private BigDecimal differenceMinLimit;
+    private Double minimum = 0d;
 
     @Column(name = "IS_KEY_CHECK_ITEM")
     @ApiParam("是否关键检测项")

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

@@ -42,4 +42,7 @@ public class DismantleRecordModel {
 
     @ApiParam("不良集合")
     private List<MesDefect> defectList;
+
+    @ApiParam("返修工位标志")
+    private String repairFlag;
 }

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesQcOrderDetailRecordModel implements Serializable {
+    private static final long serialVersionUID = -7216132883079491432L;
+
+    @ApiParam("检测人")
+    private String createUser;
+
+    @ApiParam("检测时间")
+    private String createDatetime;
+
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @ApiParam("判定结果")
+    private Integer checkResult = 0;
+
+    @ApiParam("检测值")
+    private String checkValue;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("检测顺序")
+    private Integer checkSeq;
+
+
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @ApiParam("是否允许让步")
+    private Integer isConcession = 0;
+
+    @ApiParam("检验行号")
+    private Integer itemNo = 0;
+
+//    @ApiParam("产品条码")
+//    private String serialNumber;
+
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("已检数量")
+    private Integer finishQty;
+
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @ApiParam("最小数")
+    private Double minimum = 0d;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("数据源")
+    private String dataSource;
+
+    @ApiParam("检测值类型")
+    private String checkValueType;
+
+    @ApiParam("是否关键检测项")
+    private Integer isKeyCheckItem;
+
+    @ApiParam(value = "检测项类型名称")
+    private String businessTypeName;
+
+}

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

@@ -45,10 +45,10 @@ public class MesQualityStandardModel {
     private String checkFrequency;
 
     @ApiParam("是否允许让步")
-    private String isConcession;
+    private Integer isConcession;
 
     @ApiParam("间隔时间")
-    private String checkInterval;
+    private Integer checkInterval;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @ApiParam("个数标识")
@@ -70,10 +70,10 @@ public class MesQualityStandardModel {
     private String checkValueType;
 
     @ApiParam("公差上限")
-    private BigDecimal differenceMaxLimit;
+    private Double maximum;
 
     @ApiParam("公差下限")
-    private BigDecimal differenceMinLimit;
+    private Double minimum;
 
     @ApiParam("是否关键检测项")
     private Integer isKeyCheckItem;

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -18,19 +19,19 @@ public class QcCheckDataResultModel {
     private Integer isFirstCheck;
 
     @ApiParam("首检结果")
-    private List<MesQcCheckData> firstCheckResult;
+    private List<MesQcOrder> firstCheckResult;
 
     @ApiParam("是否完成巡检")
     private Integer isOnSiteCheck;
 
     @ApiParam("巡检结果")
-    private List<MesQcCheckData> onSiteCheckResult;
+    private List<MesQcOrder> onSiteCheckResult;
 
     @ApiParam("是否完成尾检")
     private Integer isEndCheck;
 
     @ApiParam("尾检结果")
-    private List<MesQcCheckData> endCheckResult;
+    private List<MesQcOrder> endCheckResult;
 
     public QcCheckDataResultModel() {
     }

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

@@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
+    public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
                            String partNo, String prodCfgTypeCode) {
         this.id = id;
+        this.orderNo = orderNo;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;

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

@@ -5,12 +5,13 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 @Data
-public class TJMgnBoardModel extends BaseBean {
+public class TJMgnBoardModel extends BaseBean implements Serializable {
 
     @ApiParam("工单号")
     private String workOrderNo;
@@ -21,6 +22,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("物料名称")
     private String partNameRdd;
 
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("条码数量")
+    private Integer snQty;
+
     @ApiParam("颜色")
     private String partColor;
 
@@ -74,4 +81,15 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("结束工单")
     private String workOrderNoEnd;
 
+    public TJMgnBoardModel() {
+    }
+
+    public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.workOrderNo = workOrderNo;
+        this.snQty = snQty;
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -41,6 +41,10 @@ public class MgnBjBoardModel implements Serializable {
     private Integer onceQualityRate = 0;
     @ApiParam("待生产订单数量")
     private Integer waitProduceQty = 0;
+    @ApiParam("低于安全库存")
+    private Integer minStockQty;
+    @ApiParam("超出最大库存")
+    private Integer maxStockQty;
 
     @ApiParam(value = "显示颜色")
     private String color;

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

@@ -3542,6 +3542,26 @@ public class MesHqlPack {
     }
 
     /**
+     * MES_看板自定义参数配置查询条件封装
+     *
+     * @param boardCustomParamCfg
+     * @return
+     */
+    public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES容器位置查询条件封装
      *
      * @param mesContainerLocation

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

@@ -437,6 +437,8 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
+        DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean);
+
         // 时间段查询
         DdlPreparedPack.timeBuilder(
                 mesPackage.getCreateDateTimeStart(),

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 全量BOM
@@ -103,4 +104,15 @@ public class WmsBomTotal extends BaseBean {
     public boolean hasChild() {
         return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD);
     }
+
+    /**
+     * 导入列
+     */
+    @Transient
+    @ApiParam(value = "行数")
+    private Integer rows;
+
+    @Transient
+    @ApiParam(value = "状态")
+    private Integer status;
 }

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

@@ -324,11 +324,13 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
+    public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,
                                 Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;
         this.erpSrcNo = erpSrcNo;
+        this.item = item;
         this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
         this.qty = qty;
         this.rcQty = rcQty;
         this.itemStatus = itemStatus;

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

@@ -362,4 +362,14 @@ public class WmsPart extends BaseBean {
         this.snp = snp;
         this.partSpec = partSpec;
     }
+
+    public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.partSpec = partSpec;
+        this.snp = snp;
+        this.buyUnit = buyUnit;
+        this.snControl = snControl;
+        this.qty = qty;
+    }
 }

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description : 推送信息配置
@@ -60,10 +57,18 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SQL_STR", columnDefinition = "TEXT")
     private String sqlStr;
 
-    @ApiParam("脚本编号")
+    @ApiParam("数据获取脚本编号")
     @Column(name = "SCRIPT_NO")
     private String scriptNo;
 
+    @ApiParam("脚本入参")
+    @Column(name = "SCRIPT_PARAM")
+    private String scriptParam;
+
+    @ApiParam("附件脚本编号")
+    @Column(name = "ATTACH_SCRIPT_NO")
+    private String attachScriptNo;
+
     @Lob
     @ApiParam("标题模板")
     @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT")
@@ -94,4 +99,8 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "CONTENT_LABEL")
     private String contentLabel;
 
+    // 临时存储
+    @ApiParam("附件的文件路径")
+    @Transient
+    private String attachFilePath;
 }

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

@@ -48,5 +48,7 @@ public class WmsPushLog extends BaseBean{
     @ApiParam("推送地址")
     private String pathUrl;
 
-
+    @ApiParam("附件地址")
+    @Column(name = "ATTACH_FILE_PATH")
+    private String attachFilePath;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -13,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 质检单明细信息
@@ -61,6 +63,7 @@ public class WmsQCDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description")
     public Integer itemStatus;
 
     @Column(name = "REMARK")
@@ -103,6 +106,28 @@ public class WmsQCDetails extends BaseBean {
     public WmsQCDetails() {
     }
 
+    public WmsQCDetails(String organizeCode, String partNo, String partNameRdd, String item,
+                        Double qty, String unit, String orderNo,
+                        Integer itemStatus, String remark, Double factQty,
+                        Double passQty, Double rejectQty,
+                        Integer orderStatus, String vendorNo, String vendorDesc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.item = item;
+        this.qty = qty;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.itemStatus = itemStatus;
+        this.remark = remark;
+        this.factQty = factQty;
+        this.passQty = passQty;
+        this.rejectQty = rejectQty;
+        this.orderStatus = orderStatus;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+    }
+
     public WmsQCDetails(String partNo, String partNameRdd, String item,
                         Double qty, String unit, String orderNo,
                         Integer itemStatus, String remark, Double factQty,

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

@@ -54,7 +54,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS")
     public Integer orderStatus;
 

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

@@ -874,4 +874,18 @@ public class WmsStockSn extends BaseBean {
         this.partNameRdd = wmsStockSn.getPartNameRdd();
         this.sumQty = sumQty;
     }
+
+    public WmsStockSn( String zoneNo, String locateNo, String partNo,
+                      String partNameRdd, String sn, Double qty, String qualityDate,
+                       Integer snStatus,String lotNo) {
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.qualityDate = qualityDate;
+        this.snStatus = snStatus;
+        this.lotNo = lotNo;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java

@@ -35,7 +35,8 @@ import javax.persistence.Table;
         @Index(columnList = "DEST_BEAN_NAME"),
         @Index(columnList = "SOFT_ADAPTOR_CODE"),
         @Index(columnList = "SID"),
-        @Index(columnList = "MOVE_TO_ERP_ID")
+        @Index(columnList = "MOVE_TO_ERP_ID"),
+        @Index(columnList = "ERP_DOC_NO")
 })
 @Api("接口数据收发记录")
 public class WmsInterfaceDataRecord extends BaseBean {
@@ -78,4 +79,17 @@ public class WmsInterfaceDataRecord extends BaseBean {
     @ApiParam("ERP文档编号")
     @Column(name = "ERP_DOC_NO")
     private String erpDocNo;
+
+    @ApiParam("ERP状态代码")
+    @Column(name = "ERP_STATUS_CODE")
+    private String erpStatusCode;
+
+    @ApiParam("ERP状态描述")
+    @Column(name = "ERP_STATUS_DESC")
+    private String erpStatusDesc;
+
+    @ApiParam("ERP最后更新时间")
+    @Column(name = "ERP_LAST_MODIFY_TIME")
+    private String erpLastModifyTime;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java

@@ -1,12 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import java.util.List;
-import java.util.Map;
-
 @Data
 public class PushMessageModel {
 
@@ -29,5 +25,6 @@ public class PushMessageModel {
     @ApiParam("工厂代码")
     private String organizeCode;
 
-
+    @ApiParam("附件的文件路径")
+    private String attachFilePath;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java

@@ -58,6 +58,9 @@ public class WmsQCStatusModel {
     @ApiParam("标准质检时间")
     private Double stdCheckTime;
 
+    @ApiParam("质检时长")
+    private long qcCostTime;
+
     public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) {
         this.asnOrderNo = asnOrderNo;
         this.qcOrderNo = qcOrderNo;
@@ -68,4 +71,8 @@ public class WmsQCStatusModel {
         this.proportion = proportion;
         this.stdCheckTime = stdCheckTime;
     }
+    public Double getStdQcTimeVal() {
+        return this.stdQcTime == null ? 0 : this.stdQcTime;
+    }
+
 }