点料机接口修改

src/main/java/com/neotel/smfcore/core/xRay/rest/XrayDeviceController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.common.exception.ApiException;
+import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
@@ -97,12 +98,16 @@ public class XrayDeviceController {
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean isNeedCounting(@RequestBody Map<String,String> paramMap) {
     public ResultBean isNeedCounting(@RequestBody Map<String,String> paramMap) {
         String barcodeStr = paramMap.get("barcodes");
         String barcodeStr = paramMap.get("barcodes");
-
         log.info("isNeedCounting: 条码:barcodes:" + barcodeStr);
         log.info("isNeedCounting: 条码:barcodes:" + barcodeStr);
         if (ObjectUtil.isEmpty(barcodeStr)) {
         if (ObjectUtil.isEmpty(barcodeStr)) {
             return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"barcodes"});
             return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"barcodes"});
         }
         }
-        Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
+        Barcode barcode = null;
+        try {
+            barcode = codeResolve.resolveOneValideBarcode(barcodeStr);
+        } catch (ValidateException ex) {
+            log.error(ex.getDefaultMsg());
+        }
         //已入库的条码需要点料
         //已入库的条码需要点料
         if (barcode == null) {
         if (barcode == null) {
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"barcode", barcodeStr});
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"barcode", barcodeStr});
@@ -139,8 +144,12 @@ public class XrayDeviceController {
             Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
             Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
 
 
             if (needResolve && barcode == null && ObjectUtil.isNotEmpty(fullBarcode)) {
             if (needResolve && barcode == null && ObjectUtil.isNotEmpty(fullBarcode)) {
+                try {
                     //解析条码
                     //解析条码
                     barcode = codeResolve.resolveOneValideBarcode(fullBarcode);
                     barcode = codeResolve.resolveOneValideBarcode(fullBarcode);
+                } catch (ValidateException ex) {
+                    log.error(ex.getDefaultMsg());
+                }
             }
             }
             if (barcode != null) {
             if (barcode != null) {
                 int oldQty = barcode.getAmount();
                 int oldQty = barcode.getAmount();