From 694f78cd5dce93ccbb07a87272c8c6b018a09f4a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 18 Apr 2024 18:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A5=E5=BD=95=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 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 5f656e01c..4ac90a620 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
@@ -1169,6 +1169,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		int c = 0;
 		//冻结数
 		int d = 0;
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
 		if (Func.isEmpty(loadscanEntity)) {
 
 			if ("1".equals(deliveryListEntity.getKind())) {
@@ -1190,7 +1191,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			d = distributionParcelNumberDTO.getDeliveryQuantity() - reservationZeroPackageEntities.getQuantity();
 			//未进行装车操作
 			DistributionLoadscanEntity unLoadscanEntity = new DistributionLoadscanEntity();
-			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
 			unLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 			unLoadscanEntity.setIsInsert(2);
 			unLoadscanEntity.setLoadingId(loadingId.toString());
@@ -1212,7 +1212,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			unLoadscanEntity.setLoadingId(driverPhone);
 			unLoadscanEntity.setScanType(LoadingStatusConstant.buluzhuangche.getValue());
 			unLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
-			unLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
+			unLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
 			unLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 			unLoadscanEntity.setSigningUserId(user.getUserId());
 			unLoadscanEntity.setSigningUser(user.getNickName());
@@ -1248,6 +1248,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			loadscanEntity.setReceivedQuantity(reservationZeroPackageEntities.getQuantity());
 			loadscanEntity.setLoadedNub(reservationZeroPackageEntities.getQuantity());
 			loadscanEntity.setPackageNub(reservationZeroPackageEntities.getQuantity());
+			loadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
 			loadscanEntity.setMsg("文员进行签收补录");
 			distributionLoadscanService.updateById(loadscanEntity);
 			distributionParcelNumberEntity.setHandQuantity(a);