Browse Source

1.修复零担无装车数据 复核的问题

pull/2/head
zhenghaoyu 7 months ago
parent
commit
5a2bd6c521
  1. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

12
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -1483,17 +1483,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
private boolean judgmentSignIsHavePackage(Long reservationId) {
boolean flag = false;
boolean flag = true;
List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);
List<DistributionParcelNumberDTO> distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId);
//判断计划内的包件是否都进行签收了
if (Func.isNotEmpty(distributionParcelListEntities)) {
flag = distributionParcelListEntities.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
if(!flag){
return flag;
}
}
//查询库存品是否都已完成签收
List<DisStockListDetailEntity> 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<Distribution
if(Objects.isNull(aBoolean)){
return false;
}else{
flag = aBoolean;
if(!aBoolean){
return false;
}
}
}
}

Loading…
Cancel
Save