diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
index 3935866..aa07354 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
+++ b/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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java
index 272f6d3..5ffa2de 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java
+++ b/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")
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index de9a06f..0d23467 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/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");
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 0fe51eb..f4011bf 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/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,14 @@ 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_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
-		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
-        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
+        VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
+        VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
+        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PURCHASE_RC(450, "KT_PURCHASE_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", "坤泰拣货");
 
         private int value;
         private String code;
@@ -826,8 +826,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_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
+        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "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 +904,16 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
-        , CLOSE(40, "已关闭");
+        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
+        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 +921,10 @@ public class WmsEnumUtil {
             return value;
         }
 
+        public int getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -936,13 +942,24 @@ 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;
+        }
+    }
 
 
     /**
      * 业务表：库存条码状态
-     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -952,7 +969,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        SCRAP(70, "报废"),
+        //SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -995,6 +1012,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 单据是否生成任务状态
      */
@@ -1052,12 +1070,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 +1383,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 质检业务状态
      */
@@ -1436,6 +1455,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 质检业务类型
      */
@@ -1476,6 +1496,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 作业记录参数状态
      */
@@ -2339,13 +2360,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 +2876,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 +4107,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;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
similarity index 68%
rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java
rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
index 02b19fc..da30dc1 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java
+++ b/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")
-    @ApiParam("SOP名称")
-    private String sopName;
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
 
-    @Column(name = "SOP_URL")
-    @ApiParam("SOP_URL")
-    private String sopUrl;
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
 
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("组名")
     private String groupName;
 
-    @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("FILE_ORIGIN_NAME")
+    @Transient
+    @ApiParam("文件原名")
     private String fileOriginName;
 
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
+    @Transient
+    @ApiParam("文件大小")
     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;
+    @Transient
+    @ApiParam("文件类型名称")
+    private String fileType;
 
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
+    @Transient
+    @ApiParam("同步标记")
     private Integer syncTag = 0;
+
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java
new file mode 100644
index 0000000..eea9e56
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java
new file mode 100644
index 0000000..ac086ba
--- /dev/null
+++ b/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;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
similarity index 68%
rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java
rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
index 9f76128..103e176 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java
+++ b/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> {
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java
new file mode 100644
index 0000000..16383bc
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java
new file mode 100644
index 0000000..02911ac
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
index 55f69b2..5b731c2 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/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;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
similarity index 68%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
index 0f512b1..b7aa754 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java
+++ b/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")
-    @ApiParam("SOP名称")
-    private String sopName;
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
 
-    @Column(name = "SOP_URL")
-    @ApiParam("SOP_URL")
-    private String sopUrl;
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
 
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("组名")
     private String groupName;
 
-    @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("FILE_ORIGIN_NAME")
+    @Transient
+    @ApiParam("文件原名")
     private String fileOriginName;
 
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
+    @Transient
+    @ApiParam("文件大小")
     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;
+    @Transient
+    @ApiParam("文件类型名称")
+    private String fileType;
 
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
+    @Transient
+    @ApiParam("同步标记")
     private Integer syncTag = 0;
 
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java
new file mode 100644
index 0000000..c1d30dd2
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsopFileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsopFileModel.java
new file mode 100644
index 0000000..bfe428f
--- /dev/null
+++ b/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;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
index d58ea90..b676a59 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
+++ b/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;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java
index 229352c..62cb029 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java
+++ b/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;
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java
index f5d38f5..6146fe6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java
+++ b/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;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
similarity index 60%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
index 367ef81..f255d1e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java
+++ b/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> {
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.java
new file mode 100644
index 0000000..d909e3f
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 9f115b3..a79ca12 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -416,14 +416,14 @@ public class MesHqlPack {
      * @param mesWcCheck
      * @return
      */
-    public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode);
+    public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(wcCheck, organizeCode);
 //        DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wcCheck.getCheckType(), "checkType", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getCheckObj(), "checkObj", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getCheckItem(), "checkItem", packBean);
         return packBean;
     }
 
@@ -470,31 +470,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(mesESOP.getRouteCode(), "routeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
-        DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
-        DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
+        DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
         return packBean;
     }
 
-    public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
-        if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) {
-            DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesESOP.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
-        }
-
+    public static DdlPackBean getEsop(MesEsop esop, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(esop, organizeCode);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(esop.getPartNo(), "partNo", packBean);
         return packBean;
     }
 
@@ -1397,6 +1392,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;
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
index 1ea54c2..336e497 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
+++ b/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位置")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
index 2a37527..382f210 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
+++ b/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;
 
-    /**
-     * 触发源:
-     * 10=扫描枪,
-     * 20=提交按钮,
-     * 30=重置按钮,
-     * 40=查看明细,
-     * 50=明细(删除),
-     * 60=明细（清空）
-     */
+    @ApiParam("业务单号")
+    public String refSrc;
+
     @ApiParam("触发源")
     public int sourceOwner;