Merge branch 'test'

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java

@@ -32,7 +32,7 @@ public class DataLink extends BaseAPS {
 
     @Column(name="TYPE")
     @ApiParam(value ="链接类型")
-    @FieldAnnotation(defaultValue = "CSV")
+    @FieldAnnotation(defaultValue = "EXCEL")
     private ApsEnumUtil.DATA_LINK_TYPE type;
 
     @Column(name="PATH")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
-import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -26,17 +25,14 @@ import javax.persistence.Table;
 public class ExpressionRecord extends BaseAPS {
     @Column(name="BEAN_NAME")
     @ApiParam(value ="表名")
-    @FieldAnnotation(property = false)
     private String beanName;
 
     @Column(name="FIELD_NAME")
     @ApiParam(value ="字段名")
-    @FieldAnnotation(property = false)
     private String fieldName;
 
     @Column(name="NAME")
     @ApiParam(value ="名称")
-    @FieldAnnotation(notEmpty = true)
     private String name;
 
     @Column(name="EXPRESSION")

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

@@ -947,12 +947,12 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 111020005, "物料"),
+        PART("PART_ALARM", 110060205, "物料"),
-        QUALITY("QUALITY_ALARM", 111020006, "质量"),
+        QUALITY("QUALITY_ALARM", 110060206, "质量"),
-        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
+        EQUIP("EQUMENT_ALARM", 110060207, "设备"),
-        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
+        PROCESS("ROUTING_ALARM", 110060208, "工艺"),
-        CHECK("OTHER_ALARM", 111020009, "自处理"),
+        CHECK("OTHER_ALARM", 110060209, "自处理"),
-        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
+        FIX_ERROR("FIX_ERROR", 110060210, "自动报警");
 
         private String value;
         private Integer code;

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

@@ -979,7 +979,7 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_LINK_TYPE {
-        EXCEL("EXCEL", "EXCEL文件"),
+        EXCEL("EXCEL", "EXCEL"),
         MYSQL("MYSQL", "MySql"),
         ORACLE("ORACLE", "Oracle"),
         SQLSERVER("SQLSERVER", "SqlServer");

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

@@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRUE_OR_FALSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        TRUE_OR_FALSE(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;
+        }
+    }
+
     /**
      * 包装规格-是否混包 MES_PACK_SPEC
      * 10.
@@ -172,7 +204,9 @@ public class MesEnumUtil {
             this.description = description;
         }
 
-        public String getValue() { return value;}
+        public String getValue() {
+            return value;
+        }
 
         public String getDescription() {
             return description;
@@ -1333,7 +1367,11 @@ public class MesEnumUtil {
         MES_DATA_OBJECT(220, "数据对象"),
         MES_OBJECT_CFG(230, "对象结构"),
         MES_WC_CHECK(240, "开线检查"),
-        MES_QC_CHECK_STANDARD(250, "质量检测标准");
+        MES_QC_CHECK_STANDARD(250, "质量检测标准"),
+        MES_FAULT_CAUSE(260,"设备故障原因"),
+        MES_FAULT_METHOD(270,"设备故障处理措施"),
+        MES_FAULT_PHENOMENON(280,"设备故障现象");
+
 
         private int value;
         private String description;

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

@@ -1180,7 +1180,7 @@ public class MesPcnEnumUtil {
         MATERIAL(30, "materials", "物料"),
         ROUTE(40, "routes", "工艺"),
         ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
-        MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
+        ENVIRONMENT(60, "environment", "环境");
 
 
         private int value;

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

@@ -368,7 +368,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
-        CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"),CREATE_DOCMOVE(40, "生成移库单"),PULL_FAIL(50, "拉动出错");
+        CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"), CREATE_DOCMOVE(40, "生成移库单"), PULL_FAIL(50, "拉动出错");
 
         private int value;
         private String description;
@@ -638,14 +638,15 @@ public class WmsEnumUtil {
         KT_REWORK(380, "KT_REWORK", "KT返工"),
         KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
         KT_SORTING(400, "KT_SORTING", "KT分选"),
-		VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
+        VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
-		VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
+        VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
+        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
-		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
+        KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
-        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
+        KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
-        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货");
+        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
+        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
 
         private int value;
         private String code;
@@ -826,8 +827,8 @@ public class WmsEnumUtil {
         VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
         VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"),
         VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
-        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"),
+        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
-		VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
+        VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
         private String value;
@@ -904,14 +905,16 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
+        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
-        , CLOSE(40, "已关闭");
+        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
+        private int code;
         private String description;
 
-        TASK_INFO_STATUS(int value, String description) {
+        TASK_INFO_STATUS(int value, int code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -919,6 +922,10 @@ public class WmsEnumUtil {
             return value;
         }
 
+        public int getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -936,8 +943,20 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-    }
 
+        public static TASK_INFO_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 
 
     /**
@@ -952,7 +971,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        SCRAP(70, "报废"),
+        //SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -995,6 +1014,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 单据是否生成任务状态
      */
@@ -1052,12 +1072,14 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 业务表：库存条码质检状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
+        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
 
         private int value;
         private String code;
@@ -1363,7 +1385,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 质检业务状态
      */
@@ -1436,6 +1457,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 质检业务类型
      */
@@ -1476,6 +1498,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 作业记录参数状态
      */
@@ -2339,13 +2362,14 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * NC处理 操作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BUSI_OPERATION_TYPE {
         //收货改数
-        GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数") ;
+        GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数");
 
         private int value;
         private String code;
@@ -2854,9 +2878,8 @@ public class WmsEnumUtil {
     }
 
 
-
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器");
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
 
         private String value;
         private String description;
@@ -4086,7 +4109,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SPEC_LEVEL {
-        FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"),  FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层");
+        FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.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;
 
 /**
  * @Author: Wynne.Lu
@@ -25,7 +26,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_ESOP")
 @Api("作业指导书信息表(ODS)")
-public class MesESOP extends BaseBean {
+public class MesEsop extends BaseBean {
 
     @Column(name = "PART_NO")
     @ApiParam("零件号")
@@ -55,35 +56,36 @@ public class MesESOP extends BaseBean {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
-    @Column(name = "SOP_NAME")
+    @Column(name = "FILE_ID")
-    @ApiParam("SOP名称")
+    @ApiParam("文件id")
-    private String sopName;
+    private Long fileId;
 
-    @Column(name = "SOP_URL")
+    @Transient
-    @ApiParam("SOP_URL")
+    @ApiParam("文件名称")
-    private String sopUrl;
+    private String fileName;
 
-    @Column(name = "GROUP_NAME")
+    @Transient
-    @ApiParam("GROUP_NAME")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("组名")
     private String groupName;
 
-    @Column(name = "FILE_ORIGIN_NAME")
+    @Transient
-    @ApiParam("FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
     private String fileOriginName;
 
-    @Column(name = "FILE_SIZE")
+    @Transient
-    @ApiParam("FILE_SIZE")
+    @ApiParam("文件大小")
     private String fileSize;
 
-    @Column(name = "FILE_TYPE_ID")
+    @Transient
-    @ApiParam("FILE_TYPE_ID")
+    @ApiParam("文件类型名称")
-    private String fileTypeId;
+    private String fileType;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
 
-    @Column(name = "SYNC_TAG")
+    @Transient
-    @ApiParam("SYNC_TAG")
+    @ApiParam("同步标记")
     private Integer syncTag = 0;
+
 }

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FILE")
+@Api("文件表")
+public class MesFile extends BaseBean {
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -49,20 +49,18 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncFrequency;
 
     @Column(name = "SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "同步时间")
     private String syncTime;
 
-    @Column(name = "SYNC_PATTERN")//2.新增  1.修改
+    @Column(name = "SYNC_PATTERN")
-    @ApiParam("同步方式")
+    @ApiParam("同步方式 2.新增  1.修改")
     private Integer syncPattern;
 
-    @Column(name = "SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
+    @Column(name = "SYNC_TYPE")
-    @ApiParam("同步类型")
+    @ApiParam("同步类型 1.pcn获取mes数据   2.pcn推送数据至mes")
     private Integer syncType;
 
     @Column(name = "LAST_SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "上一同步时间")
     private String lastSyncTime;
 
@@ -74,6 +72,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value = "从数据库抽取的条件限制")
     private String extractCondition;
 
+    @Column(name = "IS_IGNORE_ORG")
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.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;
 
 /**
  * @Description:
@@ -30,41 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
+    @Column(name = "FILE_ID")
-    @ApiParam("图片URL")
+    @ApiParam("文件id")
-    private String pictureUrl;
+    private Long fileId;
-
-    @Column(name = "PICTURE_NAME")
-    @ApiParam("图片名称")
-    private String pictureName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
 
-    @Column(name = "FILE_TYPE_ID")
+    @Transient
-    @ApiParam("FILE_TYPE_ID")
+    @ApiParam("文件名称")
-    private String fileTypeId;
+    private String fileName;
 
-    @Column(name = "FILE_TYPE_NAME")
+    @Transient
-    @ApiParam("FILE_TYPE_NAME")
+    @ApiParam("文件URL")
-    private String fileTypeName;
+    private String fileUrl;
 
-    @Column(name = "SOP_NAME")
+    @ApiParam("图片URL")
-    @ApiParam("SOP名称")
+    private String pictureUrl;
-    private String sopName;
-
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
-    private String groupName;
-
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
-    private Integer syncTag = 0;
 }

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 3:09 下午
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("FastDfs文件model")
+public class EsopFileModel {
+
+    private MesEsop esop;
+
+    private MesFile file;
+
+}

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

@@ -2,7 +2,7 @@ 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.MesESOP;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
+public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.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.MesFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesFileRepository extends BaseRepository<MesFile, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesTypeCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\4 10:34
+ * @Modify:
+ **/
+public interface MesTypeCfgRepository extends BaseRepository<MesTypeCfg, Long> {
+}

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

@@ -378,4 +378,27 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
+
+
+    /**
+     * 按条件分页查询类型信息数据
+     * @param typeCfg
+     * @return
+     */
+    public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) {
+
+        DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) {
+            DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) {
+            DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean);
+        }
+        if (!StringUtils.isEmpty(typeCfg.getTypeCode())) {
+            DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean);
+        }
+
+        return packBean;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.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;
 
 /**
  * @Author: Wynne.Lu
@@ -25,7 +26,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_ESOP")
 @Api("作业指导书信息表(ODS)")
-public class MesESOP extends BaseBean {
+public class MesEsop extends BaseBean {
 
     @Column(name = "PART_NO")
     @ApiParam("零件号")
@@ -55,36 +56,36 @@ public class MesESOP extends BaseBean {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
-    @Column(name = "SOP_NAME")
+    @Column(name = "FILE_ID")
-    @ApiParam("SOP名称")
+    @ApiParam("文件id")
-    private String sopName;
+    private Long fileId;
 
-    @Column(name = "SOP_URL")
+    @Transient
-    @ApiParam("SOP_URL")
+    @ApiParam("文件名称")
-    private String sopUrl;
+    private String fileName;
 
-    @Column(name = "GROUP_NAME")
+    @Transient
-    @ApiParam("GROUP_NAME")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("组名")
     private String groupName;
 
-    @Column(name = "FILE_ORIGIN_NAME")
+    @Transient
-    @ApiParam("FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
     private String fileOriginName;
 
-    @Column(name = "FILE_SIZE")
+    @Transient
-    @ApiParam("FILE_SIZE")
+    @ApiParam("文件大小")
     private String fileSize;
 
-    @Column(name = "FILE_TYPE_ID")
+    @Transient
-    @ApiParam("FILE_TYPE_ID")
+    @ApiParam("文件类型名称")
-    private String fileTypeId;
+    private String fileType;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
 
-    @Column(name = "SYNC_TAG")
+    @Transient
-    @ApiParam("SYNC_TAG")
+    @ApiParam("同步标记")
     private Integer syncTag = 0;
 
 }

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FILE")
+@Api("文件表")
+public class MesFile extends BaseBean {
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,6 +28,9 @@ import javax.persistence.Table;
 @Table(name = "MES_PCN_SYNC_CFG")
 @Api("MES_PCN_同步配置")
 public class MesPcnSyncCfg extends BaseBean {
+
+    private static final long serialVersionUID = 7270930330576127126L;
+
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;
@@ -49,20 +52,18 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncFrequency;
 
     @Column(name = "SYNC_TIME")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "同步时间")
     private String syncTime;
 
-    @Column(name = "SYNC_PATTERN")//2、新增  1、修改
+    @Column(name = "SYNC_PATTERN")
-    @ApiParam("同步方式")
+    @ApiParam("同步方式 2、新增  1、修改")
     private Integer syncPattern;
 
-    @Column(name = "SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
+    @Column(name = "SYNC_TYPE")
-    @ApiParam("同步类型")
+    @ApiParam("同步类型 1.pcn获取mes数据   2.pcn推送数据至mes")
     private Integer syncType;
 
     @Column(name = "LAST_SYNC_TIME")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "上一同步时间")
     private String lastSyncTime;
 
@@ -74,6 +75,14 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value = "从数据库抽取的条件限制")
     private String extractCondition;
 
+    @Column(name = "IS_IGNORE_ORG")
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    public int getIsIgnoreOrgVal() {
+        return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
+    }
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.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;
 
 /**
  * @Description:
@@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
+    @Column(name = "FILE_ID")
-    @ApiParam("图片URL")
+    @ApiParam("文件id")
-    private String pictureUrl;
+    private Long fileId;
 
-    @Column(name = "PICTURE_NAME")
+    @Transient
-    @ApiParam("图片名称")
+    @ApiParam("文件原名称")
-    private String pictureName;
+    private String fileOriginName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
-
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
 }

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
+import cn.estsh.i3plus.pojo.mes.bean.MesFile;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 3:09 下午
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("FastDfs文件model")
+public class EsopFileModel {
+
+    private MesEsop esop;
+
+    private MesFile file;
+
+}

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

@@ -22,6 +22,9 @@ public class FastDfsDownloadModel {
     @ApiParam("部分相对路径")
     private String dirPath;
 
+    @ApiParam("fdfs文件路径")
+    private String fdfsPath;
+
     @ApiParam("文件名称")
     private String fileName;
 

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

@@ -86,6 +86,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("是否解析")
     private String isAnalysis;
 
+    @ApiParam("驱动")
+    private String device;
+
     public MesPlcModel() {
 
     }
@@ -93,7 +96,7 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -118,5 +121,6 @@ public class MesPlcModel implements Serializable {
         this.plcCfg = plcCfg;
         this.analysisRule = analysisRule;
         this.isAnalysis = isAnalysis;
+        this.device = device;
     }
 }

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\4 16:44
+ * @Modify:
+ **/
+@Data
+public class ProduceCtgyPictureModel {
+
+    private Long id;
+    private String createUser;
+    private String createDatetime;
+    private String modifyUser;
+    private String modifyDatetime;
+    private String organizeCode;
+    private Integer isValid;
+    private Integer isDeleted;
+
+    @ApiParam("产品类型代码")
+    private String produceCtgyCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @ApiParam("文件原名称")
+    private String fileOriginName;
+    @ApiParam("文件URL")
+    private String fileUrl;
+    @ApiParam("组名")
+    private String groupName;
+
+    public ProduceCtgyPictureModel() {
+    }
+
+    public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) {
+        this.id = id;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.produceCtgyCode = produceCtgyCode;
+        this.sideLocation = sideLocation;
+        this.fileId = fileId;
+        this.fileOriginName = fileOriginName;
+        this.fileUrl = fileUrl;
+        this.groupName = groupName;
+    }
+}

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

