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 d4b844658..4ca5f1a50 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
@@ -17,15 +17,18 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.emis.domain.*;
+import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.IEmisTmsTransPlanDtlService;
 import com.xdadan.erp.emis.service.IEmisWaybillService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,6 +57,7 @@ import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
  * @author linfso
  * @date 2024-03-07 10:42:44
  */
+@Slf4j
 @RestController
 @RequestMapping("/emis/emisTmsScanRecord")
 public class EmisTmsScanRecordController extends BaseController
@@ -200,6 +204,44 @@ 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 df7b67df1..5d52c3448 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
@@ -352,43 +352,7 @@ public class EmisWaybillController extends BaseController
     }
 
 
-    /**
-     * 查询扫描统计数据
-     *  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);
-    }
 
     @RequestMapping("/realGetWaybillPrintData")
     public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)