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

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

@@ -4847,4 +4847,117 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 配方类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_FORMULA_TYPE {
+        DEVICE_SEMAPHORE(10, "设备信号");
+
+        private int value;
+        private String description;
+
+        PART_FORMULA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_FORMULA_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 	作业校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_MODEL {
+        NO_CHECK(10, "不校验"),
+        CHECK(20, "校验设备就绪信号");
+
+        private int value;
+        private String description;
+
+        CHECK_MODEL(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;
+        }
+    }
+
+    /**
+     * 	PLC类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_TYPE {
+        STANDARD(10, "标准"),
+        EQU_OPERATION_SIGNLE(20, "设备作业信号");
+
+        private int value;
+        private String description;
+
+        PLC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -58,6 +58,26 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("特殊批次")
     private String fixLotNo;
 
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam("原材料用量")
+    private String itemQty;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam("原材料单位")
+    private String itemUnit;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
     @Column(name = "ACTION_USER")
     @ApiParam("操作人")
     private String actionUser;
@@ -85,4 +105,20 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
 }

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

@@ -0,0 +1,44 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_CAUSE")
+@Api("MES_设备故障原因")
+public class MesEquFaultCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1229825283741375978L;
+    @Column(name = "FC_CODE")
+    @ApiParam("故障原因代码")
+    private String fcCode;
+
+    @Column(name = "FC_NAME")
+    @ApiParam("故障原因描述")
+    private String fcName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -0,0 +1,44 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_METHOD")
+@Api("MES_设备故障处理措施")
+public class MesEquFaultMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1366849727309967125L;
+    @Column(name = "FM_CODE")
+    @ApiParam("故障方法代码")
+    private String fmCode;
+
+    @Column(name = "FM_NAME")
+    @ApiParam("故障方法描述")
+    private String fmName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -0,0 +1,44 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_PHENOMENON")
+@Api("MES_设备故障现象")
+public class MesEquFaultPhenomenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4373435091738791300L;
+    @Column(name = "FP_CODE")
+    @ApiParam("故障现象代码")
+    private String fpCode;
+
+    @Column(name = "FP_NAME")
+    @ApiParam("故障现象描述")
+    private String fpName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name = "CHECK_MODEL")
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_CAUSE")
-@Api("mes设备故障原因表")
+@Api("mes故障原因表")
 public class MesFaultCause extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1229825197241375978L;
@@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable {
     @ApiParam("故障原因描述")
     private String fcName;
 
-    @Column(name = "PARENT_FC_CODE")
-    @ApiParam("父阶原因代码")
-    private String parentFcCode;
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
+    @Column(name = "FC_TYPE")
+    @ApiParam("故障原因类型编码")
+    private String fcType;
 }

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_METHOD")
-@Api("mes设备故障方法表")
+@Api("MES_故障处理措施")
 public class MesFaultMethod extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -1366849757709967125L;
@@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable {
     @ApiParam("故障方法描述")
     private String fmName;
 
-    @Column(name = "PARENT_FM_CODE")
-    @ApiParam("父阶故障代码")
-    private String parentFmCode;
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
+    @Column(name = "FM_TYPE")
+    @ApiParam("故障措施类型编码")
+    private String fmType;
 }

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_PHENOMENON")
-@Api("mes设备故障现象表")
+@Api("mes故障现象表")
 public class MesFaultPhenomenon extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 4373435095236791300L;
@@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable {
     @ApiParam("故障现象描述")
     private String fpName;
 
-    @Column(name = "PARENT_FP_CODE")
-    @ApiParam("父阶现象代码")
-    private String parentFpCode;
-
-    @Column(name = "EQUIPMENT_CODE")
-    @ApiParam("设备代码")
-    private String equipmentCode;
-
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
     @Column(name = "FP_TYPE")
-    @ApiParam("故障现象类型")
-    private Integer fpType;
+    @ApiParam("故障现象类型编码")
+    private String fpType;
 }

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

@@ -88,8 +88,8 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品编码匹配类型")
     private Integer productMatchType;
 
-    @Column(name = "产品生产类型")
-    @ApiParam("产品类型名称")
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型代码")
     private String pptCode;
 
     @Column(name = "PART_TRAIT")

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

@@ -54,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("通道")
     private String channel;
 
+    @Column(name = "DEVICE")
+    @ApiParam("终端")
+    private String device;
+
     @Column(name = "TAG_NAME")
     @ApiParam("标签名称")
     private String tagName;
@@ -70,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name = "DEVICE")
-    @ApiParam("驱动")
-    private String device;
+    @Column(name = "ANALYSIS_RULE")
+    @ApiParam("解析规则")
+    private String analysisRule;
+
+    @Column(name = "IS_ANALYSIS")
+    @ApiParam("是否解析")
+    private String isAnalysis;
+
+    @Column(name = "PLC_CFG")
+    @ApiParam("PLC配置")
+    private String plcCfg;
 
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("生产线")
     private String workCenterCode;
@@ -86,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
-    @Column(name = "PLC_CFG")
-    @ApiParam("PLC的值的设定")
-    private String plcCfg;
-
-    @Column(name = "ANALYSIS_RULE")
-    @ApiParam("解析规则")
-    private String analysisRule;
-
-    @Column(name = "IS_ANALYSIS")
-    @ApiParam("是否解析")
-    private String isAnalysis;
-
     @Column(name = "FEED_VALUE")
     @ApiParam("反馈值")
     private String feedValue;
@@ -114,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("空间索引")
     private Integer nameSpaceIndex = 2;
 
+    @Column(name = "PLC_TYPE")
+    @ApiParam("PLC类型")
+    private Integer plcType;
+
     @Column(name = "USER_NAME")
     @ApiParam("用户名")
     private String userName;
@@ -130,10 +138,6 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("OPC值")
     private List<ProductDataModel> opcValue;
 
-    @Column(name = "TOOLING_CODE ")
-    @ApiParam("工装代码")
-    private String toolingCode;
-
 
     @Transient
     @ApiParam("标签数据")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.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;
 
 /**
@@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable {
     @Column(name = "PROCESS_NAME")
     @ApiParam("工序名称")
     private String processName;
+
+    @Transient
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Transient
+    @ApiParam("流程代码")
+    private String routeCode;
 }

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型 10-扫描类型 20-监控类型")
     private Integer routeType;
+
+    @Transient
+    @ApiParam("生产线")
+    private String workCenterCode;
 }

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc
+ */
+@Data
+public class BypassModel {
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("Bypass编码")
+    private String bypassCode;
+
+    @ApiParam("检测项")
+    private String businessValue;
+
+    @ApiParam("是否确认，1=已确认，2=未确认")
+    private String isVerify;
+
+    @ApiParam("生产数据ID")
+    private Long productDataId;
+
+}

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
-//import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 生产配方模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产配方模板",description = "生产配方模板")
+public class MesPartFormulaModel extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607620L;
+
+    @ApiParam(value = "组号")
+    @AnnoOutputColumn
+    private String groupNo;
+
+    @ApiParam(value = "组内名称")
+    @AnnoOutputColumn
+    private String groupName;
+
+    @ApiParam(value = "原材料物料号")
+    @AnnoOutputColumn(required = false)
+    private String partNo;
+
+    @ApiParam(value = "编号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "下标值")
+    @AnnoOutputColumn
+    private Integer index;
+
+}

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

@@ -17,7 +17,7 @@ import lombok.Data;
 public class MesWorkOrderModel {
 
     @ApiParam("工单号")
-    @AnnoOutputColumn(required = false)
+    @AnnoOutputColumn
     private String orderNo;
 
     @ApiParam("物料号")

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

@@ -79,6 +79,11 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("产品类型名称")
     private String pptCode;
 
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+    @ApiParam("vin")
+    private String vinCode;
+
     public QueueOrderModel() {
     }
 
@@ -234,4 +239,12 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.organizeCode = organizeCode;
     }
+
+    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
+        this.id = id;
+        this.queueGroupNo = queueGroupNo;
+        this.jitLotNo = jitLotNo;
+        this.vinCode = vinCode;
+        this.organizeCode = organizeCode;
+    }
 }

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

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

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

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
@@ -1324,8 +1325,50 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
             DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean);
         }
