1.Loading无任务时点END需要提示。2.提示不对问题修改。

src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java

@@ -768,18 +768,20 @@ public class RobotBoxHandler extends BaseDeviceHandler {
 
                 resultMap.put("result", "105");
                 resultMap.put("msg", errorMsg);
-            } catch (ApiException apiException){
+            } catch (ApiException apiException) {
                 errorMsg = apiException.getMessage();
                 log.info("API 错误:" + errorMsg);
-                errorMsg= MessageUtils.getText(apiException.getMsgKey(),apiException.getMsgParam(),new Locale("en","US"),apiException.getDefaultMsg());
+                String exMsg = MessageUtils.getText(apiException.getMsgKey(), apiException.getMsgParam(), new Locale("en", "US"), apiException.getDefaultMsg());
+                log.info(apiException.getMsgKey() + "获取到exMsg=" + exMsg);
                 resultMap.put("result", "120");
-                if(ObjectUtil.isEmpty(errorMsg) && ObjectUtil.isNotEmpty(apiException.getMessage())){
-                    errorMsg=apiException.getMessage();
+                if (ObjectUtil.isEmpty(errorMsg) && ObjectUtil.isNotEmpty(apiException.getMessage())) {
+//                    errorMsg=apiException.getMessage();
+                    errorMsg = exMsg;
                 }
 
                 Barcode barcode = new Barcode();
                 barcode.setBarcode(code);
-                loadingUtil.AddInListItem(rfid,barcode,"", INITEM_STATUS.API001NG,errorMsg);
+                loadingUtil.AddInListItem(rfid, barcode, "", INITEM_STATUS.API001NG, errorMsg);
 
                 resultMap.put("msg", errorMsg);
             }

src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java

@@ -490,6 +490,12 @@ public class LoadingController {
             }
 
             if (!inList.getMode().equals(APIMODE.MATRET)) {
+                
+                //如果当前没有任务，直接返回 No job or operation needs to be performed End
+                if(inList.getInListItems().size()<=0){
+                    return ResultBean.newErrorResult(-1, "smfcore.inlist.noJobToEnd", "No job or operation needs to be performed End" );
+                }
+                
                 //除matret，其他的都是手动结束
                 inList = loadingUtil.finish(inList);
             }

src/main/resources/messages.properties

@@ -379,3 +379,4 @@ smfcore.loading.retry.msg=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u6210\u529F\uFF0C{
 smfcore.loading.retry.msgok=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u6210\u529F
 smfcore.loading.retry.msgfail=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u5931\u8D25
 smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u8D25\uFF1A\u7269\u6599\u5168\u90E8\u5165\u5E93\u6210\u529F\u624D\u80FDEnd
+smfcore.inlist.noJobToEnd=no job or no operation need to perform for END

src/main/resources/messages_en_US.properties

@@ -367,4 +367,5 @@ smfcore.loading.retry.msgnone=no job or no operation need to perform for retry
 smfcore.loading.retry.msg=Retry completed: {0}/{1} retried successfully, {2}/{3} failed
 smfcore.loading.retry.msgok=Retry completed: {0}/{1} retried successfully
 smfcore.loading.retry.msgfail=Retry completed: {0}/{1} retry failed
-smfcore.micron.inlisttaskhasfail=Operation failed: All materials must be successfully stored before ending
\ No newline at end of file
+smfcore.micron.inlisttaskhasfail=Operation failed: All materials must be successfully stored before ending
+smfcore.inlist.noJobToEnd=no job or no operation need to perform for END
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -362,4 +362,5 @@ smfcore.loading.retry.msgnone=\u30EA\u30C8\u30E9\u30A4\u3059\u308B\u5FC5\u8981\u
 smfcore.loading.retry.msg=\u30EA\u30C8\u30E9\u30A4\u5B8C\u4E86\u3001{0}/{1}\u30EA\u30C8\u30E9\u30A4\u6210\u529F\u3001{2}/{3}\u30EA\u30C8\u30E9\u30A4\u5931\u6557
 smfcore.loading.retry.msgok=\u30EA\u30C8\u30E9\u30A4\u5B8C\u4E86\u3001{0}/{1}\u30EA\u30C8\u30E9\u30A4\u6210\u529F
 smfcore.loading.retry.msgfail=\u30EA\u30C8\u30E9\u30A4\u5B8C\u4E86\u3001{0}/{1}\u30EA\u30C8\u30E9\u30A4\u5931\u6557
-smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u6557\uFF1A\u3059\u3079\u3066\u306E\u7D20\u6750\u304C\u6B63\u5E38\u306B\u30B9\u30C8\u30A2\u3055\u308C\u305F\u5F8C\u3067\u306A\u3044\u3068\u7D42\u4E86\u3067\u304D\u307E\u305B\u3093
\ No newline at end of file
+smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u6557\uFF1A\u3059\u3079\u3066\u306E\u7D20\u6750\u304C\u6B63\u5E38\u306B\u30B9\u30C8\u30A2\u3055\u308C\u305F\u5F8C\u3067\u306A\u3044\u3068\u7D42\u4E86\u3067\u304D\u307E\u305B\u3093
+smfcore.inlist.noJobToEnd=no job or no operation need to perform for END
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -362,4 +362,5 @@ smfcore.loading.retry.msgnone=\u6CA1\u6709\u9700\u8981Retry\u7684\u7269\u6599
 smfcore.loading.retry.msg=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u6210\u529F\uFF0C{2}/{3}Retry\u5931\u8D25
 smfcore.loading.retry.msgok=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u6210\u529F
 smfcore.loading.retry.msgfail=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u5931\u8D25
-smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u8D25\uFF1A\u7269\u6599\u5168\u90E8\u5165\u5E93\u6210\u529F\u624D\u80FDEnd
\ No newline at end of file
+smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u8D25\uFF1A\u7269\u6599\u5168\u90E8\u5165\u5E93\u6210\u529F\u624D\u80FDEnd
+smfcore.inlist.noJobToEnd=no job or no operation need to perform for END
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -363,4 +363,5 @@ smfcore.loading.retry.msgnone=\u6CA1\u6709\u9700\u8981Retry\u7684\u7269\u6599
 smfcore.loading.retry.msg=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u6210\u529F\uFF0C{2}/{3}Retry\u5931\u8D25
 smfcore.loading.retry.msgok=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u6210\u529F
 smfcore.loading.retry.msgfail=Retry\u5B8C\u6210\uFF1A{0}/{1}Retry\u5931\u8D25
-smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u8D25\uFF1A\u7269\u6599\u5168\u90E8\u5165\u5E93\u6210\u529F\u624D\u80FDEnd
\ No newline at end of file
+smfcore.micron.inlisttaskhasfail=\u64CD\u4F5C\u5931\u8D25\uFF1A\u7269\u6599\u5168\u90E8\u5165\u5E93\u6210\u529F\u624D\u80FDEnd
+smfcore.inlist.noJobToEnd=no job or no operation need to perform for END
\ No newline at end of file