From a2006c1354a1a419b0a63458605271ee758fad92 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 26 Sep 2024 16:02:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/feign/IDistributionParcelListClient.java | 2 +- .../warehouse/service/impl/WarehouseNodeWorkServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index d026aa5f0..a440bc873 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -182,7 +182,7 @@ public interface IDistributionParcelListClient { * @param warehouseId 仓库ID * @return 包件 */ - @GetMapping(API_PREFIX + "/getListByOrderPackageCode") + @GetMapping(API_PREFIX + "/getListByOrderPackageCodeAndWarehouseId") DistributionParcelListEntity getListByOrderPackageCodeAndWarehouseId(@RequestParam String orderPackageCode,@RequestParam Long warehouseId); @GetMapping(API_PREFIX + "/findAllStockListByOrderPackageCode") diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java index 9a222c4cf..0fc112e42 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseNodeWorkServiceImpl.java @@ -23,7 +23,7 @@ public class WarehouseNodeWorkServiceImpl implements IWarehouseNodeWorkService { @Override public void returnToTheWarehouse(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { - if(user != null){ + if(nodeFanoutMsg != null){ rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndReturnWarehouse.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); } } catch (AmqpException e) {