From 7b281cabb8b896207c9e7d05905483fe9a3a7371 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 1 Aug 2024 01:25:12 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWaybillServiceImpl.java  | 73 +++++++++----------
 1 file changed, 36 insertions(+), 37 deletions(-)

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 659f9340e..77a48ebfc 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
@@ -1732,45 +1732,47 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         recieveAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
         recieveAddress.setAddressType("2");
 
-        // 计算单据归属
-        String customerCode=null;
-        String customerName=null;
+        // 计算订单归属
+        String customerCode=emisWaybillSave.getCustomerCode();
+        String customerName=emisWaybillSave.getCustomerName();
 
-        // 通过电话判断客户是否存在
-        String sendPhone=getCompletePhone(sendAddress.getPhone());
-        EmisCustomerUser emisCustomerUser=getCustomerUserByPhone(sendPhone);
-        if(emisCustomerUser!=null){
-            customerCode=emisCustomerUser.getCustomerCode();
-            customerName=emisCustomerUser.getCustomerName();
-        }else{
-            // 先创建客户
-            EmisCustomerUser newEmisCustomerUser = new EmisCustomerUser();
-            newEmisCustomerUser.setCustomerName(sendAddress.getName());
-            newEmisCustomerUser.setCountry(sendAddress.getCountry());
-            newEmisCustomerUser.setPhone(sendPhone);
-            newEmisCustomerUser.setProvince(sendAddress.getProvince());
-            newEmisCustomerUser.setCity(sendAddress.getCity());
-            newEmisCustomerUser.setCounty(sendAddress.getCounty());
-            newEmisCustomerUser.setTown(sendAddress.getTown());
-            newEmisCustomerUser.setEmail(sendAddress.getEmail());
-            newEmisCustomerUser.setAddress(sendAddress.getAddress());
-            newEmisCustomerUser.setCompany(sendAddress.getCompany());
-            newEmisCustomerUser.setCustomerType("1");
-            newEmisCustomerUser.setSettledType("1");
-            newEmisCustomerUser.setUserType("1");
+        if(StringUtils.isEmpty(customerCode)) {
+            // 通过电话判断客户是否存在
+            String sendPhone = getCompletePhone(sendAddress.getPhone());
+            EmisCustomerUser emisCustomerUser = getCustomerUserByPhone(sendPhone);
+            if (emisCustomerUser != null) {
+                customerCode = emisCustomerUser.getCustomerCode();
+                customerName = emisCustomerUser.getCustomerName();
+            } else {
+                // 先创建客户
+                EmisCustomerUser newEmisCustomerUser = new EmisCustomerUser();
+                newEmisCustomerUser.setCustomerName(sendAddress.getName());
+                newEmisCustomerUser.setCountry(sendAddress.getCountry());
+                newEmisCustomerUser.setPhone(sendPhone);
+                newEmisCustomerUser.setProvince(sendAddress.getProvince());
+                newEmisCustomerUser.setCity(sendAddress.getCity());
+                newEmisCustomerUser.setCounty(sendAddress.getCounty());
+                newEmisCustomerUser.setTown(sendAddress.getTown());
+                newEmisCustomerUser.setEmail(sendAddress.getEmail());
+                newEmisCustomerUser.setAddress(sendAddress.getAddress());
+                newEmisCustomerUser.setCompany(sendAddress.getCompany());
+                newEmisCustomerUser.setCustomerType("1");
+                newEmisCustomerUser.setSettledType("1");
+                newEmisCustomerUser.setUserType("1");
 
-            newEmisCustomerUser.setBlOpenOms("0");
-            newEmisCustomerUser.setRemark("开单自动生成的现金用户");
+                newEmisCustomerUser.setBlOpenOms("0");
+                newEmisCustomerUser.setRemark("开单自动生成的现金用户");
 
-            newEmisCustomerUser.setSalesmen(emisWaybillSave.getSalesmen());
-            newEmisCustomerUser.setPayee(emisWaybillSave.getPayee());
+                newEmisCustomerUser.setSalesmen(emisWaybillSave.getSalesmen());
+                newEmisCustomerUser.setPayee(emisWaybillSave.getPayee());
 
-            // 预置主归属网点
-            newEmisCustomerUser.setOwnerSite(emisWaybillSave.getSendSiteCode());
-            EmisCustomerUser newUser=createCustomerUser(newEmisCustomerUser);
+                // 预置主归属网点
+                newEmisCustomerUser.setOwnerSite(emisWaybillSave.getSendSiteCode());
+                EmisCustomerUser newUser = createCustomerUser(newEmisCustomerUser);
 
-            customerCode = newUser.getCustomerCode();
-            customerName = newUser.getCustomerName();
+                customerCode = newUser.getCustomerCode();
+                customerName = newUser.getCustomerName();
+            }
         }
 
 
@@ -1889,9 +1891,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setSendCounty(" ");
         }
 
-
-
-
     }
 
     /**