1.修复库内作业bug

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java

@@ -806,6 +806,7 @@ public class WarehouseTrayAllocationListener {
 	}
 
 	private void updateStockListAllocationInfo(List<Long> stockListIds, Long warehouseId, String allocationName) {
+		if(!stockListIds.isEmpty()){
 			List<DistributionStockListEntity> stockListEntities = stockListService.listByIds(stockListIds);
 
 			List<DistributionStockListEntity> updateStockListList = new ArrayList<>();
@@ -829,7 +830,7 @@ public class WarehouseTrayAllocationListener {
 			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());
 						}