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 e32f244b3..53c2ad0b3 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
@@ -65,22 +65,26 @@ public class EmisWaybillController extends BaseController
 
             EmisWaybill emisWaybill=null;
 
-            if(com.xdadan.erp.common.utils.StringUtils.isEmpty(billCode) && com.xdadan.erp.common.utils.StringUtils.isEmpty(orderSn) ){
+            if(StringUtils.isEmpty(billCode) && StringUtils.isEmpty(orderSn) ){
                 return AjaxResult.error("参数错误");
             }
 
-            if(!com.xdadan.erp.common.utils.StringUtils.isEmpty(billCode) ){
+            if(!StringUtils.isEmpty(billCode) ){
                 emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(billCode);
                 if(emisWaybill==null){
                     return AjaxResult.error("未找到该运单");
                 }
+            }else {
+                if (!StringUtils.isEmpty(orderSn)) {
+                    emisWaybill = emisWaybillService.selectEmisWaybillByOrderSn(orderSn);
+                    if (emisWaybill == null) {
+                        return AjaxResult.error("未找到该运单");
+                    }
+                }
             }
 
-            if(!com.xdadan.erp.common.utils.StringUtils.isEmpty(orderSn) ) {
-                emisWaybill = emisWaybillService.selectEmisWaybillByOrderSn(orderSn);
-                if(emisWaybill==null){
-                    return AjaxResult.error("未找到该运单");
-                }
+            if (emisWaybill == null) {
+                return AjaxResult.error("未找到该运单");
             }
 
             WaybillOrder waybillOrder = new WaybillOrder();