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 81ff36f4e..a62077aff 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 @@ -1731,34 +1731,37 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl inventory = baseMapper.getInventory(page, distrilbutionBillLadingEntity); inventory.getRecords().forEach(i -> { + List listed = disStockListDetailService.list(Wrappers.query().lambda() + .eq(DisStockListDetailEntity::getReservationId, i.getBillLadingId()) + .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) + ); - if (i.getQuantity().equals(i.getDeliveryNum())) { + if (Func.isNotEmpty(listed)){ + int sum = listed.stream().filter(f -> InventoryStockUpStatusConstant.yibeihuo.getValue().equals(f.getStockStatus()) && Func.isNotEmpty(f.getStockPackageCode())).mapToInt(DisStockListDetailEntity::getNum).sum(); + log.info(i.getDescriptionGoods()+">>>>>>>>>>>>>>自提客户备货库存数量:",sum); + if (sum == i.getQuantity()){ + i.setEsauInventoryNum(sum); + }else { + i.setEsauInventoryNum(-1); + } + }else { + i.setEsauInventoryNum(-1); + } +// if (i.getQuantity().equals(i.getDeliveryNum())) { //已备货 // List list = distributionBillLadingScanService.list(Wrappers.query().lambda() // .eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) // .eq(DistributionBillLadingScanEntity::getMaterialType, '1') // ); - List listed = disStockListDetailService.list(Wrappers.query().lambda() - .eq(DisStockListDetailEntity::getReservationId, i.getBillLadingId()) - .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) - ); - if (Func.isNotEmpty(listed)){ - int sum = listed.stream().filter(f -> InventoryStockUpStatusConstant.yibeihuo.getValue().equals(f.getStockStatus()) && Func.isNotEmpty(f.getStockPackageCode())).mapToInt(DisStockListDetailEntity::getNum).sum(); - log.info(i.getDescriptionGoods()+">>>>>>>>>>>>>>自提客户备货库存数量:",sum); - if (sum>0){ - i.setEsauInventoryNum(sum); - }else { - i.setEsauInventoryNum(-1); - } - }else { - i.setEsauInventoryNum(-1); - } +// i.setEsauInventoryNum(list.size()); - } else { + + +// } else { //没有备货完成 - i.setEsauInventoryNum(-1); - } +// i.setEsauInventoryNum(-1); +// } }); return inventory;