Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/custom/djk20388/util/AgvDataUtil.java

@@ -41,7 +41,7 @@ public class AgvDataUtil {
         //保存到mimo的操作
         //保存到mimo的操作
         if(status.getMimoOpMap().size()>0){
         if(status.getMimoOpMap().size()>0){
             Map<String,String> toMimoMap=status.getMimoOpMap().get(status.getMimoCid()  );
             Map<String,String> toMimoMap=status.getMimoOpMap().get(status.getMimoCid()  );
-            if(toMimoMap.size()>0){
+            if(toMimoMap!=null&& toMimoMap.size()>0){
                 if(!toMimiOpMap.containsKey(status.getMimoCid())){
                 if(!toMimiOpMap.containsKey(status.getMimoCid())){
                     toMimiOpMap.put(status.getMimoCid(),new ConcurrentHashMap<>());
                     toMimiOpMap.put(status.getMimoCid(),new ConcurrentHashMap<>());
                 }
                 }

src/main/resources/messages.properties

@@ -257,6 +257,8 @@ smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5
 smfcore.error.mimo.outFial=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7684\u7269\u6599
 smfcore.error.mimo.outFial=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7684\u7269\u6599
 smfcore.error.getMaterialLot.in=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u5165\u5E93
 smfcore.error.getMaterialLot.in=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u5165\u5E93
 smfcore.error.getMaterialLot.out=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u51FA\u5E93
 smfcore.error.getMaterialLot.out=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u51FA\u5E93
+smfcore.spKanban=\u8BBE\u5907\u6982\u89C8 
+smfcore.agv=AGV
 
 
 #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}

src/main/resources/messages_en_US.properties

@@ -255,4 +255,5 @@ smfcore.equipmentView=Equipment connected
 smfcore.greaterThanZero=Amount Must be greater than 0
 smfcore.greaterThanZero=Amount Must be greater than 0
 smfcore.error.virtualOut.num=The number cannot exceed {0}
 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.spKanban=Equipment Overview
+smfcore.agv=AGV

src/main/resources/messages_ja_JP.properties

@@ -253,4 +253,5 @@ smfcore.equipmentView=\u8BBE\u5907\u4E92\u8054
 smfcore.greaterThanZero=\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
 smfcore.greaterThanZero=\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
 smfcore.error.virtualOut.num=\u6570\u91CF\u4E0D\u80FD\u8D85\u8FC7{0}
 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.spKanban=\u6A5F\u5668\u6982\u8981
+smfcore.agv=AGV

src/main/resources/messages_zh_CN.properties

@@ -253,3 +253,5 @@ smfcore.equipmentView=\u8BBE\u5907\u4E92\u8054
 smfcore.greaterThanZero=\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0 
 smfcore.greaterThanZero=\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0 
 smfcore.error.virtualOut.num=\u6570\u91CF\u4E0D\u80FD\u8D85\u8FC7{0}
 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.spKanban=\u8BBE\u5907\u6982\u89C8
+smfcore.agv=AGV
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -254,3 +254,5 @@ smfcore.equipmentView=\u8A2D\u5099\u4E92\u806F
 smfcore.greaterThanZero=\u6578\u91CF\u5FC5\u9808\u5927\u65BC0 
 smfcore.greaterThanZero=\u6578\u91CF\u5FC5\u9808\u5927\u65BC0 
 smfcore.error.virtualOut.num=\u6578\u91CF\u4E0D\u80FD\u8D85\u904E{0}
 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.spKanban=\u8BBE\u5907\u6982\u89C8
+smfcore.agv=AGV