From 35839db806dcc7e5561677e88a532ff9cacd1290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 13:26:23 +0800 Subject: [PATCH] =?UTF-8?q?BUG#7359=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E5=92=8C=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E6=9B=B4=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 | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 11 +++++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 10 +++------- 3 files changed, 20 insertions(+), 11 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 e618c9d..db1551c 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 @@ -736,6 +736,16 @@ public class WmsEnumUtil { return tmp; } + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index fac11e3..e55cf6c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("关联单号") public String refSrc; - @ApiParam(value = "关联单据业务类型") - private String busiTypeDesc; + @ApiParam(value = "关联单据业务类型代码") + private String busiTypeCode; @ApiParam(value = "计划日期") private String zdate; @@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "创建人") public String createUser; + @ApiParam(value = "关联单据类型") + public String refType; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo, + String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; this.transTypeCode = transTypeCode; this.refSrc = refSrc; - this.busiTypeDesc = busiTypeDesc; + this.busiTypeCode = busiTypeCode; this.zdate = zdate; this.ztime = ztime; this.custNo = custNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ea889c4..ef16765 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - public Integer busiType; - - @Column(name = "BUSI_TYPE_DESC") - @ApiParam("业务类型描述") - public String busiTypeDesc; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam("业务类型代码") + public String busiTypeCode; @Column(name = "TRANS_TYPE_CODE_RDD") @ApiParam("交易类型")