@@ -9,6 +9,10 @@ import java.util.List;
 public class SysOrganizeModel {
 
     @Transient
+    @ApiParam(value = "id")
+    private Long id;
+
+    @Transient
     @ApiParam(value = "父节点")
     private Long parentId;
 
@@ -43,4 +47,12 @@ public class SysOrganizeModel {
     public void setName(String name) {
         this.name = name;
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 }

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

@@ -1,8 +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.MesActionMethod;
+import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
-import cn.estsh.i3plus.pojo.mes.bean.MesESOP;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -13,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
+public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.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.MesFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesFileRepository extends BaseRepository<MesFile, 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.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import org.springframework.util.StringUtils;
 
@@ -416,14 +417,14 @@ public class MesHqlPack {
      * @param mesWcCheck
      * @return
      */
-    public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
+    public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(wcCheck, organizeCode);
 //        DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
+        DdlPreparedPack.getStringEqualPack(wcCheck.getCheckType(), "checkType", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getCheckObj(), "checkObj", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getCheckItem(), "checkItem", packBean);
         return packBean;
     }
 
@@ -470,31 +471,26 @@ public class MesHqlPack {
     /**
      * MES 上传文件FastDfs封装
      *
-     * @param mesESOP
+     * @param esop
      * @return
      */
-    public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
+    public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
         DdlPackBean packBean = getAllBaseData(org);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
-        DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
+        DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
-        DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
+        DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
         return packBean;
     }
 
-    public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
+    public static DdlPackBean getEsop(MesEsop esop, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(esop, organizeCode);
-        if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) {
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
-            DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(esop.getPartNo(), "partNo", packBean);
-        }
-        if (!StringUtils.isEmpty(mesESOP.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
-        }
-
         return packBean;
     }
 
@@ -1397,6 +1393,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
         }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItemType())) {
+            DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItemType(), "checkItemType", packBean);
+        }
         return packBean;
     }
 
