解决合并冲突问题

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

@@ -46,6 +46,10 @@ public class MesDataAuth extends BaseBean implements Serializable {
     @ApiParam("数据对象")
     private String dataObject;
 
+    @Column(name = "DATA_OBJECT_FULL_NAME")
+    @ApiParam("数据对象全称")
+    private String dataObjectFullName;
+
     @Column(name = "DATA_OBJECT_NAME")
     @ApiParam("数据对象名称")
     private String dataObjectName;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.engine.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 脚本持久化历史记录
+ *
+ * @author jason.niu
+ * @since 2020-04-29
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SCRIPT_PERSISTENCE_HISTORY")
+@Api("系统动态脚本")
+public class EngineScriptPersistenceHistory extends BaseBean {
+
+    // 脚本调用的唯一编号，例如：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;
+
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 脚本执行日志
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-29
+ * @Modify:
+ **/
+@Data
+@Api("插件日志")
+public class ScriptLoggerModel {
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("用户编号")
+    private String userCode;
+
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @ApiParam("日志内容")
+    private String context;
+
+    @ApiParam("日志打印日期")
+    private String printDate;
+}

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EngineScriptPersistenceHistoryRepository extends BaseRepository<EngineScriptPersistenceHistory, Long> {
+}