Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 /**
  * @Description :
  * @Reference :
@@ -8,4 +10,40 @@ package cn.estsh.i3plus.pojo.base.enumutil;
  * @Modify:
  **/
 public class MesEnumUtil {
+    /**
+     * MesMethod实体对应的methodType值
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum METHOD_TYPE{
+
+        EXEC(10,"执行方法"),
+        COMPLETE(20,"完成方法");
+
+        private int value;
+        private String description;
+
+        METHOD_TYPE(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;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -41,6 +41,9 @@ public class BfIntercept extends BaseBean {
 
     @Column(name="EXECUTE_CONTENT")
     @ApiParam(value ="执行内容")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Integer executeContent;
+    private String executeContent;
+
+    @Column(name="INTERCEPT_DESCRIPTION")
+    @ApiParam(value ="拦截器描述")
+    private String interceptDescription;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -48,9 +48,9 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器位置")
     private Integer interceptPosition;
 
-    public Integer getInterceptPosition() {
+    public int getInterceptPositionVal() {
         if(this.interceptPosition == null){
-            return null;
+            return 0;
         } else {
             return this.interceptPosition.intValue();
         }
@@ -69,4 +69,22 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器业务结果处理")
     private Integer interceptProcessResult;
 
+    public int getInterceptProcessResultVal(){
+        if(interceptProcessResult == null ){
+            return 0;
+        }
+        return interceptProcessResult.intValue();
+    }
+
+    @Column(name="INTERCEPT_EXECUTE_SORT")
+    @ApiParam(value ="拦截器业务执行顺序")
+    private Integer interceptExecuteSort;
+
+    public int getInterceptExecuteSortVal(){
+        if(interceptExecuteSort == null ){
+            return 0;
+        }
+        return interceptExecuteSort.intValue();
+    }
+
 }

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

@@ -0,0 +1,42 @@
+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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_ACTION")
+@Api("系统业务动作")
+public class MesAction extends BaseBean {
+    @Column(name="ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name="ACTION_NAME")
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @Column(name="ACTION_TYPE")
+    @ApiParam("动作类型")
+    private Integer actionType;
+}

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

@@ -0,0 +1,42 @@
+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;
+
+/**
+ * @Description :mes系统业务动作方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_ACTION_METHOD")
+@Api("系统业务动作方法")
+public class MesActionMethod extends BaseBean {
+    @Column(name="ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name="METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name="SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+}

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

@@ -0,0 +1,42 @@
+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;
+
+/**
+ * @Description :mes系统业务事件
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EVENT")
+@Api("系统业务事件")
+public class MesEvent extends BaseBean {
+    @Column(name="EVENT_CODE")
+    @ApiParam("事件代码")
+    private String eventCode;
+
+    @Column(name="EVENT_NAME")
+    @ApiParam("事件名称")
+    private String eventName;
+
+    @Column(name="EVENT_TYPE")
+    @ApiParam("事件类型")
+    private Integer eventType;
+}

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

@@ -0,0 +1,42 @@
+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;
+
+/**
+ * @Description :mes系统业务事件动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EVENT_ACTION")
+@Api("系统业务事件动作")
+public class MesEventAction extends BaseBean {
+    @Column(name="EVENT_CODE")
+    @ApiParam("事件代码")
+    private String eventCode;
+
+    @Column(name="ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name="SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+}

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

@@ -0,0 +1,46 @@
+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;
+
+/**
+ * @Description :mes系统业务方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_METHOD")
+@Api("系统业务方法")
+public class MesMethod extends BaseBean {
+    @Column(name="METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name="METHOD_NAME")
+    @ApiParam("方法名称")
+    private String methodName;
+
+    @Column(name="CALL_CLASS")
+    @ApiParam("具体实现类")
+    private String callClass;
+
+    @Column(name="METHOD_TYPE")
+    @ApiParam("方法类型")
+    private Integer methodType;
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 动作请求参数
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+public class ActionRequestBean<Obj> implements Serializable {
+
+    @ApiParam("事件代码")
+    public String eventCode;
+
+    @ApiParam("单个结果")
+    public Obj resultObject;
+
+    @ApiParam("List请求集")
+    public List<Obj> resultList;
+
+    @ApiParam("Map请求集")
+    public Map<String, Object> resultMap;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionMethodRepository.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.MesActionMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionMethodRepository extends BaseRepository<MesActionMethod, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.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.MesAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionRepository extends BaseRepository<MesAction, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.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.MesEventAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventActionRepository extends BaseRepository<MesEventAction, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.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.MesEvent;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.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.MesMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
+}

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

@@ -160,6 +160,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
 
+    @Transient
+    @ApiParam("生产日期")
+    public String dateCode;
+
+    @ApiParam(value = "散件移库输入移库数量")
+    @Transient
+    public Double inputMoveQty;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }