Merge remote-tracking branch 'origin/dev' into dev

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

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
+//	 * @param rabbitTemplate
-	 * @return
+//	 * @return
-	 */
+//	 */
-	@Bean
+//	@Bean
-	public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){
+//	public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){
-		return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.WAREHOUSE_ERROR_EXCHANGE, RabbitConstant.WAREHOUSE_ERROR_ROUTING);
+//		return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.WAREHOUSE_ERROR_EXCHANGE, RabbitConstant.WAREHOUSE_ERROR_ROUTING);
-	}
+//	}