diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 6db62bd2d..1f7408e5c 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -19,16 +19,19 @@ import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.emis.domain.*;
+import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
 import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
+import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.IEmisTmsTransPlanDtlService;
 import com.xdadan.erp.emis.service.IEmisWaybillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -132,6 +135,19 @@ public class EmisTmsScanRecordController extends EmisBaseController
         }
 
         try {
+            // 检查数据
+            for (Map<String,Object> scanDataItem: scanInfo.getScanData()) {
+                String billCodeInStr = MapUtils.getString(scanDataItem,"billCode",null);
+                billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr);
+                String[] billCodeArr = billCodeInStr.split(",");
+                // 未揽收不允许做扫描操作
+                for(int i = 0 ; i < billCodeArr.length ; i++){
+                    String checkBillCode=billCodeArr[i];
+                    if(!emisBaseService.checkCanScan(checkBillCode)){
+                        return AjaxResult.error("运单["+checkBillCode+"]未揽收,不允许扫描");
+                    }
+                }
+            }
 
             ScanResult scanResult=emisTmsScanRecordService.scan(scanInfo,getLoginUser().getUser().getEmpCode(),getLoginUser().getUser().getOwnerSiteCode());
             return AjaxResult.success("扫描成功",scanResult);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 97194cb9b..e02ac6c5a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -484,7 +484,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         }
 
 
-        billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr);
 
         // 单号去重
         String[] billCodeArr = billCodeInStr.split(",");
@@ -494,19 +493,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //        }
 //        String billCodeArr[] = (String[]) billCodeSet.toArray();
 
-        // 未揽收不允许做扫描操作
-        for(int i = 0 ; i < billCodeArr.length ; i++){
-            String checkBillCode=billCodeArr[i];
-            if(!checkCanScan(checkBillCode)){
-                ScanResultItem scanResultItem = new ScanResultItem();
-                scanResultItem.setBillCode(checkBillCode);
-                scanResultItem.setResult("fail");
-                scanResultItem.setMessage("未揽收不允许扫描");
-                scanResultItem.setErrorCode(EmisBizErrorType.SCAN_PARAM_ERROR.errorCode);
-                itemList.add(scanResultItem);
-                return itemList;
-            }
-        }
+
 
         Date scanDate = null;
         if(scanDateStr.contains("Z")){