diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 86d17a8a2..eed7f773c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -1483,17 +1483,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId); List distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId); //判断计划内的包件是否都进行签收了 if (Func.isNotEmpty(distributionParcelListEntities)) { flag = distributionParcelListEntities.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())); + if(!flag){ + return flag; + } } //查询库存品是否都已完成签收 List disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(reservationId); if (Func.isNotEmpty(disStockListDetailEntities)) { flag = disStockListDetailEntities.stream().allMatch(p -> p.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())); + if(!flag){ + return flag; + } } if (Func.isNotEmpty(distributionParcelNumberDTOS)){ for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) { @@ -1502,7 +1508,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl