From 937ea0d8ba94362d68d888208142c25d946ea94b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 27 Sep 2024 14:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E4=B8=BB=E5=9B=9E=E5=BA=93=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97BUG,=E6=89=B9=E9=87=8F=E7=AD=BE=E6=94=B6=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3,=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IDistributionDeliveryListClient.java        |  2 +-
 .../feign/DistributionDeliveryListClient.java         |  4 ++--
 .../service/IDistributionDeliveryListService.java     |  2 +-
 .../impl/DistributionDeliveryInfoServiceImpl.java     |  6 ++----
 .../impl/DistributionDeliveryListServiceImpl.java     | 11 +++++++----
 .../service/impl/DistributionSignforServiceImpl.java  | 11 +++++------
 .../impl/WarehouseRetentionRecordServiceImpl.java     |  3 ++-
 7 files changed, 20 insertions(+), 19 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 beade49db..cdd30a8a9 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);
+    boolean retentionDeliveryReservationPackage(@RequestParam("deliveryId")Long deliveryId,@RequestParam("reservationId") Long reservationId,@RequestParam("orderPackageId") Long orderPackageId,@RequestParam("conditions") Integer conditions,@RequestParam("retentionType") Integer retentionType);
 
 
 	/**
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 790cf3ba6..944c38b98 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) {
-		return distributionDeliveryListService.retentionDeliveryReservationPackage(deliveryId,reservationId,orderPackageId,conditions);
+	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType) {
+		return distributionDeliveryListService.retentionDeliveryReservationPackage(deliveryId,reservationId,orderPackageId,conditions,retentionType);
 	}
 
 	@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 8de3123d0..0dfcb1dd7 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);
+	boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType);
 
 	/**
 	 * 滞留取消库存品包件
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
index 6263d2b20..faec775d3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
@@ -777,9 +777,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 						DistributionAppParcelListVO appParcelListVO = Func.copy(parcelListServiceById, DistributionAppParcelListVO.class);
 						loadingNum.getAndAdd(v.getPackageNub());
 						appParcelListVO.setScanStatus(3);
-						appParcelListVO.setIsAbnnormalSigning(1);
-						appParcelListVO.setIsAbnnormalSigningName("异常装车");
-						appParcelListVO.setIsScan("异常");
+						appParcelListVO.setIsScan("异常装车");
 						ks.add(appParcelListVO);
 					});
 					distributionAppStockArticleVO.setIsHaveAbnormalPackage(1);
@@ -815,7 +813,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 							DistributionAppParcelListVO parcelListVO = Func.copy(parcelListEntity, DistributionAppParcelListVO.class);
 							assert parcelListVO != null;
 							parcelListVO.setScanStatus(3);
-							parcelListVO.setIsScan("异常");
+							parcelListVO.setIsScan("异常装车");
 							loadingNum.getAndAdd(parcelListEntity.getQuantity());
 							distributionAppParcelListVOS.add(parcelListVO);
 						}
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 e1c229b02..b2329ca7e 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
@@ -6878,7 +6878,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	@Transactional
-	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions) {
+	public boolean retentionDeliveryReservationPackage(Long deliveryId, Long reservationId, Long orderPackageId, Integer conditions, Integer retentionType) {
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
 		if (Func.isEmpty(deliveryListEntity)) {
 			log.error("###########查询配送任务异常,deliveyId:{}", deliveryId);
@@ -6932,9 +6932,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //				对应签收信息的装车数量要进行扣减
 			int a = distributionSignforMapper.deductionLoadingPacjageNum(loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId(), loadscanEntity.getLoadedNub());
 			//维护订单状态
-			String 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);
+			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());
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 c40a51288..56898a227 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
@@ -5881,7 +5881,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":reservationId:", distributionSignfor.getReservationId(), 60L);
 		NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists);
 		iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
-		return R.status(true);
+		return Resp.scanSuccess((distributionSignforEntity.getReceivedinQuantity()+distributionSignforEntity.getReceivedQuantity())+"件",(distributionSignforEntity.getReceivedinQuantity()+distributionSignforEntity.getReceivedQuantity())+"件");
 	}
 
 	private DistributionDeliverySelfEntity getDriver(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, Boolean isDriverFlag) {
@@ -8385,7 +8385,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionAppParcelListVOS.forEach(p -> {
 							p.setIsAbnormalLoading(1);
 							if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
-								p.setIsAbnnormalSigning(1);
+								p.setIsScan("异常签收");
 							}
 						});
 						distributionAppStockArticleVO.setDistributionAppParcelListVOS(distributionAppParcelListVOS);
@@ -8434,15 +8434,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 										distributionAppParcelListVO.setMaterialName(parcelListEntity.getMaterialName());
 										if (distributionLoadscanEntity.getIsAbnormalLoading().equals(2)) {
 											//异常装车
-											distributionAppParcelListVO.setIsAbnormalLoadingName("异常装车");
-											distributionAppParcelListVO.setIsAbnormalLoading(1);
+											distributionAppParcelListVO.setIsScan("异常装车");
 										}
 										if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 											//签收
 											if (distributionLoadscanEntity.getIsAbnormalSigning().equals(2)) {
 												//异常签收
-												distributionAppParcelListVO.setIsAbnnormalSigningName("异常签收");
-												distributionAppParcelListVO.setIsAbnnormalSigning(1);
+												distributionAppParcelListVO.setIsScan("异常签收");
+
 											}
 										}
 									}
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 eacaa25ad..7622882d8 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
@@ -485,7 +485,8 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 							warehouseRetentionScanEntity.getDeliveryId(),
 							warehouseRetentionScanEntity.getReservationId(),
 							warehouseRetentionScanEntity.getOrderPackageId(),
-							warehouseRetentionScanEntity.getConditions()
+							warehouseRetentionScanEntity.getConditions(),
+							warehouseRetentionScanEntity.getRetentionType();
 						);
 					}
 						result = distributionParcelListClient.maintainInWarehouse(warehouseRetentionScanEntity.getOrderPackageId(), warehouseRetentionScanEntity.getTaskCode());