diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 24629a7b6..585eb4ec5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -3595,7 +3595,10 @@ public class EmisBaseService {
      public void checkAdress(EmisCustomerAddress emisCustomerAddressNew) throws EmisBizError {
          if ("1".equals(emisCustomerAddressNew.getAddressType())) {
              if ("0086".equals(emisCustomerAddressNew.getCountry())) {
-                 if (StringUtil.isBlank(emisCustomerAddressNew.getEnterpriseTaxId()) || StringUtil.isBlank(emisCustomerAddressNew.getEnterpriseName())) {
+                 // 检查是否来自OMS
+                 boolean fromOms = "1".equals(emisCustomerAddressNew.getParams().get("fromOms"));
+                 if (!fromOms && (StringUtil.isBlank(emisCustomerAddressNew.getEnterpriseTaxId())
+                         || StringUtil.isBlank(emisCustomerAddressNew.getEnterpriseName()))) {
                      throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "企业名称/企业税号不能为空");
                  }
 
@@ -3643,7 +3646,7 @@ public class EmisBaseService {
       */
      public boolean validateEnterpriseName(String enterpriseName) {
          if (com.xdadan.erp.common.utils.StringUtils.isEmpty(enterpriseName)) {
-             return false;
+             return true;
          }
 
          // 检查是否包含不允许的字符
@@ -3668,7 +3671,7 @@ public class EmisBaseService {
       */
      public boolean validateEnterpriseTaxId(String enterpriseTaxId) {
          if (com.xdadan.erp.common.utils.StringUtils.isEmpty(enterpriseTaxId)) {
-             return false;
+             return true;
          }
 
          // 检查长度
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 47f6c3d63..5b337ad4b 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
@@ -2166,6 +2166,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         sendAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
         sendAddress.setAddressType("1");
         sendAddress.setCustomerCode(customerCode);
+        sendAddress.setEnterpriseName(emisWaybillSave.getEnterpriseName());
+        sendAddress.setEnterpriseTaxId(emisWaybillSave.getEnterpriseTaxId());
+        if (emisWaybillSave.getSendCustomerAddressId() != null) {
+            sendAddress.setId(Long.valueOf(emisWaybillSave.getSendCustomerAddressId()));
+        }
 
         // 收件地址
         EmisCustomerAddress recieveAddress = new EmisCustomerAddress();
@@ -2223,7 +2228,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         // 保存客户收件、寄件地址
-        createCustomerAddress(sendAddress);
+        sendAddress.getParams().put("fromOms", "1");
+        createCustomerAddressNew(sendAddress);
         createCustomerAddress(recieveAddress);
 
         // 获取泡重比