From 690893bd20a77a6d7d55c9e704071ebc50c897b6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 22 Nov 2023 15:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E7=95=99PDA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WarehouseRetentionRecordServiceImpl.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 2dc2ffc4d..44e0e3673 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
@@ -246,7 +246,8 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 		if (saveFlah.get()){
 			warehouseRetentionRecordEntity.setRetentionQuantity(retentionTotal.get());
 			this.updateById(warehouseRetentionRecordEntity);
-			return Resp.scanSuccess("操作成功", "操作成功");
+
+			return Resp.scanSuccess("操作成功", retentionTotal.get()+"件");
 		}else {
 			throw new RuntimeException("服务器正忙...");
 		}
@@ -270,10 +271,10 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 			.eq(WarehouseRetentionScanEntity::getDeliveryId, warehouseRetentionScanDTOS.getDeliveryId())
 			.eq(WarehouseRetentionScanEntity::getRefId, warehouseRetentionScanDTOS.getId()));
 		WarehouseRetentionRecordEntity retentionRecordEntity = this.getById(warehouseRetentionScanDTOS.getId());
+		AtomicBoolean saveFlah = new AtomicBoolean(false);
 		if (Func.isNotEmpty(retentionScanEntityList)) {
 			BladeUser user = AuthUtil.getUser();
 			Map<Long, WarehouseRetentionScanEntity> retentionPackageMap = retentionScanEntityList.stream().collect(Collectors.toMap(WarehouseRetentionScanEntity::getOrderPackageId, Function.identity(), (k1, k2) -> k2));
-			AtomicBoolean saveFlah = new AtomicBoolean(false);
 			warehouseRetentionScanDTOList.forEach(rs -> {
 				if (Func.isNotEmpty(retentionPackageMap.get(rs.getOrderPackageId()))) {
 					//查看是否是零担，如果是零担需要查看是否发生数量修改
@@ -318,7 +319,12 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 			.eq(WarehouseRetentionScanEntity::getRefId, warehouseRetentionScanDTOS.getId())).stream().mapToInt(WarehouseRetentionScanEntity::getRetentionQuantity).sum();
 		retentionRecordEntity.setRetentionQuantity(retentionTotal);
 		this.updateById(retentionRecordEntity);
-		return Resp.scanSuccess("操作成功", "操作成功");
+		if (saveFlah.get()){
+			return Resp.scanSuccess("操作成功", retentionTotal+"件");
+		}else {
+			throw new RuntimeException("服务器正忙...");
+		}
+
 	}