From 23e538a5a7a49f5916bac4531eb8635b028b3f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 4 Dec 2018 09:45:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 1 file changed, 3 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 f784167..700ffe5 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 @@ -579,9 +579,9 @@ public class WmsHqlPack { public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsTaskInfo.getMoveNo(), "moveNo", result); - HqlPack.getStringEqualPack(wmsTaskInfo.getUserNo(), "userNo", result); - HqlPack.getStringEqualPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); From af863ec5a1333b3a07de21137ecd39f776ac0547 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 4 Dec 2018 13:53:49 +0800 Subject: [PATCH 2/2] =?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;