From f4676853043c40898bd7b183b719a22fb2f179a1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 2 Sep 2024 17:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E8=A3=85=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListServiceImpl.java  | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index c590d6f0b..8ba741650 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -1783,7 +1783,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	 *
 	 * @param distrilbutionloadingscanDTO
 	 * @param distributionDeliverySelfEntity
-	 * @param disStockListDetailEntities
 	 * @return
 	 */
 	@NotNull
@@ -1825,6 +1824,45 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		return distributionLoadscaninvnEntity;
 	}
 
+	@NotNull
+	private static DistributionLoadscaninvnEntity getDistributionLoadscaninvnEntity(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionDeliverySelfEntity distributionDeliverySelfEntity, List<DisStockListDetailEntity> disStockListDetailEntities, BasicdataWarehouseEntity warehouseEntity) {
+		DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity();
+		BladeUser user = AuthUtil.getUser();
+		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+
+		if (null != distributionDeliverySelfEntity.getDriverId()) {
+			distributionLoadscaninvnEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+		}
+		if (null != distributionDeliverySelfEntity.getDriverName()) {
+			distributionLoadscaninvnEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
+		}
+		if (null != distributionDeliverySelfEntity.getVehicleId()) {
+			distributionLoadscaninvnEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+		}
+		if (null != distributionDeliverySelfEntity.getVehicleNub()) {
+			distributionLoadscaninvnEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
+		}
+		if (null != distributionDeliverySelfEntity.getId()) {
+			distributionLoadscaninvnEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
+		}
+		distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue());
+		distributionLoadscaninvnEntity.setScanType("1");
+		distributionLoadscaninvnEntity.setScanUser(user.getUserName());
+		distributionLoadscaninvnEntity.setScanTime(now);
+		distributionLoadscaninvnEntity.setOrderPackageCode(disStockListDetailEntities.get(0).getStockPackageCode());
+		distributionLoadscaninvnEntity.setInventoryId(disStockListDetailEntities.get(0).getStockListId());
+		distributionLoadscaninvnEntity.setReservationId(disStockListDetailEntities.get(0).getReservationId());
+		distributionLoadscaninvnEntity.setOneClick(1);
+		distributionLoadscaninvnEntity.setWarehouseId(warehouseEntity.getId());
+		distributionLoadscaninvnEntity.setWarehouseName(warehouseEntity.getName());
+		distributionLoadscaninvnEntity.setInventoryPackageId(disStockListDetailEntities.get(0).getId());
+		distributionLoadscaninvnEntity.setLoadedNub(disStockListDetailEntities.get(0).getNum());
+		distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
+		distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.zhengchang.getValue());
+		distributionLoadscaninvnEntity.setScanSynchronous(1);
+		return distributionLoadscaninvnEntity;
+	}
+
 
 	@Override
 	public IPage<DistributionDeliveryListPrintReponseVO> customListPage(IPage<DistributionDeliveryListPrintReponseVO> page, QueryWrapper<DistributionDeliveryListPrintRequestVO> queryWrapper) {