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 49945c3dd..9c1a3e8a4 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
@@ -646,6 +646,8 @@ public class EmisWaybillController extends EmisBaseController
 
         List<EmisWaybill> list = null;
         // 如果单号不为空，则去除其他参数
+        String waybillStatType= MapUtils.getString(emisWaybill.getParams(),"waybillStatType","");
+
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
 
             EmisWaybill queryEmisWaybill =new EmisWaybill();
@@ -654,15 +656,18 @@ public class EmisWaybillController extends EmisBaseController
             if(billCodeSortList.length>1){
                 queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
             }
-            list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill);
+            if( "1".equals(waybillStatType)){
+                list = emisWaybillService.selectWaitGotOrderList(queryEmisWaybill);
+            }
+            else {
+                list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill);
+            }
         }else{
 
-            String waybillStatType= MapUtils.getString(emisWaybill.getParams(),"waybillStatType","");
             if( "1".equals(waybillStatType)){
                 // 获取未接单数据
                 list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
             }else{
-
                 // 如果不带查询本人开单的数据
                 if(StringUtils.isEmpty(emisWaybill.getBillCode())){
                     try {