diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java
deleted file mode 100644
index 9f4da0d..0000000
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.pcn.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.script.EngineScriptPersistence;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Description : 脚本引擎持久化类
- * @Reference :
- * @Author : Rock.Yu
- * @CreateDate : 2019-04-16 09:53
- * @Modify:
- **/
-@Repository
-public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
-    /**
-     * 按照工厂代码和脚本编号查询脚本实体对象
-     * @param organizeCode 工厂代码
-     * @param scriptNo 脚本编号
-     * @return 脚本实体对象
-     */
-    EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
-
-    /**
-     * 按照脚本编号查询脚本实体对象
-     * @param scriptNo 脚本编号
-     * @return 脚本实体对象
-     */
-    EngineScriptPersistence findByScriptNo(String scriptNo);
-
-    /**
-     * 查找所有的脚本语言类型
-     * @return 数据库中已经存在的脚本语言类型
-     */
-    @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
-    List findGroupByLanguageType();
-}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java
deleted file mode 100644
index 8cfd100..0000000
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.pcn.script;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.*;
-
-/**
- * 脚本持久化实体类
- *
- * @author Rock.Yu
- * @since 2019-03-18 14:22
- */
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
-@Api("系统动态脚本")
-public class EngineScriptPersistence extends BaseBean {
-    private static final long serialVersionUID = 7893111140559759490L;
-    // 脚本调用的唯一编号，例如：WMS_PDA_0001
-    @Column(name = "SCRIPT_NO", length = 50)
-    private String scriptNo;
-
-    // 脚本的中文名称
-    @Column(name = "SCRIPT_NAME", length = 50)
-    private String scriptName;
-
-    // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
-    @Column(name = "SCRIPT_TYPE")
-    private Integer scriptType;
-
-    // 脚本编写的语言
-    // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
-    @Column(name = "LANGUAGE_TYPE")
-    private Integer languageType;
-
-    // 脚本的具体内容
-    @Lob
-    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
-    private String scriptContent;
-
-    // 脚本的描述，包含脚本的用法，参数说明等
-    @Column(name = "SCRIPT_REMARK", length = 2000)
-    private String scriptRemark;
-
-    // 编译后的脚本内容，通过预编译加快脚本的运行速度
-    @Transient
-    private Object compiledScript;
-
-    // 构造方法，便于批量创建数据
-    public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType,
-                                   String scriptContent, String scriptRemark) {
-        this.id = id;
-        this.scriptNo = scriptNo;
-        this.scriptName = scriptName;
-        this.scriptType = scriptType;
-        this.languageType = languageType;
-        this.scriptContent = scriptContent;
-        this.scriptRemark = scriptRemark;
-    }
-}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java
index f61a055..eac13e5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java
@@ -4,11 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
-import javax.script.CompiledScript;
 
 /**
  * 脚本持久化实体类
@@ -20,39 +20,44 @@ import javax.script.CompiledScript;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "SCRIPT_PERSISTENCE")
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
+    private static final long serialVersionUID = 7893111140559759490L;
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
     private String scriptNo;
+
     // 脚本的中文名称
     @Column(name = "SCRIPT_NAME", length = 50)
     private String scriptName;
+
     // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
     @Column(name = "SCRIPT_TYPE")
-    private int scriptType;
+    private Integer scriptType;
+
     // 脚本编写的语言
     // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
     @Column(name = "LANGUAGE_TYPE")
-    private int languageType;
+    private Integer languageType;
+
     // 脚本的具体内容
     @Lob
-    @Column(name = "SCRIPT_CONTENT")
+    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
     private String scriptContent;
+
     // 脚本的描述，包含脚本的用法，参数说明等
     @Column(name = "SCRIPT_REMARK", length = 2000)
     private String scriptRemark;
+
     // 编译后的脚本内容，通过预编译加快脚本的运行速度
     @Transient
-    private CompiledScript compiledScript;
-
-    public EngineScriptPersistence() {
-    }
+    private Object compiledScript;
 
     // 构造方法，便于批量创建数据
-    public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType,
+    public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType,
                                    String scriptContent, String scriptRemark) {
         this.id = id;
         this.scriptNo = scriptNo;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java
similarity index 97%
rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java
index 4cd3e31..80c332c 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.pcn.script;
+package cn.estsh.i3plus.pojo.mes.engine.script;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java
similarity index 90%
rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java
index a21dfb0..2a6ab3e 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.pcn.script;
+package cn.estsh.i3plus.pojo.mes.engine.script;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java
similarity index 66%
rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java
index 1274e35..f7cb666 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java
@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.mes.pcn.repository;
+package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.script.EngineScriptPersistenceHistory;
+import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistenceHistory;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java
index db00b1d..dc15bb2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @CreateDate : 2019-04-16 09:53
  * @Modify:
  **/
+@Repository
 public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
     /**
      * 按照工厂代码和脚本编号查询脚本实体对象