From 502005d7ad70c92b5b3b2e6d61e653c01de297f5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Apr 2024 14:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E9=BB=98=E8=AE=A4=E8=AE=A1=E5=88=92=E6=95=B0=E3=80=81?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BB=93=E5=BA=93=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockArticleServiceImpl.java | 5 +++++ .../service/impl/DistrilbutionBillLadingServiceImpl.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index d81d08bca..211f7d21b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1167,6 +1167,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl stockArticleEntityList = baseMapper.selectAllDistributionOrder(page, stockArticleEntity); List stockArticleVOS = DistributionStockArticleNewWrapper.build().listVO(stockArticleEntityList.getRecords()); + for (DistributionStockArticleVO stockArticleVO : stockArticleVOS) { + if (IsOrNoConstant.no.getValue().equals(stockArticleVO.getIsZero())){ + stockArticleVO.setReservationNum(stockArticleVO.getHandQuantity()); + } + } IPage distributionStockArticleEntityIPage = page.setRecords(stockArticleVOS); return distributionStockArticleEntityIPage; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 9287a1a74..ab809fe37 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1721,13 +1721,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl pageList(IPage page, Map distrilbutionBillLading) { DistrilbutionBillLadingDTO distrilbutionBillLadingDTO = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class); //获取当前登录人仓库 - List myWatchWarehouse = basicdataWarehouseClient.getMyWarehouseList(); - List collect = myWatchWarehouse.stream() + List warehouseList = basicdataWarehouseClient.getMyWarehouseList(); + List collect = warehouseList.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); distrilbutionBillLadingDTO.setWarehouseIdList(collect); - if (Func.isNotEmpty(myWatchWarehouse)){ + if (Func.isNotEmpty(myCurrentWarehouse)){ distrilbutionBillLadingDTO.setWarehouseIdList(null); distrilbutionBillLadingDTO.setWarehouseId(myCurrentWarehouse.getId()); }