diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index bc7bf48..d88aa4a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; /** * @Description : @@ -868,45 +869,6 @@ public class CommonEnumUtil { } /** - * 数学表达式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MATH_SYMBOL { - GREATER(1, ">"), - GREATER_OR_EQUAL(2, ">="), - LESS(3, "<"), - LESS_OR_EQUAL(4, "<="), - EQUAL(5, "="), - NOT_EQUAL(6, "<>"); - - private int value; - private String description; - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - private MATH_SYMBOL(int value, String description) { - this.value = value; - this.description = description; - } - - 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; - } - } - - /** * Content-Type */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1092,4 +1054,5 @@ public class CommonEnumUtil { public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); // 数据未删除的静态常量 public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index eaee583..a46cbea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -138,6 +138,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Column(name="REF_UNIT") + @ApiParam("关联单位") + public String refUnit; + + @Column(name="REF_QTY") + @ApiParam("关联数量") + public Double refQty; + @Column(name = "SRC_AREA_NO") @ApiParam("来源库存地") public String srcAreaNo;