From 9a8c2a1e7b12b51ef18351a2f8b0cb00405c17e0 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 18 Jun 2024 17:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DistributionStockArticleEntity.java         | 10 ++++++++++
 .../controller/DistributionStockArticleController.java |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
index 6f829fa80..ddf0681fb 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
@@ -475,6 +475,8 @@ public class DistributionStockArticleEntity extends TenantEntity {
 		String consigneePerson = distributionStockArticleEntity.getConsigneePerson();
 		String consigneeMobile = distributionStockArticleEntity.getConsigneeMobile();
 		String consigneeAddress = distributionStockArticleEntity.getConsigneeAddress();
+		String consigneeUnit = distributionStockArticleEntity.getConsigneeUnit();
+		String mallName = distributionStockArticleEntity.getMallName();
 
 		StringBuilder stringBuilder = new StringBuilder();
 		boolean nameFlag = ObjectUtil.equals(this.customerName, customerName);
@@ -501,6 +503,14 @@ public class DistributionStockArticleEntity extends TenantEntity {
 		if(!consigneeAddressFlag){
 			stringBuilder.append("运单收货地址：["+this.consigneeAddress+"]修改为["+consigneeAddress+"]；");
 		}
+		boolean consigneeUnitFlag = ObjectUtil.equals(this.consigneeUnit, consigneeUnit);
+		if(!consigneeUnitFlag){
+			stringBuilder.append("运单收货单位：["+this.consigneeUnit+"]修改为["+consigneeUnit+"]；");
+		}
+		boolean mallNameFlag = ObjectUtil.equals(this.mallName, mallName);
+		if(!mallNameFlag){
+			stringBuilder.append("运单收货单位：["+this.mallName+"]修改为["+mallName+"]；");
+		}
 
 		return stringBuilder.toString();
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
index 8152682b3..9ea6a4387 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
@@ -391,10 +391,13 @@ public class DistributionStockArticleController extends BladeController {
 				newStockArticle.setConsigneePerson(consigneePerson);
 				newStockArticle.setConsigneeMobile(stockArticleEntity.getConsigneeMobile());
 				newStockArticle.setConsigneeAddress(stockArticleEntity.getConsigneeAddress());
-			}else{
+			}else if (StringUtil.isNotBlank(customerName)){
 				newStockArticle.setCustomerName(customerName);
 				newStockArticle.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
 				newStockArticle.setCustomerAddress(stockArticleEntity.getCustomerAddress());
+			}else {
+				newStockArticle.setMallName(customerName);
+				newStockArticle.setConsigneeUnit(customerName);
 			}
 			String content = oldStockArticle.compareCustomerInfo(newStockArticle);
 			if(StringUtil.isNotBlank(content)){