From 773f56b577cb9a091985b29ccd3ecb59c7431dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 17 Dec 2019 13:42:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?TASK=5FINO=5FSTATUS=2020=E5=92=8C30?= =?UTF-8?q?=E7=9A=84=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=90=8D=E4=B8=A5=E9=87=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AE=B9=E6=98=93=E8=AF=AF=E5=AF=BC?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 afd662b..a76b0fc 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 @@ -925,8 +925,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"), - FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); + CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"), + FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); private int value; private int code; From 0c01ffb230e45e4c58b0f8060601e831bf0276e0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Dec 2019 14:57:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=9C=A8=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=98=BE=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E6=9D=A5=E6=BA=90=EF=BC=8C=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=20=E3=80=916978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 5703187..6711728 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -205,6 +205,10 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printStatus; + @Transient + @ApiParam("优先级") + private String priority; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; }