@@ -1423,28 +1422,6 @@ public class MesHqlPack {
     }
 
     /**
-     * MES 产品类型图片查询条件封装
-     *
-     * @param mesProduceCtgyPicture
-     * @param organizeCode
-     * @return
-     */
-    public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
-        }
-        return packBean;
-    }
-
-
-    /**
      * 设备通知对象配置 查询条件封装
      *
      * @param mesEquNotifyObjectCfg
@@ -1872,14 +1849,20 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
+        }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
+            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
+//            DdlPreparedPack.timeBuilder(
+//                    mesProduceSn.getOutWorkCenterStartTime(),
+//                    mesProduceSn.getOutWorkCenterEndTime(),
+//                    "outWorkCenterTime", packBean, true);
+        }
         DdlPreparedPack.timeBuilder(
                 mesProduceSn.getCreateDateTimeStart(),
                 mesProduceSn.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getOutWorkCenterStartTime(),
-                mesProduceSn.getOutWorkCenterEndTime(),
-                "outWorkCenterTime", packBean, true);
         return packBean;
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -49,7 +49,7 @@ public class SysLogTaskTime extends BaseBean {
     @ApiParam(value ="调度服务器端口")
     private String schedulerServerPort;
 
-    @Column(name="TaskThreadId")
+    @Column(name="TASK_THREAD_ID")
     @ApiParam(value ="任务线程id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskThreadId;

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

@@ -65,6 +65,11 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "任务自动初始化", example = "0")
     private Integer autoInit;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false)
+    @ApiParam(value = "是否连带提交创建状态移动单", example = "2")
+    private Integer isCommitRefMove;
+
     @Lob
     @Column(name = "POSITION")
     @ApiParam(value = "GOJS位置")

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

@@ -97,6 +97,14 @@ public class WmsBom extends BaseBean {
     @Transient
     public String routingCode;
 
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "线边库位代码")
+    private String locateNo;
+
+    @Column(name = "TERMINAL_NO")
+    @ApiParam(value = "工位代码")
+    private String terminalNo;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty.doubleValue();
     }

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

@@ -34,15 +34,9 @@ public class WmsOperationBean<Obj> extends BaseBean {
     @ApiParam("任务单号")
     public String taskNo;
 
-    /**
+    @ApiParam("业务单号")
-     * 触发源:
+    public String refSrc;
-     * 10=扫描枪,
+
-     * 20=提交按钮,
-     * 30=重置按钮,
-     * 40=查看明细,
-     * 50=明细(删除),
-     * 60=明细（清空）
-     */
     @ApiParam("触发源")
     public int sourceOwner;
 

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

