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 a4a7078..edb5b35 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 @@ -6506,4 +6506,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FG_INSTOCK_SN_TYPE { + NORMAL(10, "NORMAL", "实物条码(正常)"), + FIRST_PIECE(20, "FIRST_PIECE", "首件"), + MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), + TAIL_PIECE(40, "TAIL_PIECE", "末件"); + + private int value; + private String code; + private String description; + + FG_INSTOCK_SN_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 89184cf..2a4d16b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -100,4 +100,19 @@ public class WmsFGInStock extends BaseBean { @Column(name="MFG_LOG_NO") @ApiParam("生产批次") public String mfgLogNo; + + @Column(name = "BATCH_NO") + @ApiParam("batch号") + private String batchNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("箱条码") + private String packageNo; + + /** + * 条码类型:10=实物条码(正常),20=首件,30=中件,40=末件 + */ + @Column(name = "SN_TYPE") + @ApiParam("条码类型") + private Integer snType; }