From 7de4e808d0225c1c5166c99367c851a0692d1764 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 16 Jun 2023 20:06:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9A=AE=E9=98=BF=E8=AF=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=202023-0?= =?UTF-8?q?6-16=2020:06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/oldproject/feign/IWarehouseClient.java | 3 +++ .../snm/service/impl/PanFactoryDataServiceImpl.java | 8 ++++++++ .../java/com/logpm/oldproject/feign/WarehouseClient.java | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java index 37cb986f8..6b075284f 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java @@ -45,4 +45,7 @@ public interface IWarehouseClient { @GetMapping("/selectIdByName") Integer selectIdByName(@RequestParam String siteName); + + @GetMapping("/selectNameById") + String selectNameById(@RequestParam Integer id); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java index d2781bda9..c7afdf565 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java @@ -17,6 +17,7 @@ import com.logpm.factory.snm.service.IPanFactoryOrderService; import com.logpm.factory.snm.service.IPanOrderStatusLogService; import com.logpm.factory.snm.service.IPanPackageInfoService; import com.logpm.oldproject.feign.IAdvanceDetailClient; +import com.logpm.oldproject.feign.IWarehouseClient; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,6 +46,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private final IPanPackageInfoService panPackageInfoService; private final IPanFactoryOrderService panFactoryOrderService; private final IAdvanceDetailClient advanceDetailClient; + private final IWarehouseClient warehouseClient; // @Override // public FactoryTokenVO getToken(String corpId, String appKey, String appSecret) throws NoSuchAlgorithmException { @@ -179,6 +181,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { //通过包件码查询是否是要推送的订单 String unitNo = orderStatusDTO.getUnitNo();//包件码 + String currentWarehouse = orderStatusDTO.getCurrentWarehouse(); QueryWrapper packageInfoQueryWrapper = new QueryWrapper<>(); packageInfoQueryWrapper.eq("unit_no",unitNo); PanPackageInfo one = panPackageInfoService.getOne(packageInfoQueryWrapper); @@ -189,7 +192,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { String plantId = one.getPlantId(); //查询destinationWarehouse logiBillNo plantId数据 Map supplyData = advanceDetailClient.getSupplyData(unitNo); + + //根据仓库ID查询仓库名字 + currentWarehouse = warehouseClient.selectNameById(Integer.parseInt(currentWarehouse)); + orderStatusDTO.setPlantId(plantId); + orderStatusDTO.setCurrentWarehouse(currentWarehouse); orderStatusDTO.setDestinationWarehouse(supplyData.get("destinationWarehouse")); // orderStatusDTO.setDestinationWarehouse("南充市"); orderStatusDTO.setLogiBillNo(supplyData.get("logiBillNo")); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WarehouseClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WarehouseClient.java index a62994778..8e2e3ef2a 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WarehouseClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WarehouseClient.java @@ -16,6 +16,7 @@ */ package com.logpm.oldproject.feign; +import com.logpm.oldproject.entity.WarehouseEntity; import com.logpm.oldproject.service.IWarehouseService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; @@ -42,4 +43,10 @@ public class WarehouseClient implements IWarehouseClient { return warehouseService.selectIdByName(siteName); } + + @Override + public String selectNameById(Integer id) { + WarehouseEntity warehouseEntity = warehouseService.getById(id); + return warehouseEntity.getTitle(); + } }