From 950303231fe96bbf2b0fa1c28f513ad717e5f252 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 6 Dec 2018 11:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) 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 a5b40ae..ea7894b 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 @@ -1811,7 +1811,8 @@ public class WmsEnumUtil { LOCATE_SEQ("LOCATE_SEQ", "库位序号"), OP_SEQ("OP_SEQ", "作业类型序号"), TRAN_SEQ("TRAN_SEQ", "交易类型序号"), - STEP_SEQ("STEP_SEQ", "步骤调用序号"); + STEP_SEQ("STEP_SEQ", "步骤调用序号"), + ORDER_NO("ORDER_NO", "盘点主表序号"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 246524b..a9dde28 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 交易类型表 @@ -42,9 +43,13 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "序号", example = "-1") private Integer seq; - @Column(name = "PROG_CODE") - @ApiParam(value = "处理程序", example = "-1") + @Column(name = "AG_ID") + @ApiParam(value = "作业流程", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long agId; + @Transient + @ApiParam("中文流程名称") + private String agNameC; + }