From 1fba1f809ea6a6ab9fbdabfb42dc579ff5ee8046 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 22 Jan 2025 15:28:11 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CarsLoadAsyncServiceImpl.java | 6 ++++-- .../config/RabbitMqConfiguration.java | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java index a23bd2875..54ecc4fef 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java @@ -34,7 +34,6 @@ import com.logpm.trunkline.vo.UnloadReportVO; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; -import com.logpm.warehouse.vo.DownPackageTrayVO; import lombok.extern.slf4j.Slf4j; import org.springblade.common.annotations.LogpmAsync; import org.springblade.common.constant.DictBizConstant; @@ -251,7 +250,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { Long finalNodeId = scanEntity.getFinalNodeId(); Long unloadNodeId = scanEntity.getUnloadNodeId(); String unloadNodeName = scanEntity.getUnloadNodeName(); - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + DistributionStockArticleEntity stockArticleEntity = null; + if(!Objects.isNull(fromWarehouseId)){ + stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + } WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); if (Objects.isNull(waybillEntity)) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java index b2bb6db12..1df071d95 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java @@ -7,8 +7,6 @@ import org.springframework.amqp.core.*; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.connection.CorrelationData; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.rabbit.retry.MessageRecoverer; -import org.springframework.amqp.rabbit.retry.RepublishMessageRecoverer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -91,15 +89,15 @@ public class RabbitMqConfiguration { return BindingBuilder.bind(errorQueue).to(errorMessageExchange).with(RabbitConstant.WAREHOUSE_ERROR_ROUTING); } - /** - * 消费失败队列 - * @param rabbitTemplate - * @return - */ - @Bean - public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){ - return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.WAREHOUSE_ERROR_EXCHANGE, RabbitConstant.WAREHOUSE_ERROR_ROUTING); - } +// /** +// * 消费失败队列 +// * @param rabbitTemplate +// * @return +// */ +// @Bean +// public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){ +// return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.WAREHOUSE_ERROR_EXCHANGE, RabbitConstant.WAREHOUSE_ERROR_ROUTING); +// }