Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c2af126a 由 zshaohui
选项

1.消息列表导出,增加严重错误类型 

2.禁用库位的提示信息 改成警告
1 个父辈 b5cdea2e
内嵌 并排
正在显示 7 个修改的文件 包含 9 行增加 和 1 行删除
src/main/java/com/neotel/smfcore/core/message/service/manager/impl/MessageManagerImpl.java
...@@ -72,6 +72,7 @@ public class MessageManagerImpl implements IMessageManager { ...@@ -72,6 +72,7 @@ public class MessageManagerImpl implements IMessageManager {
String info = MessageUtils.getText("smfcorre.message.info", locale, "消息"); String info = MessageUtils.getText("smfcorre.message.info", locale, "消息");
String warning = MessageUtils.getText("smfcorre.message.warning", locale, "警告"); String warning = MessageUtils.getText("smfcorre.message.warning", locale, "警告");
String error = MessageUtils.getText("smfcorre.message.error", locale, "错误"); String error = MessageUtils.getText("smfcorre.message.error", locale, "错误");
String critical = MessageUtils.getText("smfcore.message.critical", locale, "严重错误");
List<String> titles = new ArrayList<>(); List<String> titles = new ArrayList<>();
titles.add(device); titles.add(device);
...@@ -89,6 +90,8 @@ public class MessageManagerImpl implements IMessageManager { ...@@ -89,6 +90,8 @@ public class MessageManagerImpl implements IMessageManager {
typeV=warning; typeV=warning;
}else if(obj.getType().equals(MessageType.ERROR.name())){ }else if(obj.getType().equals(MessageType.ERROR.name())){
typeV=error; typeV=error;
}else if (obj.getType().equals(MessageType.CRITICAL.name())){
typeV=critical;
} }
map.put(type, typeV); map.put(type, typeV);
map.put(createDate, DateUtil.toDateTimeString(obj.getCreateDate())); map.put(createDate, DateUtil.toDateTimeString(obj.getCreateDate()));
......
src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
...@@ -116,7 +116,7 @@ public class DeviceMessageUtil { ...@@ -116,7 +116,7 @@ public class DeviceMessageUtil {
message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.enabledPos", "启用库位：{0}", message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.enabledPos", "启用库位：{0}",
new String[]{posName}); new String[]{posName});
} else { } else {
message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.disabledPos", "禁用库位：{0}", message = Message.newMsg(MessageType.WARNING, storage.getName(), storage.getId(), posName, "smfcore.messages.disabledPos", "禁用库位：{0}",
new String[]{posName}); new String[]{posName});
} }
message.setOperator(operator); message.setOperator(operator);
......
src/main/resources/messages.properties
...@@ -274,3 +274,4 @@ smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u6 ...@@ -274,3 +274,4 @@ smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u6
#smfclient.checkNg=checking material is ng:{0} #smfclient.checkNg=checking material is ng:{0}
smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7 smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
smfcore.error.component.sizeNotMatch=\u6599\u76D8\u5C3A\u5BF8[{0}}]\u4E0E\u5143\u5668\u4EF6{1}\u5C3A\u5BF8[{2}]\u4E0D\u7B26,\u65E0\u6CD5\u5165\u5E93 smfcore.error.component.sizeNotMatch=\u6599\u76D8\u5C3A\u5BF8[{0}}]\u4E0E\u5143\u5668\u4EF6{1}\u5C3A\u5BF8[{2}]\u4E0D\u7B26,\u65E0\u6CD5\u5165\u5E93
smfcore.message.critical=\u4E25\u91CD\u9519\u8BEF
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_en_US.properties
...@@ -258,3 +258,4 @@ smfcore.error.virtualOut.num=The number cannot exceed {0} ...@@ -258,3 +258,4 @@ smfcore.error.virtualOut.num=The number cannot exceed {0}
smfcore.error.virtualOut.noItem=The corresponding material is not found in work order {0} smfcore.error.virtualOut.noItem=The corresponding material is not found in work order {0}
smfcore.logMonitor=Log Monitoring smfcore.logMonitor=Log Monitoring
smfcore.error.component.sizeNotMatch=Tray size [{0}] does not match component {1} size [{2}], cannot store in warehouse smfcore.error.component.sizeNotMatch=Tray size [{0}] does not match component {1} size [{2}], cannot store in warehouse
smfcore.message.critical=Critical
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -257,3 +257,4 @@ smfcore.error.virtualOut.num=\u6570\u91CF\u4E0D\u80FD\u8D85\u8FC7{0} ...@@ -257,3 +257,4 @@ smfcore.error.virtualOut.num=\u6570\u91CF\u4E0D\u80FD\u8D85\u8FC7{0}
smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7684PN\u6216\u7269\u6599\u7F16\u53F7 smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7684PN\u6216\u7269\u6599\u7F16\u53F7
smfcore.logMonitor=\u30ED\u30B0\u76E3\u8996 smfcore.logMonitor=\u30ED\u30B0\u76E3\u8996
smfcore.error.component.sizeNotMatch=\u30C8\u30EC\u30A4\u30B5\u30A4\u30BA[{0}]\u306F\u90E8\u54C1{1}\u306E\u30B5\u30A4\u30BA[{2}]\u3068\u4E00\u81F4\u3057\u306A\u3044\u305F\u3081\u3001\u5165\u5EAB\u3067\u304D\u307E\u305B\u3093 smfcore.error.component.sizeNotMatch=\u30C8\u30EC\u30A4\u30B5\u30A4\u30BA[{0}]\u306F\u90E8\u54C1{1}\u306E\u30B5\u30A4\u30BA[{2}]\u3068\u4E00\u81F4\u3057\u306A\u3044\u305F\u3081\u3001\u5165\u5EAB\u3067\u304D\u307E\u305B\u3093
smfcore.message.critical=\u91CD\u5927\u30A8\u30E9\u30FC
src/main/resources/messages_zh_CN.properties
...@@ -257,3 +257,4 @@ smfcore.error.virtualOut.num=\u6570\u91CF\u4E0D\u80FD\u8D85\u8FC7{0} ...@@ -257,3 +257,4 @@ smfcore.error.virtualOut.num=\u6570\u91CF\u4E0D\u80FD\u8D85\u8FC7{0}
smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7684PN\u6216\u7269\u6599\u7F16\u53F7 smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7684PN\u6216\u7269\u6599\u7F16\u53F7
smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7 smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
smfcore.error.component.sizeNotMatch=\u6599\u76D8\u5C3A\u5BF8[{0}}]\u4E0E\u5143\u5668\u4EF6{1}\u5C3A\u5BF8[{2}]\u4E0D\u7B26,\u65E0\u6CD5\u5165\u5E93 smfcore.error.component.sizeNotMatch=\u6599\u76D8\u5C3A\u5BF8[{0}}]\u4E0E\u5143\u5668\u4EF6{1}\u5C3A\u5BF8[{2}]\u4E0D\u7B26,\u65E0\u6CD5\u5165\u5E93
smfcore.message.critical=\u4E25\u91CD\u9519\u8BEF
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -257,3 +257,4 @@ smfcore.error.virtualOut.num=\u6578\u91CF\u4E0D\u80FD\u8D85\u904E{0} ...@@ -257,3 +257,4 @@ smfcore.error.virtualOut.num=\u6578\u91CF\u4E0D\u80FD\u8D85\u904E{0}
smfcore.error.virtualOut.noItem=\u5DE5\u55AE{0}\u4E2D\u672A\u627E\u5230\u5C0D\u61C9\u7684PN\u7269\u6599\u7DE8\u865F smfcore.error.virtualOut.noItem=\u5DE5\u55AE{0}\u4E2D\u672A\u627E\u5230\u5C0D\u61C9\u7684PN\u7269\u6599\u7DE8\u865F
smfcore.logMonitor=\u65E5\u8A8C\u76E3\u63A7 smfcore.logMonitor=\u65E5\u8A8C\u76E3\u63A7
smfcore.error.component.sizeNotMatch=\u6599\u76E4\u5C3A\u5BF8[{0}]\u8207\u5143\u5668\u4EF6{1}\u5C3A\u5BF8[{2}]\u4E0D\u7B26\uFF0C\u7121\u6CD5\u5165\u5EAB smfcore.error.component.sizeNotMatch=\u6599\u76E4\u5C3A\u5BF8[{0}]\u8207\u5143\u5668\u4EF6{1}\u5C3A\u5BF8[{2}]\u4E0D\u7B26\uFF0C\u7121\u6CD5\u5165\u5EAB
smfcore.message.critical=\u56B4\u91CD\u932F\u8AA4
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!