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

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Description : 人员model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class AndonUserModel extends BaseBean {
+
+    @ApiParam(value ="部门名称")
+    private String departmentNameRdd;
+
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="员工编号")
+    private String userEmpNo;
+
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -159,13 +159,6 @@ public class Pager {
     }
 
     public int getEndRow() {
-        if(pageSize > 0){
-            if(currentPage > 1){
-                return currentPage * pageSize;
-            }else {
-                return pageSize;
-            }
-        }
         return endRow;
     }
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

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

@@ -918,4 +918,147 @@ public class BlockSoftSwitchEnumUtil {
 
     }
 
+    /**
+     * 脚本类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SCRIPT_TYPE {
+        MESSAGE_PROCESS(10, "报文处理","可用参数:transData,orginData");
+
+        private int value;
+        private String description;
+        private String scriptRule;
+
+        private BS_SCRIPT_TYPE (int value, String description,String scriptRule) {
+            this.value = value;
+            this.description = description;
+            this.scriptRule = scriptRule;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+        public String getScriptRule() {
+            return scriptRule;
+        }
+
+        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 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];
+                }
+            }
+            return null;
+        }
+
+    }
+
+    /**
+     * 脚本语言
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SCRIPT_LANGUAGE {
+//        SPEL(10, "Spring表达式语言(SpEL)"),
+        JAVASCRIPT(20, "JavaScript(JS)");
+
+        private int value;
+        private String description;
+
+        private BS_SCRIPT_LANGUAGE (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 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];
+                }
+            }
+            return null;
+        }
+
+    }
+
+    /**
+     * 脚本执行方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SCRIPT_EXECUTE_METHOD {
+        EXECUTE_SCRIPT(10, "执行脚本"),
+        EXECUTE_METHOD(20, "执行方法"),
+        EXECUTE_OBJECT_METHOD(30, "执行对象方法");
+
+        private int value;
+        private String description;
+
+        private BS_SCRIPT_EXECUTE_METHOD (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 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];
+                }
+            }
+            return null;
+        }
+
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 
 /**
  * @Description :
@@ -1573,7 +1574,7 @@ public class CommonEnumUtil {
         BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null),
-        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss");
+        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss");
 
         /**
          * 属性类型值
@@ -1911,6 +1912,19 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public String getJDBCUrl(String database,String host,Integer port,String instanceName){
+            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
+                return getJDBCUrlMySQL(database,host,port);
+            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
+                return getJDBCUrlOracle(database,host,port);
+            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
+                return getJDBCUrlPostgreSQL(database,host,port);
+            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
+                return getJDBCUrlSQLServer(database,host,port,instanceName);
+            }
+            return null;
+        }
+
         public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
             if(StringUtils.isNotBlank(databaseProductName)){
                 if(databaseProductName.indexOf(":mysql:") != -1){
@@ -1941,6 +1955,22 @@ public class CommonEnumUtil {
         private String getJDBCUrlSQLServer(String database,String host,Integer port){
             return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
+
+        private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
+            StringBuffer sb = new StringBuffer();
+            sb.append("jdbc:sqlserver://").append(host);
+            // 实例
+            if (StringUtils.isNotBlank(instanceName)) {
+                sb.append("\\").append(instanceName);
+            }
+            //  端口
+            sb.append(":").append(port);
+            // 数据库
+            sb.append(";database=").append(database);
+            // 自动重连
+            sb.append(";autoReconnect=true");
+            return sb.toString();
+        }
     }
 
     /**
@@ -2528,4 +2558,52 @@ public class CommonEnumUtil {
     public enum DYNAMIC_DATA_SOURCE_TYPE {
         MASTER,NODE
     }
+
+    /**
+     * 会话模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SESSION_MODE {
+        DEFAULT(10, "默认"),
+        OVERWRITE(20, "覆盖"),
+        SEIZE(30, "抢占");
+
+        private int value;
+        private String description;
+
+        SESSION_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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 Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -1331,4 +1331,49 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 用户定制化配置类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_CUSTOMIZE_CONFIG_TYPE {
+        WEB_TABLE_SHOW_COL(10, "前端表格显示列");
+
+        private int value;
+        private String description;
+
+        USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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 Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -1968,7 +1968,9 @@ public class MesEnumUtil {
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
         MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
         BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
-        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入");
+        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"),
+        MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"),
+        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入");
 
         private int value;
         private String service;
@@ -2339,7 +2341,8 @@ public class MesEnumUtil {
     public enum MES_WORK_CELL_TYPE {
 
         NORMAL(10, "正常"),
-        REWORK(20, "返修");
+        REWORK(20, "返修"),
+        ON_LINE(30, "上线工位");
 
         private int value;
         private String description;

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

@@ -797,7 +797,8 @@ public class MesPcnEnumUtil {
     public enum MES_WORK_CELL_TYPE {
 
         NORMAL(10, "正常"),
-        REWORK(20, "返修");
+        REWORK(20, "返修"),
+        ON_LINE(30, "上线工位");
 
         private int value;
         private String description;
@@ -4066,7 +4067,8 @@ public class MesPcnEnumUtil {
         JUMP_STEP(20, "跳过工步"),
         JUMP_STATE(30, "跳过状态点"),
         ABNORMAL_DEDUCTION(40, "扣减异常"),
-        REDO_STATION(50, "工位重做");
+        REDO_STATION(50, "工位重做"),
+        RELEASE(60, "放行继续");
 
         private int value;
         private String description;
@@ -4378,6 +4380,16 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
+        public static int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -4642,8 +4654,92 @@ public class MesPcnEnumUtil {
         public int getValue() {
             return value;
         }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GET_AND_SET {
+        GET(10, "get"),
+        SET(20, "set");
+
+        private int value;
+        private String description;
+
+        GET_AND_SET(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_BUSI_TYPE {
+        AGV_EMERGENCY_STOP(10, "紧急停止"),
+        AGV_EMERGENCY_RESET(20, "急停复位"),
+        AGV_DELAY_HELP(30, "延时帮助");
+
+        private int value;
+        private String description;
+
+        PLC_BUSI_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
+    /**
+     * mes设备状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQUIPMENT_STATUS {
+
+        INUSE(10, "在用"),
+        SPARE(20, "停止"),
+        FAULT(30, "故障"),
+        SERVICE(40, "检修"),
+        STOPUSING(50, "暂停");
+
+        private int value;
+        private String description;
+
+        MES_EQUIPMENT_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;
         }
 
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

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

@@ -363,7 +363,7 @@ public class WmsEnumUtil {
     public enum REC_STATUS_KANBAN {
         TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
         RECEIVING(20, "RECEIVING", "收货中"),
-        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
+        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟"),
         COMPLETED(40, "COMPLETED", "已完成");
 
         private int value;
@@ -1776,6 +1776,7 @@ public class WmsEnumUtil {
     public enum QC_STATUS {
         INSPECTION_FREE(10, "免检"),
         PENDING_QUALITY_INSPECTION(20, "待质检"),
+        DELAYED_NON_QC(40, "延迟"),
         QUALITY_INSPECTION_COMPLETED(30, "质检完成");
 
         private int value;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -61,6 +61,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     public void detachObject(T t){
+        if (t == null) {
+            return;
+        }
         entityManager.detach(t);
     }
 

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_STATUS")
+@Api("工位运行状态")
+public class MesWorkCellStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 102975351699481524L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TIME_OUT_STATUS")
+    @ApiParam("超时状态")
+    private Integer timeOutStatus;
+
+
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellStatusRepository extends BaseRepository<MesWorkCellStatus, Long> {
+}

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

@@ -65,7 +65,7 @@ public class IfDefectData extends BaseBean implements Serializable {
 
     @Column(name = "DEFECT_ACTION_TYPE")
     @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    private String defectActionType;
 
     @Column(name = "QTY")
     @ApiParam("数量")

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

@@ -131,4 +131,12 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "CUSTOMER_CODE")
     @ApiParam("客户代码")
     private String customerCode;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus = 10;
 }

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

@@ -72,6 +72,10 @@ public class MesCellFeed extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     @Transient
     @ApiParam(value = "原料类型名称")
     private String rawTypeName;

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

@@ -71,6 +71,10 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }

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

@@ -61,6 +61,10 @@ public class MesDefect extends BaseBean implements Serializable {
     private String defectLocation;
 
     @Transient
+    @ApiParam("颜色值")
+    private String colorValue;
+
+    @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
     public MesDefect() {

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

@@ -82,7 +82,11 @@ public class MesDefectRecord extends BaseBean implements Serializable {
 
     @Column(name = "DEFECT_ACTION_TYPE")
     @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    private String defectActionType;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
 
     @Transient
     private List<MesDefect> mesDefectList;

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

@@ -0,0 +1,98 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQUIPMENT_TRAVEL")
+@Api("设备运行履历表")
+public class MesEquipmentTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -419342647505833190L;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name = "STATUS")
+    @ApiParam("设备状态")
+    private Integer status;
+
+    @Column(name = "EQUIPMENT_TYPE")
+    @ApiParam("设备类型")
+    private Integer equipmentType;
+
+    @Column(name = "EQUIPMENT_CATEGORY")
+    @ApiParam("设备类别")
+    private String equipmentCategory;
+
+    @Column(name = "EQUIPMENT_MODEL")
+    @ApiParam("型号")
+    private String equipmentModel;
+
+    @Column(name = "EQUIPMENT_SPEC")
+    @ApiParam("规格")
+    private String equipmentSpec;
+
+    @Column(name = "EQUIPMENT_MAKER")
+    @ApiParam("制造商")
+    private String equipmentMaker;
+
+    @Column(name = "RELEASE_DATE")
+    @ApiParam("出厂日期")
+    private String releaseDate;
+
+    @Column(name = "RECEIVE_DATE")
+    @ApiParam("接收日期")
+    private String receiveDate;
+
+    @Column(name = "ENABLE_DATE")
+    @ApiParam("启用日期")
+    private String enableDate;
+
+    @Column(name = "CONNECT_TYPE")
+    @ApiParam("连接类型")
+    private Integer connectType;
+
+    @Column(name = "CHECK_MODEL")
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
+    @Column(name = "STATUS_START_TIME")
+    @ApiParam("状态开始时间")
+    private String statusStartTime;
+
+    @Column(name = "STATUS_END_TIME")
+    @ApiParam("状态结束时间")
+    private String statusEndTime;
+
+}

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

@@ -0,0 +1,50 @@
+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;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/8/3 17:51
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_HNC_AGV_RUNNING")
+@Api("延锋海纳川agv运行状态表")
+public class MesHncAgvRunning extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4293079676019967513L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TIME_OUT")
+    @ApiParam("倒计时超时")
+    private Integer timeOut;
+
+    @Column(name = "DELAY_HELP")
+    @ApiParam("延时帮助")
+    private Integer delayHelp;
+
+    @Column(name = "EMERGENCY_STOP")
+    @ApiParam("紧急停止")
+    private Integer emergencyStop;
+}

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

@@ -0,0 +1,61 @@
+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_库位信息
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_LOCATION")
+@Api("MES_库位信息")
+public class MesLocation extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -896118285166769048L;
+    @Column(name = "LOCATION_CODE")
+    @ApiParam("库位代码")
+    private String locationCode;
+
+    @Column(name = "LOCATION_NAME")
+    @ApiParam("库位名称")
+    private String locationName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty = 0d;
+
+    @Column(name = "MAX_QTY")
+    @ApiParam("最大存储量")
+    private Integer maxQty = 0;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+}

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

@@ -0,0 +1,35 @@
+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 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;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "MES_LOG")
+@Api("MES_日志表")
+public class MesLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4089347882308864216L;
+
+    @Column(name = "METHOD_NAME")
+    @ApiParam(value = "方法名")
+    private String methodName;
+
+    @Column(name = "LOG")
+    @ApiParam(value = "日志")
+    private String log;
+
+    @Column(name = "RESULT")
+    @ApiParam(value = "更新结果")
+    private String result;
+}

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

@@ -132,6 +132,14 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装二维码")
     private String qrCode;
 
+    @Column(name = "LOCATION_CODE")
+    @ApiParam("库位代码")
+    private String locationCode;
+
+    @Transient
+    @ApiParam("目标库位代码")
+    private String destLocationCode;
+
     public MesPackage() {
     }
 

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

@@ -86,6 +86,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("PLC配置")
     private String plcCfg;
 
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    private Integer busiType;
+
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

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

@@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
     private String prodCfgTypeName;
+
+    @Column(name = "PCT_VERSION")
+    @ApiParam("项目版本")
+    private String pctVersion;
+
+    @Column(name = "DWG_VERSION")
+    @ApiParam("图纸版本")
+    private String dwgVersion;
 }

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

@@ -44,9 +44,9 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @ApiParam("是否默认")
     private Integer isDefault;
 
-    @Column(name = "PART_SN")
-    @ApiParam("料箱条码")
-    private String partSn;
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
 
     @Column(name = "TARGET_PASS_RATE")
     @ApiParam("目标合格率")
@@ -55,4 +55,7 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @Column(name = "PRIORITY_ORDER")
     @ApiParam("优先级顺序")
     private Integer priorityOder = 0;
+
+    @ApiParam("物料名称")
+    private String partName;
 }

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

@@ -148,6 +148,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("生产批次")
     private String lotNo;
 
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -126,6 +126,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("托盘号")
     private String trayNo;
 
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
     @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;

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

@@ -11,6 +11,7 @@ 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;
 
 /**
@@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @Column(name = "OPTION_TYPE")
     @ApiParam("选配类型")
     private Integer optionType;
+
+    @Transient
+    @ApiParam("物料类型3")
+    private String categoryCode3;
 }

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

@@ -180,6 +180,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @Transient
+    @ApiParam("等级名称")
+    private String gradeName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -207,7 +215,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
                                Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
-                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,
+                               String gradeCode,String assyNo,Integer queueType) {
         this.orderNo = orderNo;
         this.vinCode = vinCode;
         this.partNo = partNo;
@@ -224,5 +233,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.produceColor = produceColor;
         this.gradeCode = gradeCode;
         this.assyNo = assyNo;
+        this.queueType = queueType;
     }
 }

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

@@ -85,4 +85,8 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
     @Column(name = "RECIPE_SEQ")
     @ApiParam("配方序号")
     private String recipeSeq;
+
+    @Column(name = "CHANGE_NO")
+    @ApiParam("change No")
+    private String changeNo;
 }

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

@@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable {
     @ApiParam("工步对象")
     private String stepObject;
 
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
     /**
      * 工位扫描业务所需使用字段
      */

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

