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 131a8ad47..aea31def5 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
@@ -120,11 +120,6 @@ public class EmisWaybillController extends EmisBaseController
                 waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber());
             }
 
-            // 判断是否已经锁单
-
-
-
-
             return AjaxResult.success("获取成功",waybillOrder);
         }
         catch (Exception ex){
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 447ab9bd2..0df1dcd86 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
@@ -112,7 +112,7 @@ public interface IEmisWaybillService
      * @param orderSn
      * @return
      */
-    public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
+    public WaybillOrder getWaybillDetailByOrderSn(String orderSn) 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 7098562cc..c91c49b94 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
@@ -173,7 +173,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
     @Override
-    public WaybillOrder getWaybillDetailByBillCode(String billCode){
+    public WaybillOrder getWaybillDetailByBillCode(String billCode) throws EmisBizError{
 
         EmisWaybill dbEmisWaybill = this.selectEmisWaybillByBillCode(billCode);
         if(dbEmisWaybill==null){
@@ -219,7 +219,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
 
     @Override
-    public WaybillOrder getWaybillDetailByOrderSn(String orderSn){
+    public WaybillOrder getWaybillDetailByOrderSn(String orderSn) throws EmisBizError{
 
         EmisWaybill dbEmisWaybill = this.selectEmisWaybillByOrderSn(orderSn);
         if(dbEmisWaybill==null){