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 e78262927..90ea3e301 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
@@ -28,6 +28,8 @@ import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.file.FileUtils;
 import com.xdadan.erp.common.utils.idgen.UUID;
 import com.xdadan.erp.emis.domain.EmisBrand;
+import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
+import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.*;
 import com.xdadan.erp.emis.service.*;
@@ -82,6 +84,9 @@ public class EmisWaybillController extends BaseController
     @Autowired
     private IEmisElectronicPagService emisElectronicPagService;
 
+    @Autowired
+    private IEmisTmsScanRecordService emisTmsScanRecordService;
+
     /**
      * 获取电子运单信息
      */
@@ -347,39 +352,36 @@ public class EmisWaybillController extends BaseController
 
     /**
      * 查询扫描统计数据
-     * @param emisWaybill
+     *  1-发件清单 2-到件清单 3-派件清单
+     * @param scanRecord
      * @return
      */
     @JacksonFilter(include= {
-            "id","orderSn","billCode","orderStatus","waybillStatus",
-            "orderType","sendDate","customerCode","customerName",
-            "receiveName",
-            "receiveCountry","receiveCountryName",
-            "receiveProvince","receiveProvinceName",
-            "receiveCity", "receiveCityName",
-            "sendName",
-            "sendCountry","sendCountryName",
-            "sendProvince","sendProvinceName",
-            "sendCity","sendCityName",
-            "transLineType","transLineName",
-            "productType","productName"
-
-    },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+            "billCode","scanDate"
+    },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/queryScanWaybillList")
-    public TableDataInfo queryScanWaybillList(EmisWaybill emisWaybill)
+    public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
     {
         startPage();
-        emisWaybill.getParams().put("queryScanWaybillListtatSiteCode",getLoginUser().getUser().getOwnerSiteCode());
-        emisWaybill.getParams().put("statEmpCode",getLoginUser().getUser().getEmpCode());
-        if(!getLoginUser().getUser().isTopSite()){
-            emisWaybill.getParams().put("innerQuery","1");
-            emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
-            emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
-            emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
+        if(!scanRecord.getParams().containsKey("scanStatType")){
+            return getDataTable(null);
         }
 
+//        1-发件清单 2-到件清单 3-派件清单
+        String scanStatType=(String)scanRecord.getParams().get("scanStatType");
+        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(null);
+        }
 
-        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
+        scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
+        List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
         return getDataTable(list);
     }