From 0965f8770606f398e3857226a7023874eb048eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98chaoosc=E2=80=99?= <‘chaoosc@gmail.com’> Date: Thu, 19 Oct 2023 14:45:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=AC=A7=E6=B4=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=90=8C=E6=AD=A5=E8=BF=90=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/oldproject/feign/IAdvanceDetailClient.java | 4 ++++ .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index bdb3ec1d6..1f8e574d0 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -76,6 +76,10 @@ public interface IAdvanceDetailClient { @GetMapping(API_PREFIX + "/getByUnitNo") DistributionParcelListEntityVO getByUnitNo(@RequestParam String unitNo); + + @GetMapping(API_PREFIX + "/getByUnitNoByPyl") + DistributionParcelListEntityVO getByUnitNoByPyl(@RequestParam String unitNo); + @GetMapping(API_PREFIX + "/getAllNumByOrderNo") Integer getAllNumByOrderNo(@RequestParam String orderSelfNum); 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 e542144a8..b3531f93c 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 @@ -576,7 +576,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { /** * 保存包件信息 - * + * * @param unitNo 包条码 * @param distributionStockArticleEntity 订单对象 * @param basicdataWarehouseEntity 仓库对象 @@ -585,6 +585,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { DistributionParcelListEntityVO vo; // 判断当前查询包件不是否为皮阿落 + // todo 这里不合理 需要优化 if("皮阿诺".equals(distributionStockArticleEntity.getBrand())){ vo = advanceDetailClient.getByUnitNoByPyl(unitNo); }else{