From 4f369386ebadf91846c073ec0b7ca564ba9c051c Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 25 Jun 2024 11:42:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=86=85=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehouseTrayAllocationListener.java      | 39 ++++++++++---------
 .../impl/WarehouseTrayTypeServiceImpl.java    |  2 +
 .../impl/WarehouseUpdownTypeServiceImpl.java  |  2 +-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java
index 784eabaa3..9902a08c9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java
@@ -806,30 +806,31 @@ public class WarehouseTrayAllocationListener {
 	}
 
 	private void updateStockListAllocationInfo(List<Long> stockListIds, Long warehouseId, String allocationName) {
-		List<DistributionStockListEntity> stockListEntities = stockListService.listByIds(stockListIds);
+		if(!stockListIds.isEmpty()){
+			List<DistributionStockListEntity> stockListEntities = stockListService.listByIds(stockListIds);
 
-		List<DistributionStockListEntity> updateStockListList = new ArrayList<>();
-		stockListEntities.forEach(stockListEntity -> {
-			DistributionStockListEntity updateStockListEntity = new DistributionStockListEntity();
-			updateStockListEntity.setId(stockListEntity.getId());
-			String storageLocation = stockListEntity.getStorageLocation();
-			if(StringUtil.isBlank(storageLocation)){
-				updateStockListEntity.setStorageLocation(allocationName);
-				updateStockListList.add(updateStockListEntity);
-			}else{
-				if(!storageLocation.contains(allocationName)){
-					String[] split = storageLocation.split(",");
-					List<String> allocationList = new ArrayList<>(Arrays.asList(split));
-					allocationList.add(allocationName);
-					updateStockListEntity.setTrayName(StringUtil.join(allocationList,","));
+			List<DistributionStockListEntity> updateStockListList = new ArrayList<>();
+			stockListEntities.forEach(stockListEntity -> {
+				DistributionStockListEntity updateStockListEntity = new DistributionStockListEntity();
+				updateStockListEntity.setId(stockListEntity.getId());
+				String storageLocation = stockListEntity.getStorageLocation();
+				if(StringUtil.isBlank(storageLocation)){
+					updateStockListEntity.setStorageLocation(allocationName);
 					updateStockListList.add(updateStockListEntity);
+				}else{
+					if(!storageLocation.contains(allocationName)){
+						String[] split = storageLocation.split(",");
+						List<String> allocationList = new ArrayList<>(Arrays.asList(split));
+						allocationList.add(allocationName);
+						updateStockListEntity.setTrayName(StringUtil.join(allocationList,","));
+						updateStockListList.add(updateStockListEntity);
+					}
 				}
+			});
+			if(!updateStockListList.isEmpty()){
+				stockListService.updateBatchById(updateStockListList);
 			}
-		});
-		if(!updateStockListList.isEmpty()){
-			stockListService.updateBatchById(updateStockListList);
 		}
-
 	}
 
 	private void updateZeroAllocationInfo(List<String> orderCodes, String allocationName, Long warehouseId) {
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 88af4e5fd..89a58fb36 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -1642,6 +1642,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			jsonObject.put("dataType",2);
 			jsonObject.put("operation",1);
 			jsonObject.put("orderCodes",orderCodes);
+			jsonObject.put("warehouseId",warehouseId);
 			jsonObject.put("trayName",trayName);
 
 			FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
@@ -1771,6 +1772,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			jsonObject.put("dataType",2);
 			jsonObject.put("operation",1);
 			jsonObject.put("orderCodes",orderCodes);
+			jsonObject.put("warehouseId",warehouseId);
 			jsonObject.put("trayName",trayName);
 
 			FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index b634cf4b1..2bcbdc612 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -3555,7 +3555,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 						String materialCode = trayGoodsEntity.getAssociationValue();
 						String incomingBatch = trayGoodsEntity.getIncomingBatch();
 						Long marketId = trayGoodsEntity.getMarketId();
-						DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, incomingBatch, materialCode, warehouseId);
+						DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode, incomingBatch, warehouseId);
 						if(!Objects.isNull(stockListEntity)){
 							stockListIds.add(stockListEntity.getId());
 						}