保存信息 增加隔口号

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -1217,13 +1217,13 @@ public class CDeviceController {
         Barcode alearyOutBarcode = null;
         Barcode alearyOutBarcode = null;
         try {
         try {
             if (StringUtils.isEmpty(code)) {
             if (StringUtils.isEmpty(code)) {
-                saveMessage(MessageType.ERROR.name(), currentLoc, "未扫到条码信息");
+                saveMessage(MessageType.ERROR.name(), currentLoc, boxPar+":未扫到条码信息");
             } else {
             } else {
                 alearyOutBarcode = codeResolve.resolveOneValideBarcode(code);
                 alearyOutBarcode = codeResolve.resolveOneValideBarcode(code);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             log.info("解析出库的条码失败:", e);
             log.info("解析出库的条码失败:", e);
-            saveMessage(MessageType.ERROR.name(), currentLoc, code + "解析条码失败,错误信息为:" + e.getMessage());
+            saveMessage(MessageType.ERROR.name(), currentLoc, boxPar+":"+code + "解析条码失败,错误信息为:" + e.getMessage());
         }
         }
 
 
 
 
@@ -1297,7 +1297,7 @@ public class CDeviceController {
         if (alearyOutBarcode != null) {
         if (alearyOutBarcode != null) {
             String barcodeStr = alearyOutBarcode.getBarcode();
             String barcodeStr = alearyOutBarcode.getBarcode();
             if (!barcodeStr.equals(barcode.getBarcode())) {
             if (!barcodeStr.equals(barcode.getBarcode())) {
-                saveMessage(MessageType.ERROR.name(), currentLoc, "传入的条码为:" + barcodeStr + ",按顺序出库的条码为:" + barcode.getBarcode() + "不一致");
+                saveMessage(MessageType.ERROR.name(), currentLoc, boxPar+"传入的条码为:" + barcodeStr + ",按顺序出库的条码为:" + barcode.getBarcode() + "不一致");
                 boxBarcode.updateExtraData(CommonUtil.outExpPrefix + boxPar, boxPar);
                 boxBarcode.updateExtraData(CommonUtil.outExpPrefix + boxPar, boxPar);
             }
             }
         }
         }
@@ -1592,6 +1592,7 @@ public class CDeviceController {
         ResultBean resultBean = ResultBean.newOkResult(full);
         ResultBean resultBean = ResultBean.newOkResult(full);
         if (!full){
         if (!full){
             resultBean.setCode(-1);
             resultBean.setCode(-1);
+            return resultBean;
         }
         }
         return ResultBean.newOkResult(full);
         return ResultBean.newOkResult(full);
     }
     }