From 285118f7b3e3181ff9a6f8f681f263f23064b89d Mon Sep 17 00:00:00 2001 From: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Tue, 5 Sep 2023 15:42:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81=E8=AE=A2?= =?UTF-8?q?=E5=88=B6=E5=93=81=E5=8C=85=E6=9D=A1=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B7=B2=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockArticleMapper.xml | 1 + .../impl/WarehouseTrayTypeServiceImpl.java | 17 ++++++++++ .../impl/WarehouseUpdownTypeServiceImpl.java | 31 ++++++++++++++++++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index d8c811026..f70c274cd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -304,6 +304,7 @@ ldsa.complete_set completeSet from logpm_distribution_stock_article ldsa where ldsa.is_deleted = 0 + and ldsa.genre == 1 and ldsa.service_number = #{serviceNumber} </select> diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 86e643b08..62d2cde0f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -207,6 +207,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT log.warn("#########orderScanOrderPackageCode: 未找到订单信息 orderCode={}",orderCode); return R.fail(403,"未找到订单信息"); } + Integer genre = stockArticleEntity.getGenre(); + if(genre == 2){ + log.warn("#########orderScanOrderPackageCode: 该包件已转库存品 orderCode={}",orderCode); + return R.fail(403,"该包件已转库存品"); + } //查询打托方式信息 QueryWrapper<WarehouseTrayTypeEntity> queryWrapper = new QueryWrapper<>(); @@ -875,6 +880,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT log.warn("#########scanStockOrderPackageCode: 未找到包件信息 orderPackageCode={}",orderPackageCode); return R.fail(403,"未找到包件信息"); } + String orderCode = parcelListEntity.getOrderCode();//订单自编码 + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(orderCode); + if(Objects.isNull(stockArticleEntity)){ + log.warn("#########scanStockOrderPackageCode: 未找到订单信息 orderCode={}",orderCode); + return R.fail(403,"未找到订单信息"); + } + Integer genre = stockArticleEntity.getGenre(); + if(genre == 1){ + log.warn("#########scanStockOrderPackageCode: 该包件订单还未转库存品 orderCode={}",orderCode); + return R.fail(403,"该包件订单还未转库存品"); + } + Long parcelListId = parcelListEntity.getId();//包件id DistributionStockListEntity distributionStockListEntity = distributionStockListClient.getStockListByParcelListId(parcelListId); if(Objects.isNull(distributionStockListEntity)){ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 80e469e78..528dd878c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -133,7 +133,18 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd log.warn("#################findUpShelfScanGoods: 包件信息不存在 code={}",code); throw new CustomerException(403,"包件信息不存在"); } - String serviceNumber = parcelListEntity.getServiceNumber(); + String orderCode = parcelListEntity.getOrderCode(); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(orderCode); + if(Objects.isNull(stockArticleEntity)){ + log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}",orderCode); + throw new CustomerException(403,"订单信息不存在"); + } + Integer genre = stockArticleEntity.getGenre(); + if(genre == 2){ + log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode); + throw new CustomerException(403,"该包件订单已转库存品"); + } + String serviceNumber = stockArticleEntity.getServiceNumber(); List<Map> ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber); List<UpShelfDataVO> list = new ArrayList<>(); for (Map map:ls){ @@ -158,6 +169,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}",orderCode); throw new CustomerException(403,"订单信息不存在"); } + Integer genre = stockArticleEntity.getGenre(); + if(genre == 2){ + log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode); + throw new CustomerException(403,"该包件订单已转库存品"); + } + List<UpShelfDataVO> ls = new ArrayList<>(); UpShelfDataVO dataVO = new UpShelfDataVO(); dataVO.setServiceNum(stockArticleEntity.getServiceNumber()); @@ -173,6 +190,18 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd log.warn("#################findUpShelfScanGoods: 包件信息不存在 code={}",code); throw new CustomerException(403,"包件信息不存在"); } + String orderCode = parcelListEntity.getOrderCode(); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(orderCode); + if(Objects.isNull(stockArticleEntity)){ + log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}",orderCode); + throw new CustomerException(403,"订单信息不存在"); + } + Integer genre = stockArticleEntity.getGenre(); + if(genre == 2){ + log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode); + throw new CustomerException(403,"该包件订单已转库存品"); + } + String orderPackageGroundingStatus = parcelListEntity.getOrderPackageGroundingStatus(); // if("20".equals(orderPackageGroundingStatus)){ // log.warn("#################findUpShelfScanGoods: 包件已上架 code={}",code);