From 48e094fd36ed0932ea3f25e464f41cf4a6166502 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 9 Oct 2024 17:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=BC=82=E5=B8=B8=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IDistributionDeliveryListClient.java      |  2 +-
 .../feign/DistributionDeliveryListClient.java |  4 +-
 .../IDistributionDeliveryListService.java     |  2 +-
 .../DistributionDeliveryListServiceImpl.java  | 51 ++++++++++---------
 .../WarehouseRetentionRecordServiceImpl.java  |  5 +-
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java
index cdd30a8a9..f86d71f20 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java
@@ -74,7 +74,7 @@ public interface IDistributionDeliveryListClient {
 	 * @return
 	 */
 	@GetMapping(TOP+"/retentionDeliveryReservationPackage")
-    boolean retentionDeliveryReservationPackage(@RequestParam("deliveryId")Long deliveryId,@RequestParam("reservationId") Long reservationId,@RequestParam("orderPackageId") Long orderPackageId,@RequestParam("conditions") Integer conditions,@RequestParam("retentionType") Integer retentionType);
+    boolean retentionDeliveryReservationPackage(@RequestParam("deliveryId")Long deliveryId,@RequestParam("reservationId") Long reservationId,@RequestParam("orderPackageId") Long orderPackageId,@RequestParam("conditions") Integer conditions,@RequestParam("retentionType") Integer retentionType,@RequestParam("flag")boolean flag);
 
 
 	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java
index 944c38b98..e449b5def 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java
@@ -69,8 +69,8 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 	}
 
 	@Override
-	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType) {
-		return distributionDeliveryListService.retentionDeliveryReservationPackage(deliveryId,reservationId,orderPackageId,conditions,retentionType);
+	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType,boolean flag) {
+		return distributionDeliveryListService.retentionDeliveryReservationPackage(deliveryId,reservationId,orderPackageId,conditions,retentionType,flag);
 	}
 
 	@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
index 0dfcb1dd7..22351e715 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
@@ -364,7 +364,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param conditions
 	 * @return
 	 */
-	boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType);
+	boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType,boolean flag);
 
 	/**
 	 * 滞留取消库存品包件
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 cbb47cdf3..b3e291f62 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
@@ -6877,7 +6877,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	@Transactional
-	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType) {
+	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType,boolean flag) {
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
 		if (Func.isEmpty(deliveryListEntity)) {
 			log.error("###########查询配送任务异常,deliveyId:{}", deliveryId);
@@ -6917,30 +6917,35 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//查询异常信息，对异常信息进行清理
 		log.info("滞留查询审核列表信息:{}", row);
 		//查询出多个包件信息
-		if (Func.isNotEmpty(loadscanEntity)) {
-			//修改包件状态  达到回库的状态
-			DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(loadscanEntity.getPackageId());
-			//已经进行装车
-			loadscanEntity.setScanStatus(LoadingStatusConstant.quxiao.getValue());
-			distributionLoadscanService.updateById(loadscanEntity);
-			//对此包件进行回库操作
-			parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
-			parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
-			parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue());
-			distributionParcelListService.updateById(parcelListEntity);
+		if (flag){
+			if (Func.isNotEmpty(loadscanEntity)) {
+				//修改包件状态  达到回库的状态
+				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(loadscanEntity.getPackageId());
+				//已经进行装车
+				loadscanEntity.setScanStatus(LoadingStatusConstant.quxiao.getValue());
+				distributionLoadscanService.updateById(loadscanEntity);
+				//对此包件进行回库操作
+
+				parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+				parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue());
+				distributionParcelListService.updateById(parcelListEntity);
+
 //				对应签收信息的装车数量要进行扣减
-			int a = distributionSignforMapper.deductionLoadingPacjageNum(loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId(), loadscanEntity.getLoadedNub());
-			//维护订单状态
-			String content = "";
-			if (retentionType.equals(RetentionSourceTypeConstant.zizhuxinzeng.getValue())) {
-				content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "取消配送,取消方式:自主回库,配送车次号:" + loadscanEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
-				JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode());
-				aaa.add(js);
-			}
-			//对滞留包件进行签收信息数量减少
-			//进行指定包件的相关订单维护
-			distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), parcelListEntity.getWarehouseId());
+				int a = distributionSignforMapper.deductionLoadingPacjageNum(loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId(), loadscanEntity.getLoadedNub());
+				//维护订单状态
+				String content = "";
+				if (retentionType.equals(RetentionSourceTypeConstant.zizhuxinzeng.getValue())) {
+					content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "取消配送,取消方式:自主回库,配送车次号:" + loadscanEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
+					JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode());
+					aaa.add(js);
+				}
+				//对滞留包件进行签收信息数量减少
+				//进行指定包件的相关订单维护
+				distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), parcelListEntity.getWarehouseId());
+			}
 		}
+
 		if (!aaa.isEmpty()) {
 			trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
 		}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
index 7274dc278..746e89e3e 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
@@ -431,7 +431,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 				switch (warehouseRetentionScanEntity.getConditions()) {
 					case 1:
 						//订制品
-						saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationPackage(warehouseRetentionScanEntity.getDeliveryId(), warehouseRetentionScanEntity.getReservationId(), warehouseRetentionScanEntity.getOrderPackageId(), warehouseRetentionScanEntity.getConditions(),warehouseRetentionScanEntity.getRetentionType()));
+						saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationPackage(warehouseRetentionScanEntity.getDeliveryId(), warehouseRetentionScanEntity.getReservationId(), warehouseRetentionScanEntity.getOrderPackageId(), warehouseRetentionScanEntity.getConditions(),warehouseRetentionScanEntity.getRetentionType(),false));
 						break;
 					case 2:
 						//库存品
@@ -488,7 +488,8 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 							warehouseRetentionScanEntity.getReservationId(),
 							warehouseRetentionScanEntity.getOrderPackageId(),
 							warehouseRetentionScanEntity.getConditions(),
-							warehouseRetentionScanEntity.getRetentionType()
+							warehouseRetentionScanEntity.getRetentionType(),
+							true
 						);
 					}
 						result = distributionParcelListClient.maintainInWarehouse(warehouseRetentionScanEntity.getOrderPackageId(), warehouseRetentionScanEntity.getTaskCode());