From af863ec5a1333b3a07de21137ecd39f776ac0547 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 4 Dec 2018 13:53:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 010ac3e..2696427 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 @@ -1231,7 +1231,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_TYPE { - FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验,"), SHIPMENTS(40, "出货检验,"); + FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验"); private int value; private String description; @@ -1267,9 +1267,9 @@ public class WmsEnumUtil { public enum QC_INFO_STATUS { CREATE(1, "新建"), FINISH(5, "待处理"), - FAIL(10, "已完成,"), - CLOSE(90, "已关闭,"), - CANCEL(91, "已取消,"); + FAIL(10, "已完成"), + CLOSE(90, "已关闭"), + CANCEL(91, "已取消"); private int value; private String description; From 800c77cf1d6f9fc40339dbdf6126b234e5030971 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 4 Dec 2018 15:09:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 33 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 4 +++ 2 files changed, 37 insertions(+) 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 010ac3e..3001219 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 @@ -1769,4 +1769,37 @@ public class WmsEnumUtil { } } + /** + * 成功标志枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_OK_VALUE { + + IS_TRUE(10, true, "成功"), + IS_FALSE(20, false, "失败"); + + private int value; + private boolean codeValue; + private String description; + + RC_OK_VALUE(int value, boolean codeValue, String description) { + this.value = value; + this.codeValue = codeValue; + this.description = description; + } + + public int getValue() { + return value; + } + + public boolean getCodeValue() { + return codeValue; + } + + public String getDescription() { + return description; + } + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 2ab3567..b4e124b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -54,4 +54,8 @@ public class WmsActionStepCall extends BaseBean { @Column(name="AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; + + @Column(name="OK_VALUE") + @ApiParam(value = "成功标志", example = "10") + public Integer okValue; } From 7982a4fdc1fad01dd955ffad6a3ae9e4bd893a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 4 Dec 2018 16:45:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 700ffe5..12636d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -385,11 +385,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result); + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //存储区名称 + HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); getStringBuilderPack(wmsZones, result);