文字修改

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

@@ -918,7 +918,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
                 } else {
                 } else {
 
 
                     log.error("条码[" + barcode.getBarcode() + "]获取库位号，需要去点料，点料机CI未连接，直接异常");
                     log.error("条码[" + barcode.getBarcode() + "]获取库位号，需要去点料，点料机CI未连接，直接异常");
-                    throw new ApiException("smfcore.micron.xray.offline", "{0}需要点料，点料机不在线", new String[]{barcode.getBarcode()});
+                    throw new ApiException("smfcore.micron.xray.offline", "{0} required counting partial quantity, Xray counter is not online", new String[]{barcode.getBarcode()});
                 }
                 }
             }
             }
         } else {
         } else {

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -90,7 +90,7 @@ public class MicronApi  {
     public static Barcode API001(String operationId,String rfid, Barcode barcode) throws  ApiException {
     public static Barcode API001(String operationId,String rfid, Barcode barcode) throws  ApiException {
 
 
         String url = config.getUrl(config.api_name_001);
         String url = config.getUrl(config.api_name_001);
-        String errorMsg="";
+        String errorMsg = "";
         if (ObjectUtil.isEmpty(url)) {
         if (ObjectUtil.isEmpty(url)) {
             return barcode;
             return barcode;
         }
         }
@@ -144,7 +144,7 @@ public class MicronApi  {
 //                    "xrayReq": false,
 //                    "xrayReq": false,
 //                    "transactionId": "833ec781-1eba-4860-bb91-f667cd89afd4",
 //                    "transactionId": "833ec781-1eba-4860-bb91-f667cd89afd4",
 //                    "status": "Success"
 //                    "status": "Success"
-            errorMsg=getDErrorMsg(result);
+            errorMsg = getDErrorMsg(result);
 //            if (result.isOk() && result.statusIsSuccess()) {
 //            if (result.isOk() && result.statusIsSuccess()) {
             if (result.isOk() && result.IsSuccess()) {
             if (result.isOk() && result.IsSuccess()) {
                 String partNumber = result.getResult("partNumber");
                 String partNumber = result.getResult("partNumber");
@@ -196,19 +196,20 @@ public class MicronApi  {
                 if (ObjectUtil.isEmpty(errmsg)) {
                 if (ObjectUtil.isEmpty(errmsg)) {
                     errmsg = errorMsg;
                     errmsg = errorMsg;
                 }
                 }
-                String error = result.getErrorValue("error");
-                if(error==null){
-                    error="";
+                Object errorObj = result.getErrorValue("error");
+                if (ObjectUtil.isEmpty(errorObj)) {
+                    errorObj = "";
                 }
                 }
+                String error = errorObj.toString();
 //                String message=result.getErrorValue("message");
 //                String message=result.getErrorValue("message");
 //                loadingUtil.AddErrorItem(rfid, barcode,error,errmsg);
 //                loadingUtil.AddErrorItem(rfid, barcode,error,errmsg);
                 if (ObjectUtil.isNotEmpty(errmsg)) {
                 if (ObjectUtil.isNotEmpty(errmsg)) {
 
 
                     log.info("API001 ,验证失败，错误信息:" + error + ";" + errmsg);
                     log.info("API001 ,验证失败，错误信息:" + error + ";" + errmsg);
-                    throw new ApiException("smfcore.api.001.error", error + ";" + errmsg );
+                    throw new ApiException("smfcore.api.001.error", error + ";" + errmsg);
                 } else {
                 } else {
                     log.info("API001 ,验证失败，获取数据失败:" + errmsg);
                     log.info("API001 ,验证失败，获取数据失败:" + errmsg);
-                    throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API001 : "+result.getResponseData()});
+                    throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API001 : " + result.getResponseData()});
                 }
                 }
             }
             }