1.修复库内作业bug

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) {

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();

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());
 						}