From 9440275e2f7d9bb5aa3df36c86957ec0551b427e Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 29 Aug 2023 10:42:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=80=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=9B=B6=E6=8B=85=E8=BF=90=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oldproject/feign/IWayBillClient.java | 3 +++ .../logpm/oldproject/feign/WayBillClient.java | 6 +++++ .../oldproject/service/IWayBillService.java | 3 +++ .../service/impl/WayBillServiceImpl.java | 5 ++++ .../com/logpm/warehouse/dto/WaybillDTO.java | 6 +++++ .../impl/WarehouseWaybillServiceImpl.java | 25 +++++++++++++------ 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java index b2b3b9575..a8ce343ed 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java @@ -39,6 +39,9 @@ public interface IWayBillClient { @GetMapping(API_PREFIX + "/getByWaybillNo") WayBillEntity getByWaybillNo(@RequestParam String waybillNo); + @GetMapping(API_PREFIX + "/getByWaybillId") + WayBillEntity getByWaybillId(@RequestParam Integer waybilId); + @GetMapping(API_PREFIX + "/getByWayBillByAdvanceId") WayBillEntity getByWayBillByAdvanceId(@RequestParam("advId") Integer advId); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java index 5cbbfdfed..ac59be8f3 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java @@ -43,6 +43,12 @@ public class WayBillClient implements IWayBillClient { return wayBillService.getByWaybillNo(waybillNo); } + @Override + @GetMapping(API_PREFIX + "/getByWaybillId") + public WayBillEntity getByWaybillId(Integer waybilId) { + return wayBillService.getByWaybillId(waybilId); + } + @Override @GetMapping(API_PREFIX + "/getByWayBillByAdvanceId") public WayBillEntity getByWayBillByAdvanceId(Integer advId) { diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java index 67077a5b8..964550c1c 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java @@ -9,6 +9,9 @@ public interface IWayBillService { WayBillEntity getByWaybillNo(String waybillNo); + WayBillEntity getByWaybillId(Integer id); + + WayBillEntity getByWayBillByAdvanceId(Integer advId); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java index 3822437da..6e9f2c36f 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java @@ -24,6 +24,11 @@ public class WayBillServiceImpl implements IWayBillService { return wayBillMapper.selectOne(queryWrapper); } + @Override + public WayBillEntity getByWaybillId(Integer id) { + return wayBillMapper.selectById(id); + } + @Override public WayBillEntity getByWayBillByAdvanceId(Integer advId) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java index c4ed116da..16de4af33 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java @@ -7,6 +7,12 @@ import java.io.Serializable; @Data public class WaybillDTO implements Serializable { + + /** + * 运单号ID + */ + private Integer id; + /** * 运单号 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index c153272e6..a4ec24d18 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -3,6 +3,7 @@ package com.logpm.warehouse.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; @@ -71,7 +72,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl waybillQueryWrapper = new QueryWrapper<>(); waybillQueryWrapper.eq("waybill_no", waybillNo); WarehouseWaybillEntity warehouseWaybill = warehouseWaybillMapper.selectOne(waybillQueryWrapper); if (Objects.isNull(warehouseWaybill)) { //如果新系统中不存在这个运单，那么就去查询老系统的运单数据 - WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); - if (Objects.isNull(wayBillEntity)) { - log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillNo={}", waybillNo); - throw new CustomerException("老系统中未找到对应运单"); - } +// WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); +// if (Objects.isNull(wayBillEntity)) { +// log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillNo={}", waybillNo); +// throw new CustomerException("老系统中未找到对应运单"); +// } warehouseWaybill = saveWayBillData(wayBillEntity, allNum); waybillId = warehouseWaybill.getId();