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 4ca5f1a50..47f847b18 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
@@ -204,43 +204,7 @@ public class EmisTmsScanRecordController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 查询扫描统计数据
-     *  1-发件清单 2-到件清单 3-派件清单
-     * @param scanRecord
-     * @return
-     */
-    @JacksonFilter(include= {
-            "billCode","scanDate"
-    },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    @RequestMapping("/queryScanWaybillList")
-    public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
-    {
 
-//        if(!scanRecord.getParams().containsKey("scanStatType")){
-//            return getDataTable(new ArrayList<>());
-//        }
-
-//        1-发件清单 2-到件清单 3-派件清单
-        String scanStatType=(String)scanRecord.getParams().get("scanStatType");
-        log.debug("======>"+scanStatType);
-        log.debug(JSON.toJSONString(scanRecord.getParams()));
-        if("1".equals(scanStatType)){
-            scanRecord.setScanType(ScanType.DEPARTURE.opCode);
-        }else if("2".equals(scanStatType)){
-            scanRecord.setScanType(ScanType.ARRIVAL.opCode);
-        }
-        else if("3".equals(scanStatType)){
-            scanRecord.setScanType(ScanType.SENT.opCode);
-        }else{
-//            return getDataTable(new ArrayList<>());
-        }
-        scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
-
-        startPage();
-        List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
-        return getDataTable(list);
-    }
 
     /**
      * 导出TMS扫描记录列表
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 5d52c3448..030c98168 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -351,8 +351,50 @@ public class EmisWaybillController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询扫描统计数据
+     *  1-发件清单 2-到件清单 3-派件清单
+     * @param scanRecord
+     * @return
+     */
+    @RequestMapping("/queryScanWaybillList")
+    @JacksonFilter(include= {
+            "billCode","scanDate"
+    },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
+    {
 
+        if(!scanRecord.getParams().containsKey("scanStatType")){
+            TableDataInfo tableDataInfo =  getDataTable(new ArrayList<>());
+            tableDataInfo.setCode(500);
+            tableDataInfo.setMsg("参数有误");
+            return tableDataInfo;
+        }
 
+//        1-发件清单 2-到件清单 3-派件清单
+        String scanStatType=(String)scanRecord.getParams().get("scanStatType");
+
+        log.debug("======>"+scanStatType);
+        log.debug(JSON.toJSONString(scanRecord.getParams()));
+        if("1".equals(scanStatType)){
+            scanRecord.setScanType(ScanType.DEPARTURE.opCode);
+        }else if("2".equals(scanStatType)){
+            scanRecord.setScanType(ScanType.ARRIVAL.opCode);
+        }
+        else if("3".equals(scanStatType)){
+            scanRecord.setScanType(ScanType.SENT.opCode);
+        }else{
+            TableDataInfo tableDataInfo =  getDataTable(new ArrayList<>());
+            tableDataInfo.setCode(500);
+            tableDataInfo.setMsg("参数有误");
+            return tableDataInfo;
+        }
+        scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
+
+        startPage();
+        List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
+        return getDataTable(list);
+    }
 
     @RequestMapping("/realGetWaybillPrintData")
     public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)