From 9a272f8b6a32378555ab96055cf358de66da91de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 31 Dec 2019 14:39:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG#6755=EF=BC=9A=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E7=9B=91=E5=90=AC=E9=98=9F=E5=88=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A=E5=A6=82=E6=9E=9C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE=E6=88=90?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8E=A8=E9=80=81=E5=BC=82=E5=B8=B8=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=85=A8=E5=B1=80=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E2=80=9C=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E2=80=9D=E4=B9=9F=E6=9C=89=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E9=9A=8F=E9=80=81=E5=BC=82=E5=B8=B8=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 c6caa7a..107503e 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 @@ -41,11 +41,11 @@ public class WmsTransType extends BaseBean { private String transTypeName; @Column(name = "SEQ") - @ApiParam(value = "序号", example = "-1") + @ApiParam(value = "序号") private Integer seq; @Column(name = "AG_ID") - @ApiParam(value = "作业流程", example = "-1") + @ApiParam(value = "作业流程") @JsonSerialize(using = ToStringSerializer.class) private Long agId; @@ -66,10 +66,19 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "PDA图标") private String pdaIcon; + @Column(name = "IS_SEND_ERROR_EMAIL", columnDefinition = "int default 2") + @ApiParam(value = "是否发送异常邮件") + private Integer isSendErrorEmail; + @Transient @ApiParam("菜单URL") private String menuUrl; + @Transient + @ApiParam("交易处理组件调用类") + private String callClass; + + public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } From a1276b5542e24a3fb00ec0c980adf85080ef3f23 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 2 Jan 2020 10:22:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90#1338=20=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=AD=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 81db268..a0ea3cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -31,11 +31,11 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_NO") - @ApiParam(value = "库位代码") + @ApiParam(value = "库位编码") private String locateNo; @Column(name = "PART_NO") - @ApiParam(value = "物料编码") + @ApiParam(value = "物料代码") private String partNo; @Column(name = "PART_NAME_RDD")