Skip to content

孙克 / smf-core

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

空出时看板页面显示空出报警

1 个父辈 dedbdbae
内嵌 并排
正在显示 7 个修改的文件 包含 24 行增加 和 9 行删除
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
...@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.device.util.DataCache; ...@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.kanban.rest.bean.dto.*; import com.neotel.smfcore.core.kanban.rest.bean.dto.*;
import com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper; import com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper;
import com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter; import com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter;
import com.neotel.smfcore.core.language.util.MessageUtils;
import com.neotel.smfcore.core.message.util.DeviceMessageUtil; import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
import com.neotel.smfcore.core.msd.bean.MSDSettiings; import com.neotel.smfcore.core.msd.bean.MSDSettiings;
import com.neotel.smfcore.core.solder.util.SolderBoxCache; import com.neotel.smfcore.core.solder.util.SolderBoxCache;
...@@ -84,9 +85,9 @@ public class BoxKanbanController { ...@@ -84,9 +85,9 @@ public class BoxKanbanController {
return getGroupDto(allGroup,locale,""); return getGroupDto(allGroup,locale,"");
} }
private BoxKanbanDto getGroupDto(List<Group> groupList,Locale locale,String type){ private BoxKanbanDto getGroupDto(List<Group> groupList,Locale locale,String type) {
List<DataLog> allTasks=taskService.getAllTasks(); List<DataLog> allTasks = taskService.getAllTasks();
BoxKanbanDto boxKanbanDto = getKanBan(allTasks,locale); BoxKanbanDto boxKanbanDto = getKanBan(allTasks, locale);
ArrayList<GroupStatusDto> groupStatusDtos = new ArrayList<>(); ArrayList<GroupStatusDto> groupStatusDtos = new ArrayList<>();
for (Group group : groupList) { for (Group group : groupList) {
List<BoxStatusDto> boxStatusDtos = new ArrayList<>(); List<BoxStatusDto> boxStatusDtos = new ArrayList<>();
...@@ -110,6 +111,15 @@ public class BoxKanbanController { ...@@ -110,6 +111,15 @@ public class BoxKanbanController {
} }
} }
boxKanbanDto.setGroupList(groupStatusDtos); boxKanbanDto.setGroupList(groupStatusDtos);
String eoMsg= MessageUtils.getText("smfcore.m.emptyOut",MessageUtils.getDefaultLocal(),"No Reel Pickup From Mycronics");
String kbMsg = "";
for (DataLog log :
allTasks) {
if (log.getStatus().equals((OP_STATUS.BOXDOOR_NOREEL.name()))) {
kbMsg += eoMsg+":[" + log.getCid() + "][" + log.getBarcode() + "]\t ";
}
}
boxKanbanDto.setMsg(kbMsg);
return boxKanbanDto; return boxKanbanDto;
} }
...@@ -402,7 +412,7 @@ public class BoxKanbanController { ...@@ -402,7 +412,7 @@ public class BoxKanbanController {
return kanbanDto; return kanbanDto;
} }
private BoxStatusDto getBoxDto(Storage storage,List<DataLog> allTasks,Locale locale) { private BoxStatusDto getBoxDto(Storage storage,List<DataLog> allTasks,Locale locale ) {
int inTask = 0; int inTask = 0;
int outTask = 0; int outTask = 0;
for (DataLog data : allTasks) { for (DataLog data : allTasks) {
......
src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java
...@@ -104,7 +104,7 @@ public class MessageUtils { ...@@ -104,7 +104,7 @@ public class MessageUtils {
//-----------------以下为从缓存读取资源------------------------------------- //-----------------以下为从缓存读取资源-------------------------------------
public static Locale getDefaultLocal(){ public static Locale getDefaultLocal(){
return new Locale("zh-CH"); return new Locale("en-US");
} }
public static String getText(String msgKey, Locale locale,String defaultMsg) { public static String getText(String msgKey, Locale locale,String defaultMsg) {
......
src/main/resources/messages.properties
...@@ -346,6 +346,7 @@ smfcore.lockMaterials=\u9501\u5B9A\u7269\u6599 ...@@ -346,6 +346,7 @@ smfcore.lockMaterials=\u9501\u5B9A\u7269\u6599
smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1} smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1}
smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0} smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
smfcore.m.emptyOut=No Reel Pickup From Mycronics
#smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0} #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
#smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1} #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
#smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
......
src/main/resources/messages_en_US.properties
...@@ -345,4 +345,5 @@ smfcore.saveOk=save successfully ...@@ -345,4 +345,5 @@ smfcore.saveOk=save successfully
smfcore.lockMaterials=Block Materials smfcore.lockMaterials=Block Materials
smfcore.emptyOut.fail=Task [{0}] empty processing failure:{1} smfcore.emptyOut.fail=Task [{0}] empty processing failure:{1}
smfcore.storage.error.posNameExist=Bin number already exists in other bins\uFF1A{0} smfcore.storage.error.posNameExist=Bin number already exists in other bins\uFF1A{0}
smfcore.device.formatError= Format error
\ No newline at end of file \ No newline at end of file
smfcore.device.formatError= Format error
smfcore.m.emptyOut=No Reel Pickup From Mycronics
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -342,4 +342,5 @@ smfcore.saveOk=\u4FDD\u5B58\u6210\u529F ...@@ -342,4 +342,5 @@ smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
smfcore.lockMaterials=\u9501\u5B9A\u7269\u6599 smfcore.lockMaterials=\u9501\u5B9A\u7269\u6599
smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1} smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1}
smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0} smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
\ No newline at end of file \ No newline at end of file
smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
smfcore.m.emptyOut=No Reel Pickup From Mycronics
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_CN.properties
...@@ -342,4 +342,5 @@ smfcore.saveOk=\u4FDD\u5B58\u6210\u529F ...@@ -342,4 +342,5 @@ smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
smfcore.lockMaterials=\u9501\u5B9A\u7269\u6599 smfcore.lockMaterials=\u9501\u5B9A\u7269\u6599
smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1} smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1}
smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0} smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
\ No newline at end of file \ No newline at end of file
smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
smfcore.m.emptyOut=No Reel Pickup From Mycronics
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -343,4 +343,5 @@ smfcore.saveOk=\u4FDD\u5B58\u6210\u529F ...@@ -343,4 +343,5 @@ smfcore.saveOk=\u4FDD\u5B58\u6210\u529F
smfcore.lockMaterials=\u9396\u5B9A\u7269\u6599 smfcore.lockMaterials=\u9396\u5B9A\u7269\u6599
smfcore.emptyOut.fail=\u4EFB\u52D9[{0}]\u7A7A\u51FA\u8655\u7406\u5931\u6557:{1} smfcore.emptyOut.fail=\u4EFB\u52D9[{0}]\u7A7A\u51FA\u8655\u7406\u5931\u6557:{1}
smfcore.storage.error.posNameExist=\u5EAB\u4F4D\u865F\u5DF2\u5728\u5176\u4ED6\u6599\u5009\u5B58\u5728\uFF1A{0} smfcore.storage.error.posNameExist=\u5EAB\u4F4D\u865F\u5DF2\u5728\u5176\u4ED6\u6599\u5009\u5B58\u5728\uFF1A{0}
smfcore.device.formatError= \u683C\u5F0F\u932F\u8AA4
\ No newline at end of file \ No newline at end of file
smfcore.device.formatError= \u683C\u5F0F\u932F\u8AA4
smfcore.m.emptyOut=No Reel Pickup From Mycronics
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!