From 28fb5cca51ab3e66c9e07cc5b0ff354cda76e723 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 5 Jul 2024 17:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=A1=A8=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93ID=E3=80=81=E4=BB=93=E5=BA=93=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=BB=9E=E7=95=99=E6=89=AB=E6=8F=8FBUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/WarehouseRetentionScanEntity.java  |  8 +++++-
 .../DistributionDeliveryListServiceImpl.java  |  2 ++
 .../DistributionReservationServiceImpl.java   |  4 +++
 .../impl/DistributionSignforServiceImpl.java  | 26 +++++++++----------
 .../WarehouseRetentionRecordServiceImpl.java  |  1 -
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java
index 1bb7b8ec9..76f26627b 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java
@@ -241,6 +241,12 @@ public class WarehouseRetentionScanEntity extends TenantEntity {
 	@ApiModelProperty(value = "运单Id")
 	private Long waybillId;
 
+	/**
+	 * 装车记录Id
+	 */
+	@ApiModelProperty(value = "运单Id")
+	private Long loadingId;
+
 	/**
 	 * 仓库Id
 	 */
@@ -251,6 +257,6 @@ public class WarehouseRetentionScanEntity extends TenantEntity {
 	 * 仓库名称
 	 */
 	@ApiModelProperty(value = "运单Id")
-	private Long warehouseName;
+	private String warehouseName;
 
 }
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 a9fd75428..8fe78c9c9 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
@@ -3053,6 +3053,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionSignforEntity.setDeliveryId(deliveryListEntityId);
 				distributionSignforEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
 				distributionSignforEntity.setReservationId(reservationEntity.getId());
+				distributionSignforEntity.setWarehouseId(myCurrentWarehouse.getId());
+				distributionSignforEntity.setWarehouseName(myCurrentWarehouse.getName());
 				distributionSignforService.save(distributionSignforEntity);
 				//这里查看这个配送任务的备货任务是否已完成，如果已完成则需要开新的备货任务，否则将这个新的预约和原来的备货任务建立绑定关系
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 126bf5b81..afdcf18c4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -1233,6 +1233,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionSignforEntity.setDeliveryId(distributionDeliveryListEntity.getId());
 			distributionSignforEntity.setSigningStatus(SignforStatusConstant.daiqianshou.getValue());
 			distributionSignforEntity.setDriverSigning(SignforStatusConstant.daiqianshou.getValue());
+			distributionSignforEntity.setWarehouseId(myCurrentWarehouse.getId());
+			distributionSignforEntity.setWarehouseName(myCurrentWarehouse.getName());
 			distributionSignforService.save(distributionSignforEntity);
 			//修改预约信息为待配送
 			reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
@@ -2353,6 +2355,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionSignforEntity.setReservationId(reservationEntity.getId());
 			distributionSignforEntity.setTrainNumber(trainNumberMa);
 			distributionSignforEntity.setDeliveryId(distributionDeliveryListEntity.getId());
+			distributionSignforEntity.setWarehouseId(myCurrentWarehouse.getId());
+			distributionSignforEntity.setWarehouseName(myCurrentWarehouse.getName());
 			distributionSignforService.save(distributionSignforEntity);
 			deliveryWarehouseName.add(reservationEntity.getWarehouseName());
 		});
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 eb84b4e2e..08a5c1f65 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
@@ -2559,19 +2559,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						String info = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
 						log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}", deliveryListEntity.getTrainNumber(), info);
 						return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
-					} else {
-						//这里需要判定文员是否对该异常进行驳回操作
-						List<DistributionLoadscanAbnormalEntity> LoadscanAbnormalEntityList = abnormalEntities.stream().filter(f -> deliveryListEntity.getId().equals(f.getDeliveryListId()) && distrilbutionloadingscanDTO.getReservationId().equals(f.getReservationId())).collect(Collectors.toList());
-						if (!LoadscanAbnormalEntityList.isEmpty()) {
-							//存在异常操作
-							if (LoadscanAbnormalEntityList.size() == 1) {
-								//判断是否进行审核以及驳货操作
-								DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = LoadscanAbnormalEntityList.get(0);
-								if (distributionLoadscanAbnormalEntity.getAuditingStatus().equals(3)) {
-									return Resp.scanFail("包件异常已驳回", "包件异常已驳回");
-								}
-							}
-						}
 					}
 					//判断具体的装车信息
 				}
@@ -2748,6 +2735,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
 							return Resp.scanFail("包件已签收", "包件已签收");
 						} else {
+							//查询是否存在异常驳回操作
+							DistributionLoadscanAbnormalEntity abnormalEntity = distributionLoadscanAbnormalService.getOne(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
+								.eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, distrilbutionloadingscanDTO.getDeliveryId())
+								.eq(DistributionLoadscanAbnormalEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
+								.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
+							);
+							//查询是否存在驳回操作
+							 if (!Func.isEmpty(abnormalEntity)){
+								 if (abnormalEntity.getAuditingStatus().equals(3)) {
+									 return Resp.scanFail("包件异常已驳回", "包件异常已驳回");
+								 }
+							}
+
 							return R.fail(3006, null);
 						}
 					} else {
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 ef5e70901..ce3b950f0 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
@@ -206,7 +206,6 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 				r.setRetentionScanUsername(user.getNickName());
 				r.setRetentionQuantity(r.getRetentionQuantity());
 				retentionTotal.getAndAdd(r.getRetentionQuantity());
-				r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
 				//进行滞留之后需要对包件进行取消配送的操作
 				warehouseRetentionScanService.save(Func.copy(r, WarehouseRetentionScanEntity.class));
 			}