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 33897a4dc..62b2b7300 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
@@ -1925,7 +1925,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             }
 
             // 判断客户是否停用
-            if(!"1".equals(emisMonthCustomerUser.getStatus())){
+            if(!"1".equals(emisCustomerUser.getStatus())){
                 throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户已停用");
             }
 
@@ -2718,13 +2718,19 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 || "5".equals(emisWaybillSave.getPaymentType())
 
         ){
-            EmisCustomerUser emisMonthCustomerUser=getCustomerUserByMonthlyPayCode(emisWaybillSave.getCustNo());
-            if(emisMonthCustomerUser==null){
+            EmisCustomerUser emisCustomerUser=getCustomerUserByMonthlyPayCode(emisWaybillSave.getCustNo());
+            if(emisCustomerUser==null){
                 throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户不存在");
             }
-            emisWaybillSave.setCustName(emisMonthCustomerUser.getCustName());
-            emisWaybillSave.setPayee(emisMonthCustomerUser.getPayee());
-            emisWaybillSave.setSalesmen(emisMonthCustomerUser.getSalesmen());
+
+            // 判断客户是否停用
+            if(!"1".equals(emisCustomerUser.getStatus())){
+                throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户已停用");
+            }
+
+            emisWaybillSave.setCustName(emisCustomerUser.getCustName());
+            emisWaybillSave.setPayee(emisCustomerUser.getPayee());
+            emisWaybillSave.setSalesmen(emisCustomerUser.getSalesmen());
         }
 
         // 保存客户收件、寄件地址，开单不要关联客户地址数据