|
|
@ -893,8 +893,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//维护预约的预约数量
|
|
|
|
//维护预约的预约数量
|
|
|
|
|
|
|
|
maintenanceReservationStatus(reservationId); |
|
|
|
// maintenanceReservationPackageNum(reservationId);
|
|
|
|
// maintenanceReservationPackageNum(reservationId);
|
|
|
|
// maintenanceDeliveryPackageNum(deliveryId);
|
|
|
|
maintenanceDeliveryPackageNum(deliveryId); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1837,6 +1838,29 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void maintenanceReservationStatus(Long reservationId) { |
|
|
|
|
|
|
|
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId); |
|
|
|
|
|
|
|
if (Func.isNotEmpty(distributionReservationEntity)) { |
|
|
|
|
|
|
|
List<DistributionReservationStockarticleEntity> distributionReservationStockarticleEntities = distributionReservationMapper.selectStockArticleByReservationId(distributionReservationEntity.getId()); |
|
|
|
|
|
|
|
Integer planNum = 0; |
|
|
|
|
|
|
|
if (Func.isNotEmpty(distributionReservationStockarticleEntities)) { |
|
|
|
|
|
|
|
planNum += distributionReservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(distributionReservationEntity.getId()); |
|
|
|
|
|
|
|
if (Func.isNotEmpty(distributionReservationStocklistEntities)) { |
|
|
|
|
|
|
|
//统计库存品数
|
|
|
|
|
|
|
|
planNum += distributionReservationStocklistEntities.stream().mapToInt(DistributionReservationStocklistEntity::getReservationNum).sum(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
distributionReservationMapper.updateById(distributionReservationEntity); |
|
|
|
|
|
|
|
if (planNum == 0 ) { |
|
|
|
|
|
|
|
distributionReservationEntity.setIsDeleted(1); |
|
|
|
|
|
|
|
distributionReservationEntity.setCancelReason("无计划数据,系统取消"); |
|
|
|
|
|
|
|
distributionReservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue()); |
|
|
|
|
|
|
|
distributionReservationMapper.updateById(distributionReservationEntity); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// @Transactional
|
|
|
|
// @Transactional
|
|
|
|
private void checkReservationAndDeliverySigningStatus(Long reservationId, Long deliveryId) { |
|
|
|
private void checkReservationAndDeliverySigningStatus(Long reservationId, Long deliveryId) { |
|
|
|
//维护客户签收状态
|
|
|
|
//维护客户签收状态
|
|
|
|