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()); }