From 423234df07f0b0767d02ccfca54a7efce118139c Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 Nov 2023 16:43:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 98b52e272..29898cc63 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
@@ -626,23 +626,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					//判断该货物都属于同一客户才能进行装车
 					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
 					boolean isBelongToReservation = parcelListEntities.stream().allMatch(tp -> parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()).contains(tp.getId()));
+					log.info("#########!!!!!!!!!!!!!!!!!---------    111111111  isBelongToReservation={}",isBelongToReservation);
 					if (isBelongToReservation) {
+						log.info("#########!!!!!!!!!!!!!!!!!---------    222222222");
 						List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 							.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
 							.ne(DistributionLoadscanEntity::getScanStatus, 1)
 							.eq(DistributionLoadscanEntity::getTrayNo, distrilbutionloadingscanDTO.getBarcode()));
 						boolean trayLoadingStatus = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
+						log.info("#########!!!!!!!!!!!!!!!!!---------    333333333 trayLoadingStatus={} loadscanEntityList={}",trayLoadingStatus,loadscanEntityList);
 						if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0 && trayLoadingStatus) {
 							return Resp.scanFail("重复扫描", "重复扫描");
 						}
+						log.info("#########!!!!!!!!!!!!!!!!!---------    444444444 parcelListEntities={}",parcelListEntities);
 						if (Func.isEmpty(parcelListEntities) || parcelListEntities.size() <= 0) {
 							return Resp.scanFail("操作失败", "该托盘上无货物信息");
 						}
+						log.info("#########!!!!!!!!!!!!!!!!!---------    55555555555 distrilbutionloadingscanDTO={}",distrilbutionloadingscanDTO);
 						if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 							//存在客户  这里就是针对客户进行的整托装车
 //							List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
 							Map<Long, DistributionParcelListEntity> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2));
 							boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId())));
+							log.info("#########!!!!!!!!!!!!!!!!!---------    6666666666 reservationFlag={}",reservationFlag);
 							if (reservationFlag) {
 								try {
 									warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId());
@@ -657,6 +663,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
 										distributionParcelListService.updateById(parcelListEntity);
 										DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
+										log.info("#########!!!!!!!!!!!!!!!!!---------    77777777777 distributionDeliverySelfEntity={}",distributionDeliverySelfEntity);
 										if (Func.isNotEmpty(distributionDeliverySelfEntity.getDeliveryId())) {
 											loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
 										}
@@ -700,14 +707,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								distributionLoadscanService.saveBatch(reservationLoadscanEntities);
 								//这里则进行整托装车的数据构建
 							} else {
+								log.info("#########!!!!!!!!!!!!!!!!!---------    101010101010 存在其他客户货物");
 								return Resp.scanFail("整托装车失败", "存在其他客户货物");
 							}
 						}
 					}else {
+						log.info("#########!!!!!!!!!!!!!!!!!---------    101010101010 存在其他客户货物");
 						return Resp.scanFail("整托装车失败", "存在其他客户货物");
 					}
 				}
 			}else {
+				log.info("#########!!!!!!!!!!!!!!!!!---------    101010101010 查询托盘货物失败");
 				return Resp.scanFail("查询托盘货物失败", "查询托盘货物失败");
 			}
 		}

From 0ba38417d5acf409bd3dda3eb7445ff695f40688 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 Nov 2023 16:44:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java        | 1 +
 1 file changed, 1 insertion(+)

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 29898cc63..451eeae0a 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
@@ -612,6 +612,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//不存在配送计划中，这里进行客户的判断
 			}
 		} else if (distrilbutionloadingscanDTO.getType() == 2) {
+			log.info("#########!!!!!!!!!!!!!!!!!---------    000000000  type={}",distrilbutionloadingscanDTO.getType());
 			TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(distrilbutionloadingscanDTO.getBarcode());
 			if (Func.isNotEmpty(trayTypeDataVO)) {
 				List<WarehouseTrayGoodsEntity> voGoodsLsit = trayTypeDataVO.getGoodsLsit();