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

modules/i3plus-pojo-aps/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

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

@@ -38,7 +38,7 @@ public class CommonEnumUtil {
         HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "i3aps", "高级计划与排程"),
+        APS(28, 8400, 15, "i3aps", "高级计划与排产"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),

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

@@ -11,6 +11,113 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class PtlEnumUtil {
 
     /**
+     * 作业流程类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_ROUTE_TYPE {
+        GEN_TASK(10, "GEN_TASK", "生成任务"),
+        OFF_TAG(20, "OFF_TAG", "灭灯");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_ROUTE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机执行方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_EVENT {
+        TRIGGER(10, "trigger", "触发"),
+        ENTRY(20, "entry", "进入状态"),
+        EXIT(30, "exit", "离开状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTE_EVENT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MODULE_PARAM_TYPE {
+
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_MODULE_PARAM_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
      * 标签类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.util.StringUtils;
 
+import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*;
+
 /**
  * @author Wynne.Lu
  * @date 2020/2/12 17:41
@@ -547,8 +549,11 @@ public class PtlPcnEnumUtil {
 
     }
 
+    /**
+     * 状态机执行方法
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteEvent {
+    public enum ROUTE_EVENT {
         TRIGGER(10, "trigger", "触发"),
         ENTRY(20, "entry", "进入状态"),
         EXIT(30, "exit", "离开状态");
@@ -557,7 +562,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteEvent(int value, String code, String description) {
+        ROUTE_EVENT(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -576,8 +581,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 流程状态
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteState {
+    public enum ROUTE_STATE {
         START(10, "START", "开启流程"),
         TERMINATE(20, "TERMINATE", "终止流程"),
         FINISH(30, "FINISH", "结束流程");
@@ -586,7 +594,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteState(int value, String code, String description) {
+        ROUTE_STATE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -605,6 +613,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 标签类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_TYPE {
         BIN_TAG(10, "库位标签"),
@@ -639,15 +650,18 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 流程状态-触发类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TriggerType {
+    public enum TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TriggerType(int value, String description) {
+        TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -661,8 +675,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 作业流程类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteType {
+    public enum ACTION_ROUTE_TYPE {
         GEN_TASK(10, "GEN_TASK", "生成任务"),
         OFF_TAG(20, "OFF_TAG", "灭灯");
 
@@ -670,7 +687,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteType(int value, String code, String description) {
+        ACTION_ROUTE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -689,6 +706,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 监听消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_PROCESS_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@@ -732,7 +752,7 @@ public class PtlPcnEnumUtil {
             if (StringUtils.isEmpty(code)) {
                 return null;
             }
-            for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) {
+            for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) {
                 if (enums.getCode().equals(code)) {
                     return enums;
                 }
@@ -741,6 +761,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 界面消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@@ -794,7 +817,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * 生成任务actor message type
+     * 任务消息类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GEN_TASK_MESSAGE_TYPE {
@@ -841,8 +864,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * websocket业务类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsBusiType {
+    public enum WS_BUSI_TYPE {
         MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
         INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理");
 
@@ -850,7 +876,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        WsBusiType(int value, String code, String description) {
+        WS_BUSI_TYPE(int value, String code, String description) {
             this.value = value;
             this.description = description;
             this.code = code;
@@ -869,8 +895,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * websocket消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsDataType {
+    public enum WS_DATA_TYPE {
         TEXT(10, "TEXT", "正常信息"),
         EXP_TEXT(20, "EXP_TEXT", "异常信息"),
         TABLE(30, "TABLE", "表格");
@@ -879,7 +908,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        WsDataType(int value, String code, String description) {
+        WS_DATA_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -898,6 +927,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 组件状态类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATUS_TYPE {
         START(10, "START", "开始状态"),

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

@@ -5906,4 +5906,49 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 道口类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_TYPE {
+        WAIT_SEND(10, "收货道口"),
+        HAS_SENDED(20, "发运道口");
+
+        private int value;
+        private String description;
+
+        DOCK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(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-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -21,6 +21,23 @@ import java.util.Map;
 public interface BaseRepository <T, ID extends Serializable> extends JpaRepository<T, ID> {
 
     /**
+     * 清空一级缓存，可能影响service中对象的状态，慎用
+     */
+    void clearSession();
+
+    /**
+     * 清除一级缓存对象，设为游离态
+     * @param t
+     */
+    void detachObject(T t);
+
+    /**
+     * 清除一级缓存集合，设为游离态
+     * @param list
+     */
+    void detachList(List<T> list);
+
+    /**
      * 新增对象<br/>
      * 注意：如果对象id是long，并且为0，则设为
      * 字符串，并且没有赋值，该方法将自动设置为uuid值

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -48,6 +48,24 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         this.snowflakeIdMaker = snowflakeIdMaker;
     }
 
+    public void clearSession(){
+        entityManager.clear();
+    }
+
+    public void detachObject(T t){
+        entityManager.detach(t);
+    }
+
+    //集合设置为游离态
+    public void detachList(List<T> list){
+        if(list != null){
+            for(T t : list) {
+                //设置对象为游离态
+                entityManager.detach(t);
+            }
+        }
+    }
+
     private void setParameter(Query query, String[] propName, Object[] propValue) {
         String name = null;
         Object value = null;

modules/i3plus-pojo-form/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
 
         <dependency>

modules/i3plus-pojo-jobflow/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
 
+
     <profiles>
         <profile>
             <id>dev</id>

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -187,6 +188,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private String areaCodeName;
 
     @Transient
+    @ApiParam("状态-下达，启动，暂停")
+    private List<Integer> statusList;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59")
     public String startTimeStart;

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

@@ -88,6 +88,15 @@ public class QcCheckDataModel {
     @ApiParam(value = "修改日期")
     private String modifyDatetime;
 
+    @ApiParam(value = "工单开始时间")
+    private String startTime;
+
+    @ApiParam(value = "工单结束时间")
+    private String endTime;
+
+    @ApiParam(value = "检测时间")
+    private String checkTime;
+
     public QcCheckDataModel() {
 
     }
@@ -121,4 +130,44 @@ public class QcCheckDataModel {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode
+            , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.partNo = partNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.partName = partName;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.checkType = checkType;
+    }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType, String checkItem, String checkStandard, String checkGuide
+            , String checkFrequency, String checkValue, String checkResult, String sn) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkGuide = checkGuide;
+        this.checkFrequency = checkFrequency;
+        this.checkValue = checkValue;
+        this.checkResult = checkResult;
+        this.sn = sn;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.*;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -177,6 +178,11 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
         }
 
+        // 工单管理，查询下达，启动，暂停状态
+        if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){
+            DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean);
+        }
+
         // 时间段查询
         if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
             DdlPreparedPack.timeBuilder(

modules/i3plus-pojo-platform/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-ptl/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.ptl.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;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ACTION_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("组件参数")
+public class PtlActionModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1015028092547846989L;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private String paramType;
+
+    @Column(name = "DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -40,4 +41,9 @@ public class PtlActionRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型")
     private Integer routeType;
+
+    @Lob
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -37,11 +35,9 @@ public class PtlArea extends BaseBean implements Serializable {
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "AREA_NAME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("区域名称")
     private String areaName;
 

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,26 +32,21 @@ public class PtlAreaActorAction extends BaseBean implements Serializable {
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "ACTOR_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("观察者编码")
     private String actorCode;
 
     @Column(name = "MT_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("消息类型代码")
     private String mtCode;
 
     @Column(name = "OTHER_WHERE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("特定条件")
     private String otherWhere;
 
     @Column(name = "AMG_ID")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("组件集编号")
     private Long amgId;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,31 +32,25 @@ public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "ROUTE_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("流程代码")
     private String routeCode;
 
     @Column(name = "AMG_ID")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("组件集编号")
     private Long amgId;
 
     @Column(name = "AM_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("组件代码")
     private String amCode;
 
     @Column(name = "PARAM_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("参数代码")
     private String paramCode;
 
     @Column(name = "PARAM_VALUE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("参数值")
     private String paramValue;
 

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +11,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author Wynne.Lu
@@ -32,61 +29,49 @@ public class PtlBom extends BaseBean implements Serializable {
 
     @Column(name = "PART_NO")
     @ApiParam("父物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false)
     @ApiParam("父物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "UNIT")
     @ApiParam("计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String unit;
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam("子物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNo;
 
     @Column(name = "ITEM_PART_NAME")
     @ApiParam("子物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartName;
 
     @Column(name = "ITEM_UNIT")
     @ApiParam("子计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemUnit;
 
     @Column(name = "ITEM_QTY")
     @ApiParam("子用量")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private Integer itemQty;
 
     @Column(name = "BOM_NUM")
     @ApiParam("BOM编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String bomNum;
 
     @Column(name = "BOM_VERSION")
     @ApiParam("BOM版本号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String bomVersion;
 
     @Column(name = "EFF_START_TIME")
     @ApiParam("有效起始日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam("有效截止日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String effEndTime;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,42 +33,34 @@ public class PtlControl extends BaseBean implements Serializable {
 
     @Column(name = "CONTROL_NO")
     @ApiParam("控制器编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String controlNo;
 
     @Column(name = "CONTROL_NAME")
     @ApiParam("控制器名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String controlName;
 
     @Column(name = "CONTROL_TYPE")
     @ApiParam("控制器类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE")
     private Integer controlType;
 
     @Column(name = "IP")
     @ApiParam("ip地址")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String ip;
 
     @Column(name = "PORT")
     @ApiParam("端口地址")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String port;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "STATUS")
     @ApiParam("控制器状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS")
     private Integer status;
 
     @Column(name = "FREQUENCY")
     @ApiParam("监听频率")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer frequency;
 
     @Version

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,26 +32,21 @@ public class PtlIf extends BaseBean implements Serializable {
 
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String ifCode;
 
     @Column(name = "IF_NAME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("接口名称")
     private String ifName;
 
     @Column(name = "IF_CONNECT_TYPE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("交互方式")
     private String ifConnectType;
 
     @Column(name = "IF_CLASS")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("接口实现类")
     private String ifClass;
 
     @Column(name = "IF_CALL_TYPE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("接口调用方向")
     private String ifCallType;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,22 +31,18 @@ public class PtlPart extends BaseBean implements Serializable {
 
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam("物料名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "PART_TYPE")
     @ApiParam("物料类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE")
     private String partType;
 
     @Column(name = "UNIT")
     @ApiParam("单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String unit;
 
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,26 +32,21 @@ public class PtlRfid extends BaseBean implements Serializable {
 
     @Column(name = "RFID_CONTROL_NO")
     @ApiParam("RFID读写器代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String rfidControlNo;
 
     @Column(name = "IP")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("IP")
     private String ip;
 
     @Column(name = "PORT")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("端口号")
     private String port;
 
     @Column(name = "AREA_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("区域代码")
     private String areaNo;
 
     @Column(name = "RFID_VALUE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("rfid内容")
     private String rfidValue;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,22 +33,18 @@ public class PtlSection extends BaseBean implements Serializable {
 
     @Column(name = "SECTION_NO")
     @ApiParam("区段编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String sectionNo;
 
     @Column(name = "SECTION_NAME")
     @ApiParam("区段名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String sectionName;
 
     @Column(name = "SECTION_SEQ")
     @ApiParam("区段顺序号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer sectionSeq;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Transient

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,82 +32,66 @@ public class PtlTag extends BaseBean implements Serializable {
 
     @Column(name = "TAG_NO")
     @ApiParam("标签代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer tagNo;
 
     @Column(name = "CONTROL_NO")
     @ApiParam("控制器代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String controlNo;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "SECTION_NO")
     @ApiParam("区段代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String sectionNo;
 
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "BIN_NO")
     @ApiParam("BIN位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String binNo;
 
     @Column(name = "TAG_TYPE")
     @ApiParam("标签类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE")
     private Integer tagType;
 
     @Column(name = "LIGHT_STATUS")
     @ApiParam("亮灯状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS")
     private Integer lightStatus;
 
     @Column(name = "TAG_STATUS")
     @ApiParam("标签状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS")
     private Integer tagStatus;
 
     @Column(name = "LIGHT_MODE")
     @ApiParam("亮灯方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE")
     private Integer lightMode;
 
     @Column(name = "LIGHT_COLOR")
     @ApiParam("亮灯颜色")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR")
     private Integer lightColor;
 
     @Column(name = "IS_BUZZING")
     @ApiParam("是否蜂鸣")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING")
     private Integer isBuzzing;
 
     @Column(name = "MUSIC_TYPE")
     @ApiParam("音乐类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE")
     private Integer musicType;
 
     @Column(name = "DISPLAY_CONTEXT")
     @ApiParam("显示内容")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String displayContent;
 
     @Column(name = "ERROR_COUNT")
     @ApiParam("卡键次数")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer errorCount;
 
     @Column(name = "CUSTOM_ATTRIBUTE")
     @ApiParam("自定义属性")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String customAttribute;
 
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -14,10 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author Wynne.Lu
@@ -37,11 +32,9 @@ public class PtlWindow extends BaseBean implements Serializable {
 
     @Column(name = "WINDOW_NO")
     @ApiParam("界面代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String windowNo;
 
     @Column(name = "WINDOW_NAME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("界面名称")
     private String windowName;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,11 +32,9 @@ public class PtlWindowElement extends BaseBean implements Serializable {
 
     @Column(name = "WINDOW_NO")
     @ApiParam("界面代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String windowNo;
 
     @Column(name = "ELEMENT_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("元素代码")
     private String elementNo;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,21 +32,17 @@ public class PtlWindowElementAttribute extends BaseBean implements Serializable
 
     @Column(name = "WINDOW_NO")
     @ApiParam("界面代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String windowNo;
 
     @Column(name = "ELEMENT_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("元素代码")
     private String elementNo;
 
     @Column(name = "ATTRIBUTE_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("属性代码")
     private String attributeNo;
 
     @Column(name = "ATTRIBUTE_VALUE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("属性值")
     private String attributeValue;
 

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActionRoute;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlActionRouteRepository extends BaseRepository<PtlActionRoute, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -306,4 +306,32 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
         return result;
     }
+
+    /**
+     * 流程查询条件封装
+     *
+     * @param actionRoute
+     * @return
+     */
+    public static DdlPackBean packHqlPtlActionRoute(PtlActionRoute actionRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
+        DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 区域流程查询条件封装
+     * @param areaRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlPtlAreaRoute(PtlAreaRoute areaRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(areaRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(areaRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(areaRoute.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -235,6 +235,15 @@ public class ReportHqlPack {
         return result;
     }
 
+    public static DdlPackBean packHqlBrPojoView(BrPojoView bean){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result);
+        DdlPreparedPack.getNumEqualPack(bean.getViewType(),"viewType",result);
+
+        return result;
+    }
+
     public static DdlPackBean packHqlBrPojoViewAttr(BrPojoViewAttr bean){
         DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
 

modules/i3plus-pojo-sweb/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-wms/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

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

@@ -49,17 +49,17 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private String agDescC;
 
-    @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "INIT_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "初始化组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
-    @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "明细处理组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
-    @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "END_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "结束组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
@@ -82,7 +82,7 @@ public class WmsActionGroup extends BaseBean {
     private Integer isAutoCommit;
 
     @Lob
-    @Column(name = "POSITION")
+    @Column(name = "POSITION", columnDefinition = "TEXT")
     @ApiParam(value = "GOJS位置")
     private String position;
 

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

@@ -100,7 +100,7 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "是否预显示")
     private Integer preShow;
 
-    @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "SHOW_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "回显组件方法ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;

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

@@ -65,17 +65,17 @@ public class WmsActionLogData extends BaseBean {
     private String endTime;
 
     @Lob
-    @Column(name = "IN_PARAMS")
+    @Column(name = "IN_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输入参数")
     private String inParams;
 
     @Lob
-    @Column(name = "OUT_PARAMS")
+    @Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输出参数")
     private String outParams;
 
     @Lob
-    @Column(name = "ERROR_MSG")
+    @Column(name = "ERROR_MSG", columnDefinition = "TEXT")
     @ApiParam(value = "异常信息")
     private String errorMsg;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -53,7 +54,7 @@ public class WmsConfig extends BaseBean {
     private String configValueType;
 
     @Lob
-    @Column(name="CONFIG_VALUE")
+    @Column(name="CONFIG_VALUE", columnDefinition = "TEXT")
     @ApiParam(value ="参数值")
     private String configValue;
 

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

@@ -46,6 +46,6 @@ public class WmsDock extends BaseBean {
 
     @Column(name="DOCK_TYPE")
     @ApiParam("道口类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
-    private String dockType;
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE")
+    private Integer dockType;
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 道口预约信息
@@ -69,4 +70,8 @@ public class WmsDockOrderInfo extends BaseBean {
     @ApiParam("单据号")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String orderNo;
+
+    @Transient
+    @ApiParam("库位代码")
+    private Integer masterStatus;
 }

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

@@ -56,7 +56,7 @@ public class WmsMoveMaster extends BaseBean {
     private String transTypeCode;
 
     @Lob
-    @Column(name = "ERROR_MESSAGE")
+    @Column(name = "ERROR_MESSAGE", columnDefinition = "TEXT")
     @ApiParam(value = "错误信息")
     private String errorMessage;
 

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

@@ -52,12 +52,12 @@ public class WmsPushConfig extends BaseBean{
 
     @Lob
     @ApiParam("查询Hql")
-    @Column(name = "HQL_STR")
+    @Column(name = "HQL_STR", columnDefinition = "TEXT")
     private String hqlStr;
 
     @Lob
     @ApiParam("查询Sql")
-    @Column(name = "SQL_STR")
+    @Column(name = "SQL_STR", columnDefinition = "TEXT")
     private String sqlStr;
 
     @ApiParam("脚本编号")
@@ -66,12 +66,12 @@ public class WmsPushConfig extends BaseBean{
 
     @Lob
     @ApiParam("标题模板")
-    @Column(name = "TITLE_TEMPLATE")
+    @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT")
     private String titleTemplate;
 
     @Lob
     @ApiParam("消息体模板")
-    @Column(name = "CONTENT_TEMPLATE")
+    @Column(name = "CONTENT_TEMPLATE", columnDefinition = "TEXT")
     private String contentTemplate;
 
     @ApiParam("推送类型")

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

@@ -36,7 +36,7 @@ public class WmsPushLog extends BaseBean{
     private String pushTitle;
 
     @Lob
-    @Column(name = "PUSH_CONTENT")
+    @Column(name = "PUSH_CONTENT", columnDefinition = "TEXT")
     @ApiParam("推送内容")
     private String pushContent;
 

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

@@ -60,7 +60,7 @@ public class WmsMoveMasterSnapshot extends BaseBean {
     private String transTypeCode;
 
     @Lob
-    @Column(name = "ERROR_MESSAGE")
+    @Column(name = "ERROR_MESSAGE", columnDefinition = "TEXT")
     @ApiParam(value = "错误信息")
     private String errorMessage;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java

@@ -39,7 +39,7 @@ public class EngineRulePersistence extends BaseBean {
     private String ruleName;
     // 规则的具体内容
     @Lob
-    @Column(name = "RULE_CONTENT")
+    @Column(name = "RULE_CONTENT", columnDefinition = "TEXT")
     private String ruleContent;
     // 规则的描述，包含规则的用法，参数说明等
     @Column(name = "RULE_REMARK", length = 2000)

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

@@ -49,7 +49,7 @@ public class EngineScriptPersistence extends BaseBean {
 
     // 脚本的具体内容
     @Lob
-    @Column(name = "SCRIPT_CONTENT")
+    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
     private String scriptContent;
 
     // 脚本的描述，包含脚本的用法，参数说明等

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

@@ -0,0 +1,23 @@
+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-02
+ * @Modify:
+ **/
+@Data
+@Api("收货追踪地图信息")
+public class SupplyTrackingModel {
+    @ApiParam("供应商经纬度")
+    private String vendorMap;
+
+    @ApiParam("收货仓库经纬度")
+    private String rcWarehouseMap;
+
+}

modules/i3plus-pojo-workflow/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-workflow</artifactId>
     <packaging>jar</packaging>
 
+
     <profiles>
         <profile>
             <id>dev</id>