-        if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
-            DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmType())) {
+            DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmType(), "fmType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障处理措施查询条件封装
+     *
+     * @param mesEquFaultMethod
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquFaultMethod(MesEquFaultMethod mesEquFaultMethod, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultMethod, organizeCode);
+        if (!StringUtils.isEmpty(mesEquFaultMethod.getFmCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmCode(), "fmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultMethod.getFmName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmName(), "fmName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultMethod.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障原因查询条件封装
+     *
+     * @param mesEquFaultCause
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquFaultCause(MesEquFaultCause mesEquFaultCause, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultCause, organizeCode);
+        if (!StringUtils.isEmpty(mesEquFaultCause.getFcCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcCode(), "fcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultCause.getFcName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcName(), "fcName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultCause.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getEquipmentCode(), "equipmentCode", packBean);
         }
         return packBean;
     }
@@ -1345,8 +1388,8 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
             DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean);
         }
-        if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
-            DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
+        if (!StringUtils.isEmpty(mesFaultCause.getFcType())) {
+            DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcType(), "fcType", packBean);
         }
         return packBean;
     }
@@ -1366,8 +1409,29 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
             DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
         }
-        if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
-            DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpType())) {
+            DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpType(), "fpType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障现象查询条件封装
+     *
+     * @param mesEquFaultPhenomenon
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquFaultPhenomenon(MesEquFaultPhenomenon mesEquFaultPhenomenon, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultPhenomenon, organizeCode);
+        if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpCode(), "fpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpName(), "fpName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getEquipmentCode(), "equipmentCode", packBean);
         }
         return packBean;
     }
@@ -2400,4 +2464,13 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPartFormula(MesPartFormula mesPartFormula) {
+        DdlPackBean packBean = getAllBaseData(mesPartFormula.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesPartFormula.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartFormula.getFormulaType(), "formulaType", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartFormula.getFormulaContent(), "formulaContent", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入结果model")
+public class ExcelImportModel<T> implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("失败行数量")
+    private int failRowNum;
+
+    @ApiParam("错误信息集合")
+    private List<ImportErrorModel> ImportErrorModels;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
+    @ApiParam("导入进度")
+    private String importSpeed;
+
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入异常结果model")
+public class ImportErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -41,4 +42,12 @@ public class PtlAreaRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型")
     private Integer routeType;
+
+    @Transient
+    @ApiParam("区域代码")
+    private String areaName;
+
+    @Transient
+    @ApiParam("流程名称")
+    private String routeName;
 }

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

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.wms.bean.template;
+
+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.util.List;
+
+/**
+ * @Description : 导入模板信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_IMPORT_TEMPLATE")
+@Api("导入模板信息")
+public class BasImportTemplate extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592889L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam("模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam("模板名称")
+    private String templateName;
+
+    @Column(name="TEMPLATE_DESC")
+    @ApiParam("模板描述")
+    private String templateDesc;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("分组名称")
+    private String groupName;
+
+    /**
+     * 10-单表，20-多表
+     */
+    @Column(name="IMPORT_TYPE")
+    @ApiParam(value = "导入类型", example = "0")
+    private Integer importType;
+
+    /**
+     *  10-全覆盖，20-差异更新，30-重复不导入
+     */
+    @Column(name="UPDATE_TYPE")
+    @ApiParam(value = "更新类型", example = "0")
+    private Integer updateType;
+
+    @Column(name="SCRIPT_NO")
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @Column(name="START_ROW")
+    @ApiParam(value = "起始行", example = "0")
+    private Integer startRow;
+
+    @Transient
+    @ApiParam("模板明细列表")
+    private List<BasImportTemplateDetails> templateDetailsList;
+}

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

