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

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -1,9 +1,6 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
 
 /**
  * @Description : 模块表单枚举类
@@ -825,6 +822,170 @@ public class BlockFormEnumUtil {
 
 
     /**
+     * 元素软删状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_DELETE_WEAK_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_DELETE_WEAK_STATUS(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 valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static ELEMENT_DELETE_WEAK_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 元素软删状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_VALID_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_VALID_STATUS(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 valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static ELEMENT_VALID_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
      * 属性字段排序规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1925,4 +2086,51 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 元素约束类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_CONSTRAINT_TYPE {
+        UNIQUE(10,  "唯一约束");
+        // 后续扩展联合主键
+//        PRIMARY_KEY(20,  "主键约束")
+
+        private int value;
+        private String description;
+
+        private ELEMENT_CONSTRAINT_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;
+        }
+
+        public static ELEMENT_CONSTRAINT_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -120,6 +120,10 @@ public class BfDataObjectProperty extends BaseBean {
     private transient Integer isDeleteWeaklyProperty;
 
     @Transient
+    @ApiParam(value ="是否为唯一约束字段")
+    private transient Integer isUniqueProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 

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

@@ -142,4 +142,8 @@ public class BfElement extends BaseBean {
     @Transient
     @ApiParam(value = "元素虚拟属性信息")
     private List<BfElementPropertyVirtual> propertyVirtualList;
+
+    @Transient
+    @ApiParam(value = "元素约束信息")
+    private List<BfElementConstraint> constraintList;
 }

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 元素约束
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-03-12 13:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BF_ELEMENT_CONSTRAINT")
+@Api(value = "元素约束", description = "元素约束")
+public class BfElementConstraint  extends BaseBean {
+
+    @Column(name = "ELEMENT_ID")
+    @ApiParam(value = "对象元素ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
+    @Column(name = "CONSTRAINT_NAME")
+    @ApiParam(value = "约束名称")
+    private String constraintName;
+
+    @Column(name = "CONSTRAINT_TYPE")
+    @ApiParam(value = "约束类型")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ELEMENT_CONSTRAINT_TYPE.class)
+    private Integer constraintType;
+
+    @Column(name = "CONSTRAIN_PROPERTY_NAME_RDD")
+    @ApiParam(value = "约束属性名称")
+    private String constrainPropertyNameRdd;
+
+    @Lob
+    @Column(name = "CONSTRAIN_PROPERTY_IDS")
+    @ApiParam(value = "约束属性ids")
+    private String constrainPropertyIds;
+
+//    @Transient
+//    @ApiParam(value = "元素约束属性信息")
+//    private List<BfElementConstraintProperty> constraintPropertyList;
+
+}

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

@@ -0,0 +1,56 @@
+//package cn.estsh.i3plus.pojo.form.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//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 : 元素约束属性
+// * @Reference :
+// * @Author : yunhao
+// * @CreateDate : 2020-03-12 13:36
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY")
+//@Api(value = "元素约束属性", description = "元素约束属性")
+//public class BfElementConstraintProperty extends BaseBean {
+//
+//    @Column(name = "CONSTRAINT_ID")
+//    @ApiParam(value = "约束ID", example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long constraintId;
+//
+//    @Column(name = "ELEMENT_PROPERTY_ID")
+//    @ApiParam(value = "元素属性ID", example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long elementPropertyId;
+//
+//    @Column(name = "DATA_OBJECT_PROPERTY_ID")
+//    @ApiParam(value = "数据对象属性ID", example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long dataObjectPropertyId;
+//
+//    @Column(name="PROPERTY_NAME")
+//    @ApiParam(value ="元素属性名称")
+//    private String propertyName;
+//
+//    @Column(name="PROPERTY_CODE_RDD")
+//    @ApiParam(value ="元素属性代码")
+//    private String propertyCodeRdd;
+//
+//}

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

@@ -144,6 +144,11 @@ public class BfElementProperty extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private BfDataObjectProperty objectProperty;
 
+    @Transient
+    @ApiParam(value ="是否为唯一约束字段")
+    private transient Integer isUniqueProperty;
+
+
 //    public Object getFormValue() {
 //        return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;
 //    }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java

@@ -0,0 +1,14 @@
+//package cn.estsh.i3plus.pojo.form.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty;
+//
+///**
+// * @Description : 元素约束属性
+// * @Reference :
+// * @Author : yunhao
+// * @CreateDate : 2019-03-21 20:27
+// * @Modify:
+// **/
+//public interface BfElementConstraintPropertyRepository extends BaseRepository<BfElementConstraintProperty, Long> {
+//}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.form.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.form.bean.BfElementConstraint;
+
+/**
+ * @Description : 元素约束
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-03-21 20:27
+ * @Modify:
+ **/
+public interface BfElementConstraintRepository extends BaseRepository<BfElementConstraint, Long> {
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -352,4 +352,35 @@ public final class FormHqlPack {
 
         return result;
     }
+
+    /**
+     * 元素约束复杂查询
+     * @param bfElementConstraint 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElementConstraint.getConstraintType(), "constraintType", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 元素约束检查重复
+     * @param bfElementConstraint 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -126,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("OPC值")
-    private String opcValue;
+    private List opcValue;
 }

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

@@ -14,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description :生产数据

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -92,4 +92,8 @@ public class PtlAreaTask extends BaseBean implements Serializable {
     @Column(name = "qty")
     @ApiParam("数量")
     private Integer qty;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java

@@ -47,4 +47,22 @@ public class LightOnModel implements Serializable {
     @ApiParam("状态")
     private Integer status;
 
+    @ApiParam("控制器ip")
+    private String ip;
+
+    @ApiParam("端口")
+    private String port;
+
+    @ApiParam("控制器编号")
+    private String controlNo;
+
+    public LightOnModel() {
+    }
+
+    public LightOnModel(Integer tagNo, String ip, String port, String controlNo) {
+        this.tagNo = tagNo;
+        this.ip = ip;
+        this.port = port;
+        this.controlNo = controlNo;
+    }
 }

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

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.ptl.bean.*;
 import org.springframework.util.StringUtils;
@@ -228,10 +227,10 @@ public class PtlHqlPack {
     public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result);
-        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart())
-                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) {
+        DdlPreparedPack.getStringLikerPack(ptlAreaTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringLikerPack(ptlAreaTask.getPartNo(), "partNo", result);
+        if (!StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeStart())
+                || !StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
@@ -253,10 +252,10 @@ public class PtlHqlPack {
     public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result);
-        DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart())
-                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) {
+        DdlPreparedPack.getStringLikerPack(ptlMainTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringLikerPack(ptlMainTask.getPartNo(), "partNo", result);
+        if (!StringUtils.isEmpty(ptlMainTask.getCreateDateTimeStart())
+                || !StringUtils.isEmpty(ptlMainTask.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
@@ -276,15 +275,16 @@ public class PtlHqlPack {
     public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
-        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart())
-                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) {
+        DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
+        DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
+        if (!StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeStart())
+                || !StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd()
                     , "createDatetime", result, true);
         }
         DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result);
         DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getStatus(), "status", result);
         DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result);
         DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -311,4 +311,14 @@ public class WmsDocMovementDetails extends BaseBean {
         this.orderNo = orderNo;
     }
 
+    public WmsDocMovementDetails (String orderNo,String partNo,Double qty, Double pickQty, int itemStatus, String createDatetime, String modifyDatetime) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.itemStatus = itemStatus;
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+    }
+
 }

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

@@ -65,8 +65,10 @@ public class WmsFurniture extends BaseBean {
     public WmsFurniture() {
     }
 
-    public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo,
+    public WmsFurniture(Long id,String organizeCode, String whNo, String zoneNo, String typeCode, String furnitureNo,
                         Integer isSaveGoods, String position, Integer storey, Integer fntCol) {
+        this.id = id;
+        this.organizeCode = organizeCode;
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.typeCode = typeCode;

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

@@ -178,7 +178,7 @@ public class WmsLocate extends BaseBean {
 
     @Transient
     @ApiParam(value = "移动频次")
-    private Integer frequency;
+    private Long frequency;
 
     @Transient
     @ApiParam(value = "库龄")
@@ -197,7 +197,8 @@ public class WmsLocate extends BaseBean {
         this.partQty=partQty;
         this.locateNo=locateNo;
     }
-    public WmsLocate(String locateNo,Integer frequency,String organizeCode,
+    //3D仓库-库位移动频率热力图
+    public WmsLocate(String locateNo,Long frequency,String organizeCode,
                      String whNo,String zoneNo,String furnitureNo,
                      Integer x,Integer y,Integer z){
         this.locateNo=locateNo;
@@ -210,6 +211,7 @@ public class WmsLocate extends BaseBean {
         this.y=y;
         this.z=z;
     }
+    //3D仓库-库龄热力图
     public WmsLocate(String locateNo,String age,String organizeCode,
                      String whNo,String zoneNo,String furnitureNo,
                      Integer x,Integer y,Integer z){
@@ -244,8 +246,8 @@ public class WmsLocate extends BaseBean {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
 
-    public Integer getFrequencyVal() {
-        return this.frequency == null ? 0 : this.frequency.intValue();
+    public Long getFrequencyVal() {
+        return this.frequency == null ? 0 : this.frequency.longValue();
     }
 
     public Integer getLcLengthVal() {

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

@@ -33,6 +33,7 @@ public class WmsSnOperateRecord extends BaseBean {
 
     @Column(name = "SN")
     @ApiParam(value = "条码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String sn;
 
     @Column(name = "LINE_CODE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -54,7 +54,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
     /**
      * 来源表的查询条件
      */
-    @Column(name = "SRC_WHERE", length = 255)
+    @Column(name = "SRC_WHERE", length = 500)
     public String srcWhere;
 
     /**

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
@@ -546,7 +547,7 @@ public class WmsHqlPack {
             DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result);
         }
         if (wmsLocate.getLocateNoArr() != null) {
-            DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);
+            DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result);
         }
 
         // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
@@ -1304,6 +1305,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
+            wmsStockSn.setQualityDateTimeStart("");
+        }
+        if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeEnd())) {
+            wmsStockSn.setQualityDateTimeEnd("");
+        }
         DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(),
                 "qualityDate", result, false,false);
         if (wmsStockSn.getIsValid() != null) {

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>