From 736087852e90f601408143008aab40182a0ad184 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 9 Apr 2021 17:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 8 +++++ .../estsh/i3plus/pojo/aps/bean/PriorityType.java | 37 ++++++++++++++++++++++ .../aps/repository/PriorityTypeRepository.java | 9 ++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 25 +++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 62943f9..738d2ad 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -97,7 +98,7 @@ public class BaseOrder extends BaseAPS { @Column(name="VALID_ORDER") @ApiParam(value ="有效订单") @FieldAnnotation(modify = false) - private Integer validOrder = CommonEnumUtil.VALID; + private ApsEnumUtil.ORDER_VALID_TYPE validOrder = ApsEnumUtil.ORDER_VALID_TYPE.VALID; @Column(name="DELAY") @ApiParam(value ="是否延期") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 7f1f95d..cb0d6e4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -54,6 +54,14 @@ public class ImportField extends BaseAPS { @FieldAnnotation(defaultValue = "255") private Integer maxLength; + @Column(name="VALIDATOR") + @ApiParam("校验表达式") + private String validator; + + @Column(name="VALIDATOR_MESSAGE") + @ApiParam("校验表达式报错") + private String validatorMessage; + @Column(name="RELATION_TABLE") @ApiParam("关联表名") private String relationTable; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java new file mode 100644 index 0000000..ec04938 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :优先级 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-08 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_PRIORITY_TYPE") +@Api("优先级") +public class PriorityType extends BaseAPS { + private static final long serialVersionUID = 445577901076659576L; + + @Column(name="CODE") + @ApiParam(value ="标识") + @FieldAnnotation(mainkey = true) + private String code; + + @Column(name="VALUE") + @ApiParam(value ="值") + private Integer value; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java new file mode 100644 index 0000000..4fa95d3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.PriorityType; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface PriorityTypeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index c50c528..dfe9ddf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -81,6 +81,31 @@ public class ApsEnumUtil { } /** + * 物料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_VALID_TYPE { + VALID("VALID", "有效"), + INVALID("INVALID", "无效"); + + private String value; + private String description; + + ORDER_VALID_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 物料报表统计类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT)