冲突解决

5 years ago · 114654dd99
parent 696695ef0e 5fcdc2d4ea
commit 114654dd99
25 changed files with 463 additions and 26 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@ -830,7 +830,8 @@ public class BlockSoftSwitchEnumUtil {
    public enum SUIT_PROCESS_STATUS {
        UNPROCESSED(10, "未处理"),
        PROCESSING(20,  "处理中"),
-        PROCESS(30,  "已处理");
+        PROCESS(30,  "已处理"),
+        PROCESS_FAIL(40,  "处理失败");

        private int value;
        private String description;
@ -878,7 +879,8 @@ public class BlockSoftSwitchEnumUtil {
        REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
        ORIGINAL_MESSAGE(30,  "原始报文"),
        CONVERTED_MESSAGE(40,  "转换报文"),
-        SUIT_SEND_MESSAGE(50,  "适配发送报文");
+        SUIT_SEND_MESSAGE(50,  "适配发送报文"),
+        PROCESS_RESULT(60,  "处理结果");

        private int value;
        private String description;
@ -919,6 +921,52 @@ public class BlockSoftSwitchEnumUtil {
    }

    /**
+     * ftp连接模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FTP_CONNECTION_MODE {
+        LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+//        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
+        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+
+        private final int value;
+        private final String description;
+
+        FTP_CONNECTION_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 FTP_CONNECTION_MODE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE;
+        }
+    }
+
+    /**
     * 脚本类型
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -957,7 +1005,6 @@ public class BlockSoftSwitchEnumUtil {
        }

        public static BS_SCRIPT_TYPE valueOf(int val) {
-            String tmp = null;
            for (int i = 0; i < values().length; i++) {
                if (values()[i].value == val) {
                    return values()[i];
@ -1003,7 +1050,6 @@ public class BlockSoftSwitchEnumUtil {
        }

        public static BS_SCRIPT_LANGUAGE valueOf(int val) {
-            String tmp = null;
            for (int i = 0; i < values().length; i++) {
                if (values()[i].value == val) {
                    return values()[i];
@ -1050,7 +1096,6 @@ public class BlockSoftSwitchEnumUtil {
        }

        public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) {
-            String tmp = null;
            for (int i = 0; i < values().length; i++) {
                if (values()[i].value == val) {
                    return values()[i];
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -69,16 +69,21 @@ public class MesEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum WORK_MODULE_TYPE {
-        MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(20, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"),
+        REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"),
+        BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"),
+        TIMING_MODULE(40, "TIMING_MODULE", "定时组件"),
+        PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"),
+        ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件");

        private int value;
+        private String data;
        private String description;

-        WORK_MODULE_TYPE(int value, String description) {
+        WORK_MODULE_TYPE(int value, String data, String description) {
            this.value = value;
+            this.data = data;
            this.description = description;
        }

@ -86,6 +91,10 @@ public class MesEnumUtil {
            return value;
        }

+        public String getData() {
+            return data;
+        }
+
        public String getDescription() {
            return description;
        }
@ -708,7 +717,8 @@ public class MesEnumUtil {
        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"),
+        WO_TYPE("WO_TYPE", "客户JIT队列工单类型");

        private String value;
        private String description;
@ -4526,7 +4536,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;
@ -4778,7 +4789,8 @@ public class MesEnumUtil {
    public enum WORK_CELL_MONITOR_TYPE {
        MONITOR(10, "监听组件"),
        SHOW(20, "展示组件"),
-        BUTTON(30, "按钮组件");
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");

        private int value;
        private String description;
@ -6659,8 +6671,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;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/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;
@ -5447,4 +5456,80 @@ public class MesPcnEnumUtil {
        }
    }

+    /**
+     * 中航DB数据检查配置-DB复核项
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_DB_DATA_CHECK_ITEM {
+        PART_NO_NULL(10, "物料为空复核"),
+        PART_NO_ORDER(20, "零件工单匹对复核"),
+        SERIA_LNUMBER_REPEAT(30, "过程条码重复复核"),
+        SERIA_LNUMBER_NULL(40, "过程条码为空复核"),
+        PRODUCT_SN_REPEAT(50, "产品二维码重复复核"),
+        PRODUCT_SN_NULL(60, "产品二维码为空复核"),
+        KEY_DATA_FILED_NULL(70, "质量关键字段为空复核"),
+        QC_FAIL_MAX_COUNT(80, "缺陷类型连续超过设定数复核");
+
+        private int value;
+        private String description;
+
+        MES_DB_DATA_CHECK_ITEM(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            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;
+        }
+    }
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
@ -624,6 +624,25 @@ public class DdlPreparedPack {
        }
    }

+
+    /**
+     * 封装not in List查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param sufColumnName
+     * @param packBean
+     */
+    public static void getNotInPackList(List<?> data, String columnName, String sufColumnName, DdlPackBean packBean) {
+        if (data != null && data.size() > 0) {
+            String destColumnName = columnName;
+            if (!StringUtil.isEmpty(sufColumnName)) {
+                destColumnName = destColumnName + "_" + System.currentTimeMillis();
+            }
+            packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data);
+        }
+    }
+
    /**
     * 封装in String查询语句
     *
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java
@ -12,11 +12,11 @@ import java.util.regex.Pattern;
 public class StringUtil {

 	public static boolean isEmpty(Object obj){
-		
+
 		if(obj ==null || obj.toString().trim().equals("")){
 			return true;
 		}
-		
+
 		return false;
 	}

@ -33,4 +33,13 @@ public class StringUtil {
 		}
 		return fieldNames;
 	}
+
+	public static boolean isEmptyAndNull(Object obj){
+
+		if(obj == null || obj.toString().trim().equals("") || "null".equalsIgnoreCase(obj.toString().trim())){
+			return true;
+		}
+
+		return false;
+	}
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/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;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java
@ -0,0 +1,84 @@
+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.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description: MES-中航DB数据复核不通过记录表
+ * @CreateDate: 2020/9/14
+ * @Author: simon.song
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DB_CHECK_RECORD")
+@Api("中航复核异常记录表")
+public class MesDbCheckRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6727925715356900171L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
+    @Column(name = "DB_CHECK_ITEM")
+    @ApiParam("DB复核项")
+    private String dbReview;
+
+    @Column(name = "ERROR_FILED_CODE")
+    @ApiParam("异常取值字段")
+    private String errorFiledCode;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam("异常描述")
+    private String errorDesc;
+
+    @Column(name = "PRODUCT_DATA_ID")
+    @ApiParam("生产记录表主键ID")
+    private String productDataId;
+
+    //是否停线：1=是，2=否
+    @Column(name = "IS_STOP_LINE")
+    @ApiParam("是否停线")
+    private Integer isStopLine;
+
+    //审批状态：10=待审批，20=已审批
+    @Column(name = "STATUS")
+    @ApiParam("审批状态")
+    private Integer status;
+
+    @Transient
+    @ApiParam("按钮名称")
+    private String btnName;
+
+    @Transient
+    @ApiParam("按钮颜色")
+    private String btnColor;
+
+    @Transient
+    @ApiParam("按钮类别")
+    private String btnType;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java
@ -0,0 +1,69 @@
+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.Table;
+import java.io.Serializable;
+
+/**
+ * @Description: MES-中航DB数据检查配置表
+ * @CreateDate: 2020/9/14
+ * @Author: simon.song
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DB_DATA_CHECK")
+@Api("中航DB数据检查配置表")
+public class MesDbDataCheck extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6889751438239451959L;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
+    @Column(name = "DB_CHECK_ITEM")
+    @ApiParam("DB复核项")
+    private Integer dbCheckItem;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    //是否停线：1=是，2=否
+    @Column(name = "IS_STOP_LINE")
+    @ApiParam("是否停线")
+    private Integer isStopLine;
+
+    @Column(name = "KEY_DATA_FILED")
+    @ApiParam("质量关键字段")
+    private String keyDataFiled;
+
+    @Column(name = "QC_FILED_CODE")
+    @ApiParam("缺陷类型字段")
+    private String qcFiledCode;
+
+    @Column(name = "QC_FILED_VALUE")
+    @ApiParam("缺陷类型合格值")
+    private String qcFiledValue;
+
+    @Column(name = "QC_FAIL_MAX_COUNT")
+    @ApiParam("缺陷连续不合格预警次数")
+    private String qcFailMaxCount;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@ -200,6 +200,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
    @ApiParam("等级名称")
    private String gradeName;

+    @Transient
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
    public double getQueueSeqVal() {
        return this.queueSeq == null ? 0.0d : this.queueSeq;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
+++ b/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;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@ -183,6 +183,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
    @ApiParam("父阶物料号")
    private String parentPartNo;

+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
    @Version
    @Column(name = "LOCK_VERSION")
    @ApiParam(value = "乐观锁", example = "1")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/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
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java
@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDbCheckRecord;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/14
+ * @Author: simon.song
+ */
+public interface MesDbCheckRecordRepository extends BaseRepository<MesDbCheckRecord, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java
@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDbDataCheck;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/14
+ * @Author: simon.song
+ */
+public interface MesDbDataCheckRepository extends BaseRepository<MesDbDataCheck, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@ -169,6 +169,12 @@ public class MesPcnHqlPack {
        if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPrintStatus()) && mesWorkOrder.getPrintStatus() != 0) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getPrintStatus(), "printStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
+        }
        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) {
            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
        } else {
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;

 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -66,6 +67,15 @@ public class BsSuitCaseFTP extends BaseBean {
    @ApiParam(value = "ftp编码")
    private Integer encode;

+    @Column(name = "CONNECTION_MODE")
+    @ApiParam(value = "ftp连接模式")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class)
+    private Integer connectionMode;
+
+    public String getConnectionModeTxt(){
+        return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode);
+    }
+
    @Column(name = "IS_READ_AND_EMPTY")
    @ApiParam(value = "读取并清空")
    private Integer isReadAndEmpty;
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
@ -138,6 +138,10 @@ public class BsSuitRecord extends BaseBean {
    @ApiParam(value = "脚本结果")
    private String scriptResult;

+    @Column(name = "PROCESS_RESULT")
+    @ApiParam(value = "处理结果")
+    private String processResult;
+
    /************************************** 临时属性 ***************************************/

    @Transient
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
    @ApiParam(value = "重量")
    private Double weight;

+    @Column(name = "VEN_PRODUCT_TIME")
+    @ApiParam(value = "供应商生产日期")
+    private String venProductTime;
+
    @Transient
    @ApiParam(value = "合同号")
    private String refNo;
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean {

    @Column(name = "COUNT_DATE")
    @ApiParam("日期")
-    private Double countDate;
+    private String countDate;
+
+    @Column(name = "REQUEST_QTY")
+    @ApiParam("需求数量")
+    private String requestQty;

    @Transient
    @ApiParam("日期")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java
@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean {
    @ApiParam("周")
    private String countWeek;

+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
    @Transient
    @ApiParam("日期")
    private String dateStart;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@ -251,7 +251,7 @@ public class WmsDocMovementMaster extends BaseBean {

    /**备注3**/
    @Column(name = "THIRD_REMAKE")
-    @ApiParam(value = "客户类型")
+    @ApiParam(value = "财务类型")
    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue")
    private String thirdRemake;
@ -334,6 +334,10 @@ public class WmsDocMovementMaster extends BaseBean {
    @ApiParam(value = "电话号码")
    private String custTel;

+    @Transient
+    @ApiParam(value = "过滤业务类型")
+    private String filterBusiType;
+
    public int getOrderStatusVal() {
        return this.orderStatus == null ? 0 : this.orderStatus;
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@ -524,6 +524,10 @@ public class WmsStockSn extends BaseBean {
    @ApiParam("数量检查")
    private Integer checkQyt;

+    @Transient
+    @ApiParam("数量总和")
+    private Double sumQty;
+
    public WmsStockSn() {
    }

@ -854,5 +858,11 @@ public class WmsStockSn extends BaseBean {
        this.organizeCode = organizeCode;
    }

-
+    public WmsStockSn(WmsStockSn wmsStockSn, Double sumQty) {
+        this.partNo = wmsStockSn.getPartNo();
+        this.vendorNo = wmsStockSn.getVendorNo();
+        this.unit = wmsStockSn.getUnit();
+        this.partNameRdd = wmsStockSn.getPartNameRdd();
+        this.sumQty = sumQty;
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -218,10 +218,18 @@ public class WmsHqlPack {
    public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
        DdlPackBean packBean = new DdlPackBean();

-        //查询参数封装
+        //查询参数封装PROD_SCRAP
        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
+        //滤掉业务类型
+        if (!StringUtil.isEmpty(wmsDocMovementMaster.getFilterBusiType())) {
+            List<Integer> filterBusiType = new ArrayList<>();
+            for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) {
+                filterBusiType.add(Integer.parseInt(busiType));
+            }
+            DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", System.currentTimeMillis() + "", packBean);
+        }
        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
        DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
        DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean);
@ -1658,6 +1666,7 @@ public class WmsHqlPack {
        DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result);
        DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
        DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsPoSn.getItem(), "item", result);
        DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);
        DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);