From 8a28e0137ee9eef2d4689f000a8e76e7e70adbfb Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 9 Nov 2023 10:14:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8E=A8=E9=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 4 ++-- .../logpm/warehouse/api/WarehouseUpdownTypeApiController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 515ea55bf..bb36192b3 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -376,9 +376,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { logger.warn("############handleDataToPlatform: 仓库信息不存在 destinationWarehouse={}",destinationWarehouse); throw new CustomerException(405, "仓库信息不存在"); } - + Long warehouseId = basicdataWarehouseEntity.getId(); //判断新系统是否有这条订单数据 - DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findByAdvanceId(advanceId); + DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderSelfNum,warehouseId); Long id; String waybillNoNum = advanceEntity.getWaybillNo(); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 14e9afc70..ca3b78357 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -67,7 +67,7 @@ public class WarehouseUpdownTypeApiController { return R.data(upShelfDataVOs); }catch (CustomerException e){ log.warn(e.message); - return Resp.scanFail(e.message,e.message); + return Resp.scanFail(e.code,e.message,e.message); }catch (Exception e){ log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员"); @@ -101,7 +101,7 @@ public class WarehouseUpdownTypeApiController { return R.data(upShelfAllocationVO); }catch (CustomerException e){ log.warn(e.message); - return Resp.scanFail(e.message,e.message); + return Resp.scanFail(e.code,e.message,e.message); }catch (Exception e){ log.error(method+"系统异常，联系管理员",e); return R.fail(500,"系统异常，联系管理员");