From e6cfb159b62eb82d70c94639db0146f4f2fb1591 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Dec 2023 14:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E8=A3=85?=
 =?UTF-8?q?=E8=BD=A6=E6=97=B6=E9=97=B4=E5=92=8C=E7=AD=BE=E6=94=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java     | 16 ++++++++++++----
 1 file changed, 12 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 08da0b886..2df6c4ec3 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
@@ -1243,7 +1243,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())) {
 							distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
 						}
-						distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
+						if (StringUtils.isBlank(distributionLoadscanEntity.getScanTime())) {
+							distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
+						}
+						if (StringUtils.isBlank(distributionLoadscanEntity.getScanUser())) {
+							distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
+						}
 						distributionLoadscanEntity.setPackageId(parcelListEntity.getId());
 						distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
 						distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
@@ -1257,7 +1262,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
 						distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
-						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
@@ -1307,7 +1311,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())) {
 							distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
 						}
-						distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
+						if (StringUtils.isBlank(distributionLoadscanEntity.getScanTime())) {
+							distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
+						}
+						if (StringUtils.isBlank(distributionLoadscanEntity.getScanUser())) {
+							distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
+						}
 						distributionLoadscanEntity.setPackageId(parcelListEntity.getId());
 						distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
 						distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
@@ -1323,7 +1332,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
-						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 						if (Func.isEmpty(loadscanEntity)){
 							distributionLoadscanService.save(distributionLoadscanEntity);