From c18f053bca5242179c94cd03f24281e88f5feb72 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 8 May 2024 21:28:32 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

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 4c8cb1012..7c1c4d5e2 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
@@ -51,7 +51,6 @@ public class EmisWaybillController extends BaseController
     @Autowired
     private IEmisElectronicPagService emisElectronicPagService;
 
-
     /**
      * 获取电子运单信息
      */
@@ -227,6 +226,39 @@ public class EmisWaybillController extends BaseController
     }
 
 
+    /**
+     * 查询扫描统计数据
+     * @param emisWaybill
+     * @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)
+    @RequestMapping("/queryScanWaybillList")
+    public TableDataInfo queryScanWaybillList(EmisWaybill emisWaybill)
+    {
+        startPage();
+        emisWaybill.getParams().put("statSiteCode",getLoginUser().getUser().getOwnerSiteCode());
+        emisWaybill.getParams().put("statEmpCode",getLoginUser().getUser().getEmpCode());
+        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
+        return getDataTable(list);
+    }
+
+
+
+
 
 
 //    /**