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 b39a35c23..88ed19ff0 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
@@ -299,14 +299,14 @@ public class EmisWaybillController extends BaseController
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
-                emisWaybill.getParams().put("billCodeSortList",billCodeSortList);
+                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
             }
         }
 
         if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
             String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
             if(orderSnSortList.length>1){
-                emisWaybill.getParams().put("orderSnSortList",orderSnSortList);
+                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
             }
         }
 
@@ -332,6 +332,20 @@ public class EmisWaybillController extends BaseController
             emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
         }
 
+        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
+            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+            }
+        }
+
         List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         return getDataTable(list);
     }
@@ -362,6 +376,21 @@ public class EmisWaybillController extends BaseController
             emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
             emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
         }
+
+        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
+            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+            }
+        }
+
         List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         return getDataTable(list);
     }
@@ -380,6 +409,21 @@ public class EmisWaybillController extends BaseController
             emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
             emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
         }
+
+        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
+            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+            }
+        }
+
         List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         return getDataTable(list);
     }