@@ -69,6 +69,10 @@ public class MesStepParam extends BaseBean implements Serializable {
     @ApiParam("type")
     private Integer type = 0;
 
+    @Column(name = "OBJECT_WHERE")
+    @ApiParam("参数对象查询条件")
+    private String objectWhere;
+
     @Transient
     @ApiParam("可选值的数据")
     private List<Map<String, Object>> enumList;

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

@@ -45,4 +45,8 @@ public class MesTypeCfg extends BaseBean implements Serializable {
     @Column(name = "BUSINESS_TYPE_NAME")
     @ApiParam("业务类型名称")
     private String businessTypeName;
+
+    @Column(name = "COLOR_VALUE")
+    @ApiParam("颜色值")
+    private String colorValue;
 }

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

@@ -67,7 +67,7 @@ public class MesWorkCell extends BaseBean implements Serializable {
     private String workCellPort;
 
     @Column(name = "GRADE")
-    @ApiParam("工作等级")
+    @ApiParam("工位等级")
     private Integer grade;
 
     @Column(name = "TARGET_PASS_RATE")

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.bean.template;
+package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
@@ -47,6 +47,14 @@ public class MesWorkCellDefect extends BaseBean implements Serializable {
     @ApiParam("物料集")
     private String partAssemble;
 
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "DEFECT_TYPE")
+    @ApiParam("缺陷类型")
+    private String defectType;
+
     @Transient
     @ApiParam("缺陷名称")
     private String defectCodeName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.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.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_STATUS")
+@Api("工位运行状态")
+public class MesWorkCellStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 102975351699481524L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TIME_OUT_STATUS")
+    @ApiParam("超时状态")
+    private Integer timeOutStatus;
+
+
+}

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

@@ -290,6 +290,62 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("客户集合")
     private List<String> custList;
 
+    @Transient
+    @ApiParam("工位完成数量")
+    private Integer stationCompleteQty = 0;
+
+    @Transient
+    @ApiParam("客户物料号")
+    private String customerPartNo;
+
+    @Transient
+    @ApiParam("客户物料名称")
+    private String customerPartName;
+
+    @Transient
+    @ApiParam("客户物料颜色")
+    private String customerPartColor;
+
+    @Transient
+    @ApiParam("项目名称")
+    private String prodCfgTypeName;
+
+    @Transient
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @Transient
+    @ApiParam("挂架数")
+    private Integer shelvesAmount;
+
+    @Transient
+    @ApiParam("供漆罐代码")
+    private String paintTankCode;
+
+    @Transient
+    @ApiParam("计划报表标识")
+    private String reportFormCode;
+
+    @Transient
+    @ApiParam("一检数量")
+    private Integer firstInspectionQty;
+
+    @Transient
+    @ApiParam("二检数量")
+    private Integer secondInspectionQty;
+
+    @Transient
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @Transient
+    @ApiParam(value = "子零件数量", example = "0")
+    private Double itemQty = 0d;
+
+    @Transient
+    @ApiParam(value = "子零件总数", example = "0")
+    private Double itemQtyCount = 0d;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -322,4 +378,17 @@ public class MesWorkOrder extends BaseBean implements Serializable {
         return this.approvalStatus == null ? 0 : this.approvalStatus;
     }
 
+    public MesWorkOrder(){}
+
+    public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty,
+                        String partNo,String partNameRdd,String itemPartNo,Double itemQty){
+        this.orderNo = orderNo;
+        this.startTime = startTime;
+        this.workCenterCode = workCenterCode;
+        this.qty = qty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.itemPartNo = itemPartNo;
+        this.itemQty = itemQty;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java

@@ -10,7 +10,8 @@ public class MesInterfaceEnumUtil {
         WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
         WMS2MES(40, "WMS2MES", "WMS --> MES"),
-        MES2SAP(50, "MES2SAP", "MES --> SAP");
+        MES2SAP(50, "MES2SAP", "MES --> SAP"),
+        SAP2MES(60, "SAP2MES", "SAP --> MES");
 
         private int value;
         private String name;

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -13,7 +14,7 @@ import java.util.Map;
  * @Modify:
  */
 @Data
-public class BiModel {
+public class BiModel implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
@@ -30,7 +31,7 @@ public class BiModel {
     private String partName;
 
     @ApiParam(value = "计划数量")
-    private double planQty;
+    private double planQty = 0;
 
     @ApiParam(value = "合格数量")
     private double passQty = 0;
@@ -92,6 +93,11 @@ public class BiModel {
     @ApiParam("末检")
     private Integer endCheck;//首件、30中件、40末件
 
+    private double qty;
+
+    @ApiParam("比率")
+    private double rate;
+
     @ApiParam("x坐标内容")
     private List<String> xAxis;
 
@@ -103,4 +109,11 @@ public class BiModel {
 
     @ApiParam("列名")
     private Map<String, String> colMap;
+
+    public BiModel() {}
+
+    public BiModel(Double qty, String partNo) {
+        this.qty = qty;
+        this.partNo = partNo;
+    }
 }

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

@@ -31,4 +31,10 @@ public class DataReviewModel {
     @ApiParam("是否合格")
     private String reviewResult;
 
+    @ApiParam("关键件颜色")
+    private String keyPartColor;
+
+    @ApiParam("生产数据颜色")
+    private String prodDataColor;
+
 }

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("海纳川数据复核model")
+public class HncDataReviewModel {
+
+    @ApiParam("关键件")
+    private String itemPartNo;
+
+    @ApiParam("关键件名称")
+    private String itemPartName;
+
+    @ApiParam("需要数量")
+    private String needNum;
+
+    @ApiParam("实际数量")
+    private String realNum;
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("是否合格标识")
+    private Integer reviewFlag;
+
+    @ApiParam("是否合格")
+    private String reviewResult;
+
+    @ApiParam("关键件颜色")
+    private String keyPartColor;
+
+    @ApiParam("生产数据颜色")
+    private String prodDataColor;
+
+}

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc TJ注塑上料展示组件顶部数据集合model
+ */
+@Data
+public class InjectionFeedingDetailModel {
+
+    @ApiParam("是否选中：1=是，2=否")
+    private Integer isCheck = 2;
+
+    @ApiParam("机台编号")
+    private String workCenterCode;
+
+    @ApiParam("机台名称")
+    private String workCenterName;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @ApiParam("工单状态名称")
+    private String workOrderStatusName;
+
+    @ApiParam("工单计划数量")
+    private String qty;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("错误信息")
+    private String error;
+
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc TJ注塑上料展示组件顶部数据model
+ */
+@Data
+public class InjectionFeedingModel {
+
+    @ApiParam("料箱")
+    private String rackNo;
+
+    @ApiParam("原材料物料号")
+    private String partNo;
+
+    @ApiParam("是否锁定：1=是，2=否")
+    private Integer lockFlag;
+
+    @ApiParam("机台工单集合")
+    private List<InjectionFeedingDetailModel> detailModelList = new ArrayList<>();
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}

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

@@ -45,6 +45,12 @@ public class InjectionProductionControlModel {
     @ApiParam("箱条码状态")
     private String printStatusName;
 
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
     @ApiParam("序号")
     private Integer index;
 

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

@@ -1,22 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-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.util.List;
 
 /**
  * @Description : 设备任务通知人员model
@@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean {
     @ApiParam(value ="账户ID")
     private Long userInfoId;
 
-    @Column(name="USER_NAME_RDD")
     @ApiParam(value ="用户名称" , access ="账号名称")
     private String userName;
 
-    @Column(name="USER_LOGIN_NAME")
     @ApiParam(value ="登陆名称" , access ="登陆名称")
     private String userLoginName;
 
-    @Column(name="USER_EMAIL")
     @ApiParam(value ="邮箱" , access ="邮箱")
     private String userEmail;
 
-    @Column(name="USER_PHONE")
     @ApiParam(value ="手机号" , access ="手机号")
     private String userPhone;
 
-    @Column(name="USER_STATUS")
     @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
     private Integer userStatus;
 

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

@@ -32,6 +32,10 @@ public class PlcEquStatusModel implements Serializable {
     @ApiParam("产线状态")
     private Integer workCenterStatus;
 
+    // 电检设备切换密码
+    @ApiParam("电检设备切换密码")
+    private String equChoosePassWard;
+
     @ApiParam("停机类型")
     private Integer stopType;
 

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

@@ -91,6 +91,12 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("产品位置")
     private String produceCategoryCode;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     public QueueOrderModel() {
     }
 
@@ -221,6 +227,51 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
     }
 
+    //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) {
+        this.serialNumber = serialNumber;
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
+        this.orderNo = orderNo;
+        this.pptCode = pptCode;
+        this.produceCategoryCode = produceCategoryCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
+    }
+
+    //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) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+        this.orderNo = orderNo;
+        this.serialNumber = serialNumber;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
+    }
+
     //getAlreadyQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {

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

@@ -27,9 +27,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("扫描信息")
     private String scanInfo;
 
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @ApiParam("产品条码")
+    private String productSn;
+
     @ApiParam("物料号")
     private String partNo;
 
@@ -180,6 +183,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("班次名称")
     private String shiftName;
 
+    @ApiParam("创建时间")
+    private String createDatetime;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -82,11 +82,15 @@ public class StepModel implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
     public StepModel() {
     }
 
     public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
-                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName,
+                     String workCellCode, Integer triggerType) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -98,5 +102,6 @@ public class StepModel implements Serializable {
         this.paramCode = paramCode;
         this.stepDisplayName = stepDisplayName;
         this.workCellCode = workCellCode;
+        this.triggerType = triggerType;
     }
 }

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

@@ -108,4 +108,21 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("产品配置名称")
     private String prodCfgCodeName;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+    @ApiParam("结果")
+    private String result;
+    @ApiParam("项目版本")
+    private String pctVersion;
+    @ApiParam("图纸版本")
+    private String dwgVersion;
+    @ApiParam("班次名称")
+    private String shiftName;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+    @ApiParam("产品位置名称")
+    private String produceCategoryName;
+
 }

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class TorqueReviewModel {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("枪类型")
+    private String gunType;
+
+    @ApiParam("检测结果")
+    private String checkResult;
+
+    @ApiParam("显示颜色")
+    private String showColor;
+
+}

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

@@ -70,4 +70,8 @@ public class ZzMesWorkOrderModel extends BaseBean {
     @AnnoOutputColumn(required = false)
     private String mouldCodeList;
 
+    @ApiParam("工作中心名称")
+    @AnnoOutputColumn(required = false)
+    private String workCenterName;
+
 }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :设备运行履历
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEquipmentTravelRepository extends BaseRepository<MesEquipmentTravel, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.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.MesHncAgvRunning;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/8/3 17:54
+ * @desc
+ */
+public interface MesHncAgvRunningRepository extends BaseRepository<MesHncAgvRunning, Long> {
+}

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

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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.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.MesLog;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesLogRepository extends BaseRepository<MesLog, Long> {
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import org.springframework.stereotype.Repository;
 /**
  * @Description:

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.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.MesWorkCellStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellStatusRepository extends BaseRepository<MesWorkCellStatus, Long> {
+}

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

@@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
-import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -205,6 +205,7 @@ public class MesHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
+        DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         return packBean;
     }
@@ -282,7 +283,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
         if (!StringUtils.isEmpty(mesArea.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesArea.getAreaCode(), "areaCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesArea.getAreaName())) {
+            DdlPreparedPack.getStringLikerPack(mesArea.getAreaName(), "areaName", packBean);
         }
 
         return packBean;
@@ -325,6 +329,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean);
+        }
 
         return packBean;
     }
@@ -1198,7 +1205,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode);
         if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(workCellPoint.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCenterCode(), "workCenterCode", packBean);
         }
         return packBean;
     }
@@ -1900,6 +1910,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
             DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean);
         }
+        if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
+            DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean);
+        }
         return packBean;
     }
 
@@ -1999,6 +2012,9 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
+        }
         if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
@@ -2193,6 +2209,9 @@ public class MesHqlPack {
         if (mesProduceSnTravel.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean);
+        }
         if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
             DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
         }
@@ -3155,6 +3174,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
+        }
         if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
             DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
         }

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

@@ -221,6 +221,7 @@ public class MesPcnHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
         return packBean;
     }
 
@@ -667,4 +668,25 @@ public class MesPcnHqlPack {
 
         return packBean;
     }
+
+    /**
+     * 产品工作中心配置
+     *
+     * @param prodWorkCenter
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
+        if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -142,6 +142,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("防错码")
     private String pokeYokeFix;
 
+    @ApiParam("防错码长度")
+    private String pokeYokeLength;
+
     private Map<String, PsetModel> psets = new LinkedHashMap<>();
 
     public TorqueCollectionModel(String vinCode) {
@@ -167,7 +170,7 @@ public class TorqueCollectionModel implements Serializable {
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
                                  String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
                                  Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount,
-                                 String pokeYokeFix) {
+                                 String pokeYokeFix, String pokeYokeLength) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -183,6 +186,7 @@ public class TorqueCollectionModel implements Serializable {
         this.isPf = isPf;
         this.qualifiedCount = qualifiedCount;
         this.pokeYokeFix = pokeYokeFix;
+        this.pokeYokeLength = pokeYokeLength;
     }
 
     /**
@@ -207,7 +211,7 @@ public class TorqueCollectionModel implements Serializable {
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
                                  String colorCode, String partNo, String partName, Integer pset1, Integer pset2,
                                  Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8,
-                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) {
+                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix, String pokeYokeLength) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -226,6 +230,7 @@ public class TorqueCollectionModel implements Serializable {
         this.sendSeq = sendSeq;
         this.checkScanCount = checkScanCount;
         this.pokeYokeFix = pokeYokeFix;
+        this.pokeYokeLength = pokeYokeLength;
         assemblePsets();
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -105,6 +105,8 @@ public class SuitClientModel implements Serializable {
     @XStreamCDATA
     private Object suitResultMessage;
 
+    private boolean isNeedRetry = false;
+
     public SuitClientModel() {
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -21,6 +21,7 @@ public class WmsJobParamModel implements Serializable {
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
     private Integer minuteDiff;//处理周期(分钟)
+    private String whereHql;//业务查询条件HQL
 
     public int getMinuteDiffVal() {
         return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -72,6 +72,12 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "工厂代码")
     public String organizeCode;
 
+    @ApiParam(value = "是否展示删除按钮")
+    public Integer isShowDeleteButton;
+
+    @ApiParam(value = "跳转后端请求")
+    public String actionUrl;
+
     public WmsTaskInfoModel() {
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java

@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-08-10 15:13
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_CUSTOMIZE_CONFIG")
+@ApiModel(value="用户定制化配置",description = "用户定制化配置")
+public class SysUserCustomizeConfig extends BaseBean {
+
+    private static final long serialVersionUID = -3757585990009089233L;
+
+    @Column(name="USER_ID")
+    @ApiModelProperty(value ="用户id" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name="CUSTOMIZE_CONFIG_TYPE")
+    @ApiModelProperty(value ="定制化配置类型" , example = "-1")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.class)
+    private Integer customizeConfigType;
+
+    public String getCustomizeConfigTypeTxt() {
+        return customizeConfigType == null ? "无" : ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.valueOf(customizeConfigType);
+    }
+
+    @Column(name="CONFIG_KEY")
+    @ApiModelProperty(value ="定制化配置类型" , example = "-1")
+    private String configKey;
+
+    @Column(name="CONFIG_VALUE")
+    @ApiModelProperty(value ="配置值" , example = "-1")
+    private String configValue;
+
+    public String getRedisKey(String keyPrefix) {
+        String redisKey = this.getUserId() + ":" + this.getCustomizeConfigType() + ":" + this.getConfigKey();
+        if (StringUtils.isNotBlank(keyPrefix)) {
+            return keyPrefix + ":" + redisKey;
+        } else {
+            return redisKey;
+        }
+    }
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserCustomizeConfig;
+
+/**
+ * @Description : 用户定制化配置
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-08-10 15:34
+ * @Modify:
+ **/
+public interface SysUserCustomizeConfigRepository extends BaseRepository<SysUserCustomizeConfig, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -345,8 +345,8 @@ public class CoreHqlPack {
     public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) {
         DdlPackBean result = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result);
         DdlPreparedPack.getStringEqualPack(role.getName(), "name", result);
-        DdlPreparedPack.getNumEqualPack(role.getId(), "id", result);
         return result;
     }
 
@@ -1149,4 +1149,24 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+    public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
+
+        DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
+
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.ptl.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;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_LOG")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_LOG")
+public class PtlLog extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3885987217528730391L;
+
+    @Column(name = "METHOD_NAME")
+    @ApiParam(value = "方法名")
+    private String methodName;
+
+    @Column(name = "EXCEPTION_LOG")
+    @ApiParam(value = "异常日志")
+    private String exceptionLog;
+
+    @Column(name = "CONTROL_CODE")
+    @ApiParam(value = "控制器")
+    private String controlCode;
+
+    @Column(name = "IP")
+    @ApiParam(value = "IP")
+    private String ip;
+
+    @Column(name = "AREA_NO")
+    @ApiParam(value = "区域")
+    private String areaNo;
+
+    @Column(name = "SECTION_CODE")
+    @ApiParam(value = "区段")
+    private String sectionCode;
+
+    @Column(name = "TAG_NO")
+    @ApiParam(value = "标签地址")
+    private Integer tagNo;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlLog;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlLogRepository extends BaseRepository<PtlLog, Long> {
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java

@@ -0,0 +1,107 @@
+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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 业务脚本
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-07-28 14:35
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_BUSI_SCRIPT")
+@ApiModel(value = "业务脚本", description = "业务脚本")
+public class BsBusiScript extends BaseBean {
+
+    private static final long serialVersionUID = 1419277265159912600L;
+
+    @Column(name = "SCRIPT_NAME")
+    @ApiModelProperty(value = "脚本名称")
+    private String scriptName;
+
+    @Column(name = "SCRIPT_CODE")
+    @ApiModelProperty(value = "脚本代码")
+    private String scriptCode;
+
+    @Column(name = "SCRIPT_TYPE")
+    @ApiModelProperty(value = "脚本类型")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.class)
+    private Integer scriptType;
+
+    public String getScriptTypeTxt() {
+        return scriptType == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.valueOfDescription(scriptType);
+    }
+
+    @Column(name = "SCRIPT_LANGUAGE")
+    @ApiModelProperty(value = "脚本语言")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.class)
+    private Integer scriptLanguage;
+
+    public String getScriptLanguageTxt() {
+        return scriptLanguage == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.valueOfDescription(scriptLanguage);
+    }
+
+    @Column(name = "SCRIPT_EXECUTE_METHOD")
+    @ApiModelProperty(value = "脚本执行方式")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.class)
+    private Integer scriptExecuteMethod;
+
+    public String getScriptExecuteMethodTxt() {
+        return scriptExecuteMethod == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.valueOfDescription(scriptExecuteMethod);
+    }
+
+    @Column(name = "SCRIPT_OBJ_NAME")
+    @ApiModelProperty(value = "脚本对象名称")
+    private String scriptObjName;
+
+    @Column(name = "SCRIPT_METHOD_NAME")
+    @ApiModelProperty(value = "脚本方法名称")
+    private String scriptMethodName;
+
+    @Column(name = "SCRIPT_CONTENT")
+    @ApiModelProperty(value = "脚本内容")
+    private String scriptContent;
+
+    @Column(name = "SCRIPT_DESC")
+    @ApiModelProperty(value = "脚本描述")
+    private String scriptDesc;
+
+    @Column(name = "REF_ID")
+    @ApiModelProperty(value = "关联id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long refId;
+
+    @Column(name = "SCRIPT_VERSION")
+    @ApiModelProperty(value = "脚本版本")
+    private Integer scriptVersion;
+
+    public int getScriptVersion(){
+        return scriptVersion == null ? NumberUtils.INTEGER_ONE : scriptVersion;
+    }
+
+    public BsBusiScript nextVersion() {
+        setScriptVersion(getScriptVersion() + 1);
+        return this;
+    }
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java

@@ -52,6 +52,10 @@ public class BsDataSource extends BaseBean {
     @ApiParam(value = "数据源端口")
     private Integer dataSourcePort;
 
+    @Column(name = "DATA_SOURCE_INSTANCE_NAME")
+    @ApiParam(value = "数据源实例名称")
+    private String dataSourceInstanceName;
+
     @Column(name = "DATA_SOURCE_USER")
     @ApiParam(value = "用户名")
     private String dataSourceUser;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java

@@ -3,6 +3,8 @@ 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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,6 +36,7 @@ public class BsLongData extends BaseBean {
     private static final long serialVersionUID = -329128754646765129L;
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long refId;
 
     @Column(name = "REF_DATA_TYPE")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -1,5 +1,6 @@
 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;
@@ -40,6 +41,7 @@ public class BsSuitCase extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     public int getCaseTypeIdVal(){
@@ -76,6 +78,7 @@ public class BsSuitCase extends BaseBean {
 
     @Column(name = "SUIT_MODE_ID")
     @ApiParam(value = "适配模式(枚举,主动，被动)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_MODE.class)
     private Integer suitModeId;
 
     @Column(name = "SUIT_ACTION_ID")
@@ -230,6 +233,10 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配器状态")
     private Integer suitCaseStatus;
 
+    @Column(name = "BIND_BUSI_SCRIPT_CODE")
+    @ApiParam(value = "绑定业务脚本Code")
+    private String bindBusiScriptCode;
+
     @Transient
     @ApiParam(value = "适配器套件明细")
     private  Object bsSuitCaseDetail;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -133,6 +133,10 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    @Column(name = "SCRIPT_RESULT")
+    @ApiParam(value = "脚本结果")
+    private String scriptResult;
+
     @Transient
     @ApiParam(value = "适配记录参数")
     private List<BsSuitRecordParam> bsSuitRecordParamList;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 请求适配记录
@@ -46,10 +47,12 @@ public class BsSuitRequestRecord extends BaseBean {
     private Integer requestSource;
 
     // 移动至记录数据表
-    @Lob
     @Column(name = "REQUEST_ORGIN_PARAM")
     @ApiParam(value = "请求原始参数")
     private String requestOrginParam;
 
+    @Transient
+    @ApiParam(value = "id-查询条件")
+    private List<Long> searchIdList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsBusiScript;
+
+/**
+ * @Description : 业务脚本
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-07-28 15:13
+ * @Modify:
+ **/
+public interface BsBusiScriptRepository extends BaseRepository<BsBusiScript,Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -261,7 +261,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -323,6 +323,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getScriptResult(),"scriptResult",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
@@ -367,6 +368,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord);
 
+        DdlPreparedPack.getInPackList(bsSuitRequestRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
 
@@ -416,7 +418,16 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsLongData);
         DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
         DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean);
-        DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean);
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlBsBusiScript(BsBusiScript bsBusiScript){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsBusiScript);
+        DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptName(),"scriptName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptCode(),"scriptCode",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsBusiScript.getScriptType(),"scriptType",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean);
         return ddlPackBean;
     }
 }

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

@@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
 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.Transient;
+import javax.persistence.*;
 
 /**
  * 脚本持久化实体类
@@ -26,7 +22,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
+@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"})
+})
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
     private static final long serialVersionUID = 7893111140559759490L;

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import lombok.Data;
+
+/**
+ * @Description : 调用流程处理组件时的返回对象
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-08-03 20:54
+ * @Modify:
+ **/
+@Data
+public class WmsActionCallResult {
+    private Object resultObj;
+    /**
+     * 执行耗时，单位 ms
+     */
+    private Integer duration;
+
+    public WmsActionCallResult(Object resultObj, Integer duration) {
+        this.resultObj = resultObj;
+        this.duration = duration;
+    }
+}

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

@@ -124,6 +124,10 @@ public class WmsActionLog extends BaseBean {
     @ApiParam(value = "结束组件编号", example = "0")
     public Long endAmId;
 
+    @Column(name = "DURATION")
+    @ApiParam(value = "执行耗时，单位：毫秒", example = "0")
+    public Integer duration = 0;
+
     public Long getInitAmId() {
         if (initAmId != null) {
             return initAmId.longValue();

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

@@ -11,10 +11,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 :作业记录参数表
@@ -33,14 +30,41 @@ import javax.persistence.Table;
 public class WmsActionLogData extends BaseBean {
 
     private static final long serialVersionUID = -8150713013135101134L;
-    @Column(name = "ALD_ID")
-    @ApiParam(value = "记录明细编号")
+
+    @Column(name = "TASK_NO")
+    @ApiParam(value = "作业任务编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long aldId;
+    public String taskNo;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型编号")
+    public String transTypeCode;
+
+    @Transient
+    @Column(name = "MOVE_NO")
+    @ApiParam(value = "移动单单号")
+    public String moveNo;
+
+    @Column(name = "AG_ID")
+    @ApiParam(value = "作业流程编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long agId;
+
+    @Column(name = "AL_NAME_RDD")
+    @ApiParam(value = "流程名称")
+    public String agNameRdd;
+
+    @Column(name = "ACTION_USER_NAME")
+    @ApiParam(value = "作业人员")
+    public String actionUserName;
 
-    @Column(name = "ALD_SEQ")
-    @ApiParam(value = "步骤序号")
-    private Integer aldSeq;
+    @Column(name = "FIX_NO")
+    @ApiParam(value = "设备编号")
+    public String fixNo;
+
+    @Column(name = "AGD_SEQ")
+    @ApiParam(value = "作业步骤序号")
+    private Integer agdSeq;
 
     @Column(name = "CALL_CLASS")
     @ApiParam(value = "实现类")
@@ -54,21 +78,17 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value = "执行状态")
     private Integer executeStatus;
 
-    @Column(name = "START_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00")
-    private String startTime;
-
-    @Column(name = "END_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00")
-    private String endTime;
-
+    /**
+     * 保存调用组件时的 params
+     */
     @Lob
     @Column(name = "IN_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输入参数")
     private String inParams;
 
+    /**
+     * 保存调用组件后的返回值
+     */
     @Lob
     @Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输出参数")
@@ -78,4 +98,8 @@ public class WmsActionLogData extends BaseBean {
     @Column(name = "ERROR_MSG", columnDefinition = "TEXT")
     @ApiParam(value = "异常信息")
     private String errorMsg;
+
+    @Column(name = "DURATION")
+    @ApiParam(value = "执行耗时，单位：毫秒", example = "0")
+    public Integer duration = 0;
 }

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

@@ -116,6 +116,11 @@ public class WmsActionLogDetails extends BaseBean {
     @Column(name="MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;
+
+    @Column(name = "DURATION")
+    @ApiParam(value = "执行耗时，单位：毫秒", example = "0")
+    public Integer duration = 0;
+
     public Long getAsId() {
         if (asId != null) {
             return asId.longValue();

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

@@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
-
     /**
      * 质检状态:1=未质检,10=质检中,20=质检合格,
      * 30=质检不合格,40=已退货
@@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "LOT_NO", nullable = false)
+    @ApiParam("收货批次")
+    public String lotNo = "";
+
     @Transient
     @ApiParam(value = "实盘数量", example = "1")
     @AnnoOutputColumn(hidden = true)

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

@@ -6,6 +6,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;
 
@@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
+    @Column(name = "WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
     @Column(name = "ZONE_NO")
     @ApiParam("存储区编号")
     public String zoneNo;
@@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("原单号")
     public String srcOrderNo;
 
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "库存数量", example = "0")
+    public Double qty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("收货批次")
+    public String lotNo;
+
     @Transient
     @ApiParam("存储区编号组")
     @AnnoOutputColumn(hidden = true)

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

@@ -103,6 +103,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "计划时间")
     private String planTime;
 
+    @Transient
+    @ApiParam(value = "超时时间(单位:分钟)")
+    private Integer timeOut;
+
     @Column(name = "SRC_NO")
     @ApiParam(value = "源单号")
     private String srcNo;
@@ -462,4 +466,13 @@ public class WmsDocMovementDetails extends BaseBean {
         this.custNo = custNo;
     }
 
+    public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) {
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.priority = priority;
+        this.createDatetime = createDatetime;
+    }
+
 }

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

@@ -90,9 +90,9 @@ public class WmsMoveMaster extends BaseBean {
     private String partNo;
 
     @Transient
-    @ApiParam("状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
-    private Integer itemStatus;
+    @ApiParam("明细状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
+    private String itemStatus;
 
     @Transient
     @ApiParam("erp库存地")
@@ -135,10 +135,14 @@ public class WmsMoveMaster extends BaseBean {
     private String srcZoneNo;
 
     @Transient
-    @ApiParam("处理数量")
+    @ApiParam("需求数量")
     private Double transQty;
 
     @Transient
+    @ApiParam("处理数量")
+    private Double handledQty;
+
+    @Transient
     @ApiParam("不合格处理数量")
     private Double rejectQty;
 
@@ -163,6 +167,10 @@ public class WmsMoveMaster extends BaseBean {
     private String snapshotTime;
 
     @Transient
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Transient
     private Integer isSnapshot;
 
     @Transient
@@ -193,7 +201,7 @@ public class WmsMoveMaster extends BaseBean {
         this.errorMessage = errorMessage;
         this.busiTypeCode = busiTypeCode;
         this.partNo = partNo;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.refOrderNo = refOrderNo;
         this.carNo = carNo;
         this.refSrc = refSrc;
@@ -216,7 +224,7 @@ public class WmsMoveMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;
@@ -233,22 +241,25 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
-    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
-                         String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
-                         String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) {
+    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode,
+                         String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo,
+                         String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty,
+                         String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser,
+                         String modifyDatetime, String refSrc) {
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;
         this.destWhNo = destWhNo;
         this.destZoneNo = destZoneNo;
         this.transQty = transQty;
+        this.handledQty = handledQty;
         this.rejectQty = rejectQty;
         this.fixId = fixId;
         this.busiTypeCode = busiTypeCode;
@@ -259,6 +270,30 @@ public class WmsMoveMaster extends BaseBean {
         this.refSrc = refSrc;
     }
 
+    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
+                         String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
+                         String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus.toString();
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destWhNo = destWhNo;
+        this.destZoneNo = destZoneNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+        this.fixId = fixId;
+        this.busiTypeCode = busiTypeCode;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
     public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
         this.itemQty = itemQty;
         this.transTypeCode = transTypeCode;

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

@@ -229,6 +229,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
+
     @Transient
     private Long shippingId;
 

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

@@ -290,6 +290,11 @@ public class WmsPart extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
     private Integer frequency;
 
+    @Column(name = "LIMIT_QUALITY_DAYS")
+    @ApiParam(value = "卡控周期", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer limitQualityDays;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();

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

@@ -395,7 +395,16 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
+        if (!StringUtil.isEmpty(wmsPart.getPartType()) && wmsPart.getPartType().contains(",")) {
+            String types[] = wmsPart.getPartType().split(",");
+            List<String> partTypes = new ArrayList<>();
+            for (String type : types) {
+                partTypes.add(type);
+            }
+            DdlPreparedPack.getInPackList(partTypes, "partType", result);
+        } else {
             DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
         DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result);
         getStringBuilderPack(wmsPart, result);
@@ -2614,7 +2623,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) {
         DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean);
+        //DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean);
         DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean);
@@ -2985,7 +2994,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result);
-        DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result);
+        DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result);
         getStringBuilderPack(wmsFieldInfo, result);
         return result;
     }