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 8cf4b7048..372a501b4 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
@@ -112,10 +112,19 @@ public class EmisWaybillController extends EmisBaseController
 
             billCode=WaybillHelper.formatQueryValue(billCode);
             if(!StringUtils.isEmpty(billCode) ){
-                waybillOrder = emisWaybillService.getWaybillOrderByBillCode(billCode);
+                boolean isExists=emisBaseService.checkWaybillIsExists(billCode);
+                if(!isExists){
+                    return AjaxResult.error("运单不存在");
+                }
+                String mainBillCode=emisBaseService.getMainBillCode(billCode);
+                waybillOrder = emisWaybillService.getWaybillOrderByBillCode(mainBillCode);
                 if(waybillOrder==null){
                     return AjaxResult.error("运单不存在");
                 }
+
+                // 返回子单信息
+                waybillOrder.setBillCode(billCode);
+
             }else if(!StringUtils.isEmpty(orderSn)){
                 waybillOrder = emisWaybillService.getWaybillOrderByOrderSn(orderSn);
                 if(waybillOrder==null){