From af6083ddff826e8e3f3ffd9c3154f16915f1c319 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:17:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 9 +++++ .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 43 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index bc924e2..873e21d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1259,6 +1259,15 @@ public class CommonEnumUtil { return tmp; } + public static LOG_DETAIL_SHOW_TYPE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 13b076e..f8581ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1190,4 +1190,47 @@ public class ImppEnumUtil { return tmp; } } + + /** + * 日志存储 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_STORAGE { + MONGO(1, "MongoDB"), + ELASTICSEARCH(2, "Elasticsearch"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private LOG_STORAGE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static LOG_STORAGE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } } From d8d47541df15504923a472000ac537b8a900ec75 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:18:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index fa78d8b..20d9181 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -77,6 +77,14 @@ public class BrPojoFilterAttr extends BaseBean { @ApiParam(value ="属性显示名称") private String attrName; + @Column(name = "VIEW_ATTR_CONTROL_TYPE") + @ApiParam(value = "控件类型") + private Integer viewAttrControlType; + + @Column(name = "VIEW_ATTR_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String viewAttrControlRefKey; + @Column(name="ATTR_SHOW") @ApiParam(value ="属性是否显示") private Integer attrShow; From 989e05c64c8e89b53aeefa70c3a0a3098e389cce Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Jan 2020 15:02:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=907168=20=E5=AF=B9=E4=BA=8E=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=A0=87=E7=AD=BE=E8=A1=A5=E6=89=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8F=91=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E7=9A=84ship-to=E8=8E=B7=E5=8F=96=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0=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/WmsDocMovementSn.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index f3c25d0..d812406 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -118,8 +118,4 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; - - @Transient - @ApiParam("打印模板名称") - private String templateName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 422cf79..0e5b1f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -282,6 +282,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "是否最早批次") public String isFifo; + @Transient + @ApiParam("打印模板名称") + private String templateName; + public WmsStockSn() { } From fe809e2effe6bc536d1ee6d1cd4d6b9e8fe7d4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 3 Jan 2020 17:51:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=81=97=E6=BC=8F=E7=9A=84=E5=BE=85=E5=A4=84=E7=90=86=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95JOB=EF=BC=9A=E5=A4=84=E7=90=86=E5=91=A8?= =?UTF-8?q?=E6=9C=9F=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?JOB=E5=8F=82=E6=95=B0+=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=9C=A8=E6=94=BE=E5=85=A5=E2=80=9CIS=5FCOMMIT=5FREF?= =?UTF-8?q?=5FMOVE=E2=80=9D=E7=BC=93=E5=AD=98=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA+?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E2=80=9C=E6=98=AF=E5=90=A6=E6=8E=A8=E9=80=81=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=82=AE=E4=BB=B6=E2=80=9D=E7=94=A8=E4=BA=8E=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=A4=84=E7=90=86=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index b84e932..6bfdd58 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -19,4 +19,9 @@ public class WmsJobParamModel implements Serializable { private List zonesNoList;//存储区编号 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 + private Integer minuteDiff;//处理周期(分钟) + + public int getMinuteDiffVal() { + return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 9d502de..36ce2dc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -96,6 +96,9 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } + public int getIsCommitRefMoveVal() { + return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + } public int getAutoInitVal() { return this.autoInit == null ? 0 : this.autoInit.intValue(); }