异常签收装车时间和签收时间维护

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);