合并dev代码

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;
@@ -1092,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;

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) {

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -613,7 +613,7 @@ public class CoreHqlPack {
         StringBuffer result =  new StringBuffer();
 
         HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result);
-        HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",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);