From 2c035c479be0462539f9bf7549e7be8faacdfedc Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 28 Aug 2025 11:45:55 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=BC=81=E4=B8=9A=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 8 ++++----
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java     | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

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 4cfc23d59..23cd633fb 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
@@ -3600,12 +3600,12 @@ public class EmisBaseService {
                      throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号");
                  }
              } else {
-                 emisCustomerAddressNew.setEnterpriseName(null);
-                 emisCustomerAddressNew.setEnterpriseTaxId(null);
+                 emisCustomerAddressNew.setEnterpriseName(" ");
+                 emisCustomerAddressNew.setEnterpriseTaxId(" ");
              }
          } else {
-             emisCustomerAddressNew.setEnterpriseName(null);
-             emisCustomerAddressNew.setEnterpriseTaxId(null);
+             emisCustomerAddressNew.setEnterpriseName(" ");
+             emisCustomerAddressNew.setEnterpriseTaxId(" ");
          }
      }
 
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 958603850..38d94c6e8 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
@@ -2496,6 +2496,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(isNew) {
             emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate());
         }
+        if (!"0086".equals(emisWaybillSave.getSendCounty())) {
+            emisWaybillSave.setEnterpriseName(" ");
+            emisWaybillSave.setEnterpriseTaxId(" ");
+        }
 
         // 发件地址
         EmisCustomerAddress sendAddress = new EmisCustomerAddress();