From 009182675cf8968ed4527acb341b876361f4a0ea Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 15 Jan 2024 14:09:00 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=89=B9=E9=87=8F=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 5407bdab4..e4a66e6ab 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -2975,7 +2975,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					loadscanEntity.setOrderId(parcelNumberEntity.getStockArticleId());
 					loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId());
 					loadscanEntity.setReservationId(distributionSignforEntity.getReservationId());
-					loadscanEntity.setScanUser(user.getUserName());
+					loadscanEntity.setScanUser(user.getNickName());
 					loadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
 					loadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum());
 					loadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum());
@@ -3058,10 +3058,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					loadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
 					loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId());
 					loadscanEntity.setReservationId(distributionSignforEntity.getReservationId());
-					loadscanEntity.setScanUser(user.getUserName());
+					loadscanEntity.setScanUser(user.getNickName());
 					loadscanEntity.setScanTime(signingTime);
 					loadscanEntity.setPackageNub(parcelListEntity.getQuantity());
-					loadscanEntity.setSigningUser(user.getUserName());
+					loadscanEntity.setSigningUser(user.getNickName());
 					loadscanEntity.setSigningUserId(user.getUserId());
 					if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) {
 						loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
@@ -3116,7 +3116,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity());
 						loadscanEntities.setOneClick(1);
 						loadscanEntities.setOneQclick(2);
-						loadscanEntities.setSigningUser(user.getUserName());
+						loadscanEntities.setSigningUser(user.getNickName());
 						loadscanEntities.setSigningUserId(user.getUserId());
 						loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity());
 						loadscanEntities.setSigningTime(signingTime);