@@ -0,0 +1,117 @@
+package cn.estsh.i3plus.pojo.wms.bean.template;
+
+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;
+
+/**
+ * @Description : 导入模板明细信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_IMPORT_TEMPLATE_DETAILS")
+@Api("导入模板明细信息")
+public class BasImportTemplateDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592999L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam("模板代码")
+    private String templateCode;
+
+    @Column(name="TABLE_NAME")
+    @ApiParam("表名称")
+    private String tableName;
+
+    @Column(name="FIELD_CODE")
+    @ApiParam("字段英文名称")
+    private String fieldCode;
+
+    @Column(name="FIELD_ALIAS")
+    @ApiParam("字段别名")
+    private String fieldAlias;
+
+    @Column(name="LABEL_CODE")
+    @ApiParam("标签代码")
+    private String labelCode;
+
+    @Column(name="LABEL_NAME")
+    @ApiParam("标签名称")
+    private String labelName;
+
+    @Column(name="DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+    /**
+     * 数据格式 文本、整数、小数、日期
+     */
+    @Column(name="DATA_FORAMT")
+    @ApiParam("数据格式")
+    private String dataFormat;
+
+    /**
+     *  1-是，2-否
+     */
+    @Column(name="IS_REQUIRE")
+    @ApiParam(value = "是否必填", example = "0")
+    private Integer isRequire;
+
+    @Column(name="DECIMAIL_SPLIT")
+    @ApiParam("小数点分隔符")
+    private String decimalSplit;
+
+    @Column(name="THOUSANDS_SPLIT")
+    @ApiParam("千分位分隔符")
+    private String thousandsSplit;
+
+    // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss
+    @Column(name="DATE_FORMAT")
+    @ApiParam("日期格式")
+    private String dateFormat;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name="SEQ")
+    @ApiParam(value = "序号", example = "0")
+    private Integer seq;
+
+    @Column(name="MAX_LENGTH")
+    @ApiParam(value = "最大长度", example = "0")
+    private Integer maxLength;
+
+    @Column(name="RELATION_TABLE")
+    @ApiParam("关联表名")
+    private String relationTable;
+
+    @Column(name="RELATION_FIELD")
+    @ApiParam("关联字段")
+    private String relationField;
+
+    /**
+     * 是否主键 1-是，2-否
+     */
+    @Column(name="IS_PK")
+    @ApiParam(value = "是否主键", example = "0")
+    private Integer isPk;
+
+    @Column(name="SHEET_NAME")
+    @ApiParam("工作薄名称")
+    private String sheetName;
+}

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @description 数据库实例字段模型
+ * @author siliter.yuan
+ * @date 2020/04/16
+ */
+@Data
+@Api("数据库实例字段模型")
+public class BasBeanFieldModel {
+
+    @ApiParam("表名")
+    private String tableName;
+
+    @ApiParam("表描述")
+    private String tableDesc;
+
+    @ApiParam("字段英文名称")
+    private String fieldEnName;
+
+    @ApiParam("字段类型")
+    public String fieldType;
+
+    @ApiParam("字段描述")
+    private String fieldDesc;
+
+    @ApiParam("实例类名")
+    public String entityName;
+
+    @ApiParam("实例字段名称")
+    public String propertyName;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导入模板明细数据操作仓库
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 10:00
+ * @Modify:
+ **/
+@Repository
+public interface BasImportTemplateDetailsRepository extends BaseRepository<BasImportTemplateDetails, Long> {
+    
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导入模板数据操作仓库
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-16 10:00
+ * @Modify:
+ **/
+@Repository
+public interface BasImportTemplateRepository extends BaseRepository<BasImportTemplate, Long> {
+    
+}

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

@@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
 import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
+import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@@ -3082,4 +3084,29 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 导入模板信息分页查询条件
+     * @param template
+     * @return
+     */
+    public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
+        DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
+        getStringBuilderPack(template, result);
+        return result;
+    }
+
+    /**
+     * 导入模板明细信息分页查询条件
+     * @param details
+     * @return
+     */
+    public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        getStringBuilderPack(details, result);
+        return result;
+    }
 }