|
|
|
@ -1355,12 +1355,22 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
|
|
|
|
|
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda() |
|
|
|
|
.eq(DistributionLoadscanEntity::getReservationId, reservationId) |
|
|
|
|
.in(DistributionLoadscanEntity::getPackageId, packageIds) |
|
|
|
|
.eq(DistributionLoadscanEntity::getSignforState, 2) |
|
|
|
|
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) |
|
|
|
|
); |
|
|
|
|
for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) { |
|
|
|
|
//判断是全部进行返回还是部分
|
|
|
|
|
if (!loadscanEntityList.isEmpty()) { |
|
|
|
|
//需要比对此品类是否存在签收数据
|
|
|
|
|
List<DistributionLoadscanEntity> zeroLoading = loadscanEntityList.stream().filter(f -> f.getPackageId().equals(distributionParcelNumberDTO.getParcelListId())).collect(Collectors.toList()); |
|
|
|
|
if (!zeroLoading.isEmpty()) { |
|
|
|
|
//存在签收数据,进行部分释放
|
|
|
|
|
} |
|
|
|
|
}else { |
|
|
|
|
//进行全部释放
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(loadscanEntityList)) { |
|
|
|
|
//查看是否存在需要进行回库的零担
|
|
|
|
|
List<Long> collect = loadscanEntityList.stream().filter(f -> packageIds.contains(f.getPackageId())).map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList()); |
|
|
|
|