|
|
@ -1413,9 +1413,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
distributionReservationMapper.insert(distributionReservationEntity); |
|
|
|
distributionReservationMapper.insert(distributionReservationEntity); |
|
|
|
HashSet<String> orderCode = new HashSet<>(); |
|
|
|
HashSet<String> orderCode = new HashSet<>(); |
|
|
|
HashSet<String> serviceNumber = new HashSet<>(); |
|
|
|
HashSet<String> serviceNumber = new HashSet<>(); |
|
|
|
|
|
|
|
HashSet<String> mallName = new HashSet<>(); |
|
|
|
AtomicInteger packageTotal = new AtomicInteger(); |
|
|
|
AtomicInteger packageTotal = new AtomicInteger(); |
|
|
|
|
|
|
|
|
|
|
|
v.forEach(s -> { |
|
|
|
v.forEach(s -> { |
|
|
|
|
|
|
|
mallName.add(s.getMallName()); |
|
|
|
DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class); |
|
|
|
DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class); |
|
|
|
List<DistributionParcelListEntity> packageListInfo = stockArticleDTO.getPackageListInfo(); |
|
|
|
List<DistributionParcelListEntity> packageListInfo = stockArticleDTO.getPackageListInfo(); |
|
|
|
AtomicInteger packageNum = new AtomicInteger(); |
|
|
|
AtomicInteger packageNum = new AtomicInteger(); |
|
|
@ -1451,7 +1453,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
distributionReservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue()); |
|
|
|
distributionReservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue()); |
|
|
|
distributionReservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue()); |
|
|
|
distributionReservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue()); |
|
|
|
distributionReservationEntity.setServiceNumber(String.join(",", serviceNumber)); |
|
|
|
distributionReservationEntity.setServiceNumber(String.join(",", serviceNumber)); |
|
|
|
|
|
|
|
distributionReservationEntity.setMallName(String.join(",",mallName)); |
|
|
|
distributionReservationMapper.updateById(distributionReservationEntity); |
|
|
|
distributionReservationMapper.updateById(distributionReservationEntity); |
|
|
|
//建立这个预约和配送任务之间的关系
|
|
|
|
//建立这个预约和配送任务之间的关系
|
|
|
|
DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity(); |
|
|
|
DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity(); |
|
|
|