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 46d04640e..499cfea84 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
@@ -98,6 +98,46 @@ public class EmisWaybillController extends EmisBaseController
         return AjaxResult.success("操作成功", emisBaseService.checkWaybillIsExists(billCode));
     }
 
+    /**
+     * 获取运单信息
+     */
+    @GetMapping(value = "/getEmisWaybillByBillCode")
+    public AjaxResult getEmisWaybillByBillCode(String billCode)
+    {
+        try {
+
+            EmisWaybill dbEmisWaybill=null;
+
+            if(StringUtils.isEmpty(billCode) ){
+                return AjaxResult.error("参数错误");
+            }
+
+            billCode=WaybillHelper.formatQueryValue(billCode);
+            if(!StringUtils.isEmpty(billCode) ){
+                boolean isExists=emisBaseService.checkWaybillIsExists(billCode);
+                if(!isExists){
+                    return AjaxResult.error("运单不存在");
+                }
+                String mainBillCode=emisBaseService.getMainBillCode(billCode);
+                dbEmisWaybill = emisWaybillService.selectEmisWaybillByBillCode(mainBillCode);
+                if(dbEmisWaybill==null){
+                    return AjaxResult.error("运单不存在");
+                }
+            }
+
+            return AjaxResult.success("获取成功",dbEmisWaybill);
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            // 返回子定义异常
+            if(ex instanceof EmisBizError){
+                return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+            }
+
+            return AjaxResult.error("服务器异常，联系客服");
+        }
+    }
+
     /**
      * 获取电子运单信息
      */
@@ -505,9 +545,6 @@ public class EmisWaybillController extends EmisBaseController
     }
 
 
-
-
-
     /**
      * 查询订单列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index c5fb0a1a1..bac2e7bb0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -87,6 +87,7 @@ public interface IEmisWaybillService extends IDataAuditService
     public WaybillOrder getWaybillOrderByBillCode(String billCode) throws EmisBizError;
 
 
+
 //    public WaybillOrder getWaybillOrderByBillCodeByOms(String billCode) throws EmisBizError;
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 2c0b670c8..5440dff21 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -233,6 +233,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
     }
 
+
+
+
     /**
      * 根据订单获取运单
      * @param orderSn