@@ -191,10 +191,22 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 
+    @Column(name = "CYCLE_RQUEST_PERIOD")
+    @ApiParam(value = "循环补货周期", example = "0")
+    private Integer cycleRquestPeriod = 0;
+
+    @Column(name = "CYCLE_RQUEST_QTY")
+    @ApiParam(value = "循环补货数量", example = "0")
+    private Double cycleRquestQty = 0d;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
 
+    public int getCycleRquestPeriod(){
+        return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue();
+    }
+
     public WmsPart() {
     }
 
@@ -210,6 +222,10 @@ public class WmsPart extends BaseBean {
         return max == null? 0:max;
     }
 
+    public Double getCycleRquestQty() {
+        return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
+    }
+
 
     public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
         this.partNo = partNo;

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.wms.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;
+
+/**
+ * @Description : 班次表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT")
+@Api("班次信息")
+public class WmsShift extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592714L;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.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;
+
+/**
+ * @Description : 班休表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT_REST")
+@Api("班休信息")
+public class WmsShiftRest extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592715L;
+
+    @Column(name="REST_NO")
+    @ApiParam("班休代码")
+    private String restNo;
+
+    @Column(name="REST_NAME")
+    @ApiParam("班休名称")
+    private String restName;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="START_REST_TIME")
+    @ApiParam("开始休息时间")
+    private String startRestTime;
+
+    @Column(name="END_REST_TIME")
+    @ApiParam("结束休息时间")
+    private String endRestTime;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.wms.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.UniqueConstraint;
+
+/**
+ * @Description : 工位表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-12-03 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TERMINAL")
+@Api("工位信息")
+public class WmsTerminal extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592713L;
+    @Column(name="TERMINAL_NO")
+    @ApiParam("工位代码")
+    private String terminalNo;
+
+    @Column(name="TERMINAL_NAME")
+    @ApiParam("工位名称")
+    private String terminalName;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.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.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班次信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.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.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班休信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.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.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工位信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-07 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsTerminalRepository extends BaseRepository<WmsTerminal, Long> {
+}

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

@@ -2517,4 +2517,56 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 工位信息分页查询条件
+     *
+     * @param wmsTerminal
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTerminal(WmsTerminal wmsTerminal) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsTerminal.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTerminal.getTerminalNo(), "terminalNo", result);
+
+        getStringBuilderPack(wmsTerminal, result);
+
+        return result;
+    }
+
+    /**
+     * 班次信息分页查询条件
+     *
+     * @param wmsShift
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShift(WmsShift wmsShift) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
+
+        getStringBuilderPack(wmsShift, result);
+
+        return result;
+    }
+
+    /**
+     * 班休信息分页查询条件
+     *
+     * @param wmsShiftRest
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result);
+
+        getStringBuilderPack(wmsShiftRest, result);
+
+        return result;
+    }
 }