From f3ebf8e4d593e5c33b95f8a4ff391e5174b69e96 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 4 Nov 2024 00:02:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E7=B4=A2=E8=8F=B2=E4=BA=9A?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改索菲亚工厂客户名称和电话逻辑
---
 .../service/impl/DeliveryNoteServiceImpl.java     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
index 9e2de1453..8d8e5fa12 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
@@ -164,16 +164,21 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setOrderCode(orderInfoVO.getOrderNo());
 			advanceEntity.setServiceNum(orderInfoVO.getMainOrderNo());
 			advanceEntity.setSenderFactory(vo.getSendAddr());
-
-
+			// 工长名字为无，则取客户名字 工长名字不为无 则取工长电话 客户名字转工长名字
+			if(StrUtil.equals(orderInfoVO.getConnectName(),"无")){
+				advanceEntity.setCustomerName(orderInfoVO.getReceiver());
+				advanceEntity.setCustomerPhone(orderInfoVO.getReceiveTel());
+			}else{
+				advanceEntity.setCustomerName(orderInfoVO.getReceiver() + " 转 " + orderInfoVO.getConnectName());
+				advanceEntity.setCustomerPhone(orderInfoVO.getConnectPhone());
+			}
+			advanceEntity.setCustomerAddress(orderInfoVO.getReceiveAddr());
 			for (PackageInfoVO orderPackageDTO : packageInfoVOS) {
 				advanceEntity.setDealerCode(orderPackageDTO.getDealerNo());
 				advanceEntity.setDealerName(orderPackageDTO.getDealerName());
 				advanceEntity.setStoreCode(orderPackageDTO.getDealerNo());
 				advanceEntity.setStoreName(orderPackageDTO.getDealerName());
-				advanceEntity.setCustomerName(orderInfoVO.getReceiver() + " 转 " + orderInfoVO.getConnectName());
-				advanceEntity.setCustomerPhone(orderInfoVO.getConnectPhone());
-				advanceEntity.setCustomerAddress(orderInfoVO.getReceiveAddr());
+
 				// 封装包件
 				TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
 				advanceDetailEntity.setWarehouseId(startWarehouseId);