diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index aee1f19..633422a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2928,4 +2928,38 @@ public class WmsEnumUtil { return value; } } + + /** + * 条码类型 10=实物条码,20=虚拟条码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_STOCK_TYPE { + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"); + + private int value; + private String description; + + WMS_STOCK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 1fdbf92..2e6e363 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -109,9 +109,8 @@ public class WmsStockSn extends BaseBean { private String unit; @Column(name = "QTY") - @ColumnDefault("0") @ApiParam(value = "数量", example = "0") - private Double qty; + private Double qty = 0d; /** * 质量状态:10=合格,20=不合格,30=隔离 @@ -155,6 +154,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "工作中心代码") private String workCenterCode; + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型", example = "10") + private Integer snType = 10; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd;