diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..1414885 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index ef96546..af0d7e3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/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; + } + } + } diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 54b9201..6ea46e8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/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; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index ee72ad6..96c8901 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/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 propertyVirtualList; + + @Transient + @ApiParam(value = "元素约束信息") + private List constraintList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java new file mode 100644 index 0000000..7a6ee13 --- /dev/null +++ b/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 constraintPropertyList; + +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java new file mode 100644 index 0000000..839099e --- /dev/null +++ b/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; +// +//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 0ca9d53..569c3ed 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/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; // } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java new file mode 100644 index 0000000..b3de0fb --- /dev/null +++ b/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 { +//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java new file mode 100644 index 0000000..35e7647 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index ed8e820..0d1249d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/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; + } + } diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index d78860d..6c6aeec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/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; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 122b4a5..8590fbb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/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 :生产数据 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..0db7b7d 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index cb738fd..b07a2d9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/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; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 32bbe43..f423f60 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/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; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index bbb4564..9a1598e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/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); diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 33453b8..8b79c72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/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; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index 929b274..f64bf33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a5b6221..ee6babb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/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() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8827222..8688652 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/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") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index d707fe8..2e3cffa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/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; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index aa19693..793e485 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/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(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) { diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2ffb2ae..bca9cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform