From 47a7a0a9a3b65bd8ef6842946dd4044a0f663b07 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 1 Jun 2020 09:06:40 +0800 Subject: [PATCH] =?UTF-8?q?BH=20=E9=9C=80=E6=B1=82=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 065dce6..5fcd724 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 @@ -6456,7 +6456,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FG_INSTOCK_SN_TYPE { - NORMAL(10, "NORMAL", "实物条码(正常)"), + NORMAL(10, "NORMAL", "正常"), FIRST_PIECE(20, "FIRST_PIECE", "首件"), MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), TAIL_PIECE(40, "TAIL_PIECE", "末件"); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index b63ebca..9ee5464 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存初始化表 @@ -114,4 +115,13 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn(required = false) private Integer seqNo; + @Transient + @ApiParam(value = "确认标志") + private boolean confirm; + + + @Transient + @ApiParam(value = "物料-1，器具-2") + public String intiType; + }