From 34e6d97b27d284bbfc5271238a20235b14dc073b Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 26 Apr 2019 09:51:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 53395a7..632dcd4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -111,8 +111,8 @@ public class MesHqlPack { } /** - * 物料信息查询条件封装 - * @param mesPart + * 生产工单查询条件封装 + * @param mesWorkOrder * @return */ public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { From eee0539562942a097e3df116b02a1dcfd087899f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 09:54:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sweb=E5=85=AC=E5=91=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 5a95b6f..5159e87 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 @@ -430,7 +430,8 @@ public class ImppEnumUtil { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"); + SWEB_NOTICE(3,"SWEB通知","SWEB通知"), + SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); private int value; private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 34ff73c..c729338 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -613,6 +613,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); From 950c6dee36de760074963ca4edba1516ac8e117a Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 10:19:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 5159e87..752316c 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 @@ -1093,7 +1093,8 @@ public class ImppEnumUtil { public enum FILE_ATTACH_SOURCE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"); + SWEB_NOTICE(3,"SWEB通知","SWEB通知"), + SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); private int value; private String name;