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

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

@@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -129,6 +130,9 @@ public class WorkPlan extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long furnacePlanId;
 
+    @Transient
+    private boolean hasCominbed = false;
+
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java

@@ -28,4 +28,5 @@ public class ReportPager extends APSPager {
     private Date end;       // 统计结束时间
     private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
     private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔
+    private String shiftCode;
 }

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

@@ -799,7 +799,8 @@ public class WmsEnumUtil {
         PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"),
         INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
         CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
-        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废");
+        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
+        PROD_SCRAP(680, "PROD_SCRAP", "生产报废");
         private int value;
         private String code;
         private String description;

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

@@ -185,6 +185,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码打印状态名称")
     private String printStatusName;
 
+    @Transient
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Transient
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Transient
+    @ApiParam("电检结果")
+    private String electricResult;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -58,7 +58,6 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
     @ApiParam("流程")
     private String routeCOde;
 
-    @Lob
     @Column(name = "MESSAGE")
     @ApiParam("异常信息")
     private String message;

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,47 @@ import javax.script.CompiledScript;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
+@Table(name = "SCRIPT_PERSISTENCE", indexes = {
+        @Index(columnList = "SCRIPT_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @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;
+    private Object compiledScript;
-
-    public EngineScriptPersistence() {
-    }
 
     // 构造方法，便于批量创建数据
-    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;

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.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.*;
+
+/**
+ * 脚本持久化历史记录
+ *
+ * @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 {
+
+    private static final long serialVersionUID = 7201021903118622899L;
+    // 脚本调用的唯一编号，例如：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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.engine.script;
+
+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 Boolean error;
+
+    @ApiParam("日志内容")
+    private String context;
+
+    @ApiParam("日志打印日期")
+    private String printDate;
+}

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

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

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> {
     /**
      * 按照工厂代码和脚本编号查询脚本实体对象

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -64,6 +64,10 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板参数拼接")
     private String paramsPack;
 
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
     @Transient
     @ApiParam(value ="模板id对应的模板参数")
     private List<SysLabelTemplateParam> labelTemplateParamList;

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

@@ -384,6 +384,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String refSrc;
 
+    @Transient
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+
 
     public WmsDocMovementDetails () {