|
|
|
|
@ -3666,283 +3666,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime()); |
|
|
|
|
//对配送进行更改
|
|
|
|
|
this.updateById(deliveryListEntity); |
|
|
|
|
return R.status(true); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// //根据门店进行分组
|
|
|
|
|
//// Map<String, List<DistributionStockArticleDTO>> storeClient = stockArticle.stream().collect(Collectors.groupingBy(DistributionStockArticleDTO::getStoreName));
|
|
|
|
|
// List<DistributionStockArticleDTO> distributionStockArticleDTOS = storeClient.get("");
|
|
|
|
|
// Map<String, List<DistributionStockArticleDTO>> mallClient = null;
|
|
|
|
|
// if (!Func.isEmpty(distributionStockArticleDTOS)) {
|
|
|
|
|
// mallClient = distributionStockArticleDTOS.stream().collect(Collectors.groupingBy(DistributionStockArticleDTO::getMallName));
|
|
|
|
|
// Map<String, List<DistributionStockArticleDTO>> finalMallClient = mallClient;
|
|
|
|
|
// storeClient.forEach((k, v) -> finalMallClient.merge(k, v, (v1, v2) -> v2));
|
|
|
|
|
// } else {
|
|
|
|
|
// mallClient = storeClient;
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// List<DistributionReservationEntity> reservationEntityList = distributionReservationMapper.getDeliveryReservation(deliveryListEntity.getId());
|
|
|
|
|
// //将原客户和新的进行比对，如果有那么则进行客户修改，最后剩下的订单信息都属于是新客户
|
|
|
|
|
// Map<String, List<DistributionReservationEntity>> originalClient = reservationEntityList.stream().collect(Collectors.groupingBy(DistributionReservationEntity::getConsignee));
|
|
|
|
|
// //查询原来的备货任务
|
|
|
|
|
//// DistributionStockupVO stockupInfo = distributionStockupMapper.getDeliveryStockupInfo(deliveryListEntity.getId());
|
|
|
|
|
// Date date = new Date();
|
|
|
|
|
// BladeUser user = AuthUtil.getUser();
|
|
|
|
|
// AtomicInteger clientNum = new AtomicInteger();
|
|
|
|
|
// AtomicInteger orderNum = new AtomicInteger();
|
|
|
|
|
// mallClient.forEach((k, v) -> {
|
|
|
|
|
// clientNum.getAndIncrement();
|
|
|
|
|
// //判断原始客户中是否存在
|
|
|
|
|
// if (Func.isEmpty(originalClient.get(k))) {
|
|
|
|
|
// //不存在，意味这里应该进行客户的新增
|
|
|
|
|
// DistributionReservationDTO reservation = deliveryListDTO.getReservation();
|
|
|
|
|
// DistributionReservationEntity distributionReservationEntity = Func.copy(reservation, DistributionReservationEntity.class);
|
|
|
|
|
// distributionReservationEntity.setReservationDate(date);
|
|
|
|
|
// distributionReservationEntity.setServeType(deliveryListDTO.getReservation().getServeType());
|
|
|
|
|
// distributionReservationEntity.setConsignee(k);
|
|
|
|
|
// distributionReservationEntity.setDeliveryAddress(v.get(0).getCustomerAddress());
|
|
|
|
|
// distributionReservationEntity.setDeliveryPhone(v.get(0).getCustomerTelephone());
|
|
|
|
|
// distributionReservationEntity.setDeliveryWay(deliveryListDTO.getReservation().getDeliveryWay());
|
|
|
|
|
// distributionReservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
|
|
|
|
|
// distributionReservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
|
|
|
|
|
// distributionReservationEntity.setReservationCode(Func.random(13, RandomType.INT));
|
|
|
|
|
// distributionReservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
|
|
|
|
|
// //默认配送时间为全天
|
|
|
|
|
// distributionReservationEntity.setPeriodOfTime(ServiceConstant.RESERVATION_PERIOED_TIME_DAY);
|
|
|
|
|
// distributionReservationEntity.setCreateUser(user.getUserId());
|
|
|
|
|
// distributionReservationEntity.setCreateDept(Long.parseLong(user.getDeptId()));
|
|
|
|
|
// distributionReservationEntity.setIsDeleted(0);
|
|
|
|
|
// distributionReservationEntity.setStatus(1);
|
|
|
|
|
// distributionReservationEntity.setTenantId(user.getTenantId());
|
|
|
|
|
// distributionReservationEntity.setCreateTime(new Date());
|
|
|
|
|
// distributionReservationEntity.setUpdateUser(user.getUserId());
|
|
|
|
|
// distributionReservationEntity.setUpdateTime(new Date());
|
|
|
|
|
// distributionReservationMapper.insert(distributionReservationEntity);
|
|
|
|
|
// HashSet<String> orderCode = new HashSet<>();
|
|
|
|
|
// HashSet<String> serviceNumber = new HashSet<>();
|
|
|
|
|
// HashSet<String> mallName = new HashSet<>();
|
|
|
|
|
// AtomicInteger packageTotal = new AtomicInteger();
|
|
|
|
|
//
|
|
|
|
|
// v.forEach(s -> {
|
|
|
|
|
// orderNum.getAndIncrement();
|
|
|
|
|
// mallName.add(s.getMallName());
|
|
|
|
|
// DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class);
|
|
|
|
|
// List<DistributionParcelListEntity> packageListInfo = stockArticleDTO.getPackageListInfo();
|
|
|
|
|
// AtomicInteger packageNum = new AtomicInteger();
|
|
|
|
|
// //维护包件信息
|
|
|
|
|
// packageListInfo.forEach(p -> {
|
|
|
|
|
// DistributionReservationPackageEntity packageEntity = new DistributionReservationPackageEntity();
|
|
|
|
|
// packageEntity.setStockArticleId(s.getId());
|
|
|
|
|
// packageEntity.setReservationId(distributionReservationEntity.getId());
|
|
|
|
|
// packageEntity.setPacketBarCode(p.getOrderPackageCode());
|
|
|
|
|
// packageEntity.setPacketBarStatus(ReservationPackageStatusConstant.xinzeng.getValue());
|
|
|
|
|
// packageEntity.setParceListId(p.getId());
|
|
|
|
|
// p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
|
|
|
|
|
// distributionParcelListService.updateById(p);
|
|
|
|
|
// distributionReservationPackageService.save(packageEntity);
|
|
|
|
|
// //包件统计
|
|
|
|
|
// packageNum.getAndAdd(p.getQuantity());
|
|
|
|
|
// });
|
|
|
|
|
// //修改订单信息
|
|
|
|
|
// s.setReservationStatus(distributionReservationPackageService.judgmentStatus(s));
|
|
|
|
|
// DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
|
|
|
|
|
// reservationStockarticleEntity.setReservationNum(packageNum.get());
|
|
|
|
|
// reservationStockarticleEntity.setReservationId(distributionReservationEntity.getId());
|
|
|
|
|
// reservationStockarticleEntity.setStockArticleId(s.getId());
|
|
|
|
|
// reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.zengjia.getValue());
|
|
|
|
|
// distributionReservationStockarticleService.save(reservationStockarticleEntity);
|
|
|
|
|
// distributionStockArticleService.updateById(s);
|
|
|
|
|
// orderCode.add(s.getOrderCode());
|
|
|
|
|
// packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
|
|
|
|
|
// serviceNumber.add(s.getServiceNumber());
|
|
|
|
|
// });
|
|
|
|
|
// distributionReservationEntity.setStockArticleId(String.join(",", orderCode));
|
|
|
|
|
// distributionReservationEntity.setReservationNum(packageTotal.get());
|
|
|
|
|
// distributionReservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
|
|
|
|
|
// distributionReservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
|
|
|
|
|
// distributionReservationEntity.setServiceNumber(String.join(",", serviceNumber));
|
|
|
|
|
// distributionReservationEntity.setMallName(String.join(",",mallName));
|
|
|
|
|
// distributionReservationMapper.updateById(distributionReservationEntity);
|
|
|
|
|
// //建立这个预约和配送任务之间的关系
|
|
|
|
|
// DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
|
|
|
|
|
// distributionSignforEntity.setDeliveryId(deliveryListEntityId);
|
|
|
|
|
// distributionSignforEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
|
|
|
|
|
// distributionSignforEntity.setReservationId(distributionReservationEntity.getId());
|
|
|
|
|
// distributionSignforService.save(distributionSignforEntity);
|
|
|
|
|
// //这里查看这个配送任务的备货任务是否已完成，如果已完成则需要开新的备货任务，否则将这个新的预约和原来的备货任务建立绑定关系
|
|
|
|
|
// DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
|
|
|
|
|
// stockupInfoEntity.setReservationId(distributionReservationEntity.getId());
|
|
|
|
|
// stockupInfoEntity.setStockupId(deliveryStockupInfo.getId());
|
|
|
|
|
// distributionStockupInfoService.save(stockupInfoEntity);
|
|
|
|
|
// } else {
|
|
|
|
|
// DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomer(deliveryListEntityId, k);
|
|
|
|
|
// String stockArticleId = reservationEntity.getStockArticleId();
|
|
|
|
|
// String[] split = stockArticleId.split(",");
|
|
|
|
|
// List<String> list = Arrays.asList(split);
|
|
|
|
|
// HashSet<String> orderNumber = new HashSet<>();
|
|
|
|
|
// orderNumber.addAll(list);
|
|
|
|
|
// AtomicInteger packageTotal = new AtomicInteger();
|
|
|
|
|
// AtomicInteger reduceOrder = new AtomicInteger();
|
|
|
|
|
//// List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationMapper.selectStockArticleByReservationId(reservationEntity.getId());
|
|
|
|
|
// List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId,k);
|
|
|
|
|
// Map<Long, List<DistributionReservationStockarticleEntity>> oldStockArticle = reservationStockarticleEntityList.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId));
|
|
|
|
|
// v.forEach(s -> {
|
|
|
|
|
// orderNum.getAndIncrement();
|
|
|
|
|
// //根据配送和客户名称查询预约
|
|
|
|
|
// AtomicInteger packageNum = new AtomicInteger();
|
|
|
|
|
// AtomicInteger reduceNum = new AtomicInteger();
|
|
|
|
|
// if (Func.isEmpty(oldStockArticle.get(s.getId()))) {
|
|
|
|
|
// //订单新增
|
|
|
|
|
// //维护包件
|
|
|
|
|
// List<DistributionParcelListEntity> packageListInfo = s.getPackageListInfo();
|
|
|
|
|
// packageListInfo.forEach(p -> {
|
|
|
|
|
// DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
|
|
|
|
|
// reservationPackageEntity.setReservationId(reservationEntity.getId());
|
|
|
|
|
// reservationPackageEntity.setStockArticleId(s.getId());
|
|
|
|
|
// reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
|
|
|
|
|
// reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.xinzeng.getValue());
|
|
|
|
|
// reservationPackageEntity.setParceListId(p.getId());
|
|
|
|
|
// distributionReservationPackageService.save(reservationPackageEntity);
|
|
|
|
|
// //统计包件数量
|
|
|
|
|
// packageNum.getAndAdd(p.getQuantity());
|
|
|
|
|
// p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
|
|
|
|
|
// distributionParcelListService.updateById(p);
|
|
|
|
|
// });
|
|
|
|
|
// //查询该订单有效的预约包件数量是否和订单总件数一样，一样订单状态为已预约，否则为部分预约
|
|
|
|
|
//// int number = distributionReservationPackageMapper.selectPackageNum(s.getId());
|
|
|
|
|
//// if (Func.equals(number, s.getTotalNumber())) {
|
|
|
|
|
//// s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
|
|
|
|
|
//// } else {
|
|
|
|
|
//// s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
|
|
|
|
|
//// }
|
|
|
|
|
// DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
|
|
|
|
|
// reservationStockarticleEntity.setReservationId(reservationEntity.getId());
|
|
|
|
|
//// reservationStockarticleEntity.setStockArticleStatus(distributionReservationPackageService.judgmentStatus());
|
|
|
|
|
// reservationStockarticleEntity.setStockArticleId(s.getId());
|
|
|
|
|
// reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.zengjia.getValue());
|
|
|
|
|
// reservationStockarticleEntity.setReservationNum(packageNum.get());
|
|
|
|
|
// distributionReservationStockarticleService.save(reservationStockarticleEntity);
|
|
|
|
|
// packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
|
|
|
|
|
// //拼接订单自编号
|
|
|
|
|
// orderNumber.add(s.getOrderCode());
|
|
|
|
|
// } else {
|
|
|
|
|
// //这里就表示这个订单和这个预约已经存在绑定关系，查看订单是否有修改包件的动作
|
|
|
|
|
// List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), s.getId());
|
|
|
|
|
// Map<Long, List<DistributionReservationPackageEntity>> oldPackage = reservationPackageEntityList.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId));
|
|
|
|
|
// List<DistributionParcelListEntity> packageListInfo = s.getPackageListInfo();
|
|
|
|
|
// Map<Long, List<DistributionParcelListEntity>> newPackage = packageListInfo.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getId));
|
|
|
|
|
// newPackage.forEach((m, n) -> {
|
|
|
|
|
// if (Func.isEmpty(oldPackage.get(m))) {
|
|
|
|
|
// //新增包件
|
|
|
|
|
// DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
|
|
|
|
|
// reservationPackageEntity.setParceListId(n.get(0).getId());
|
|
|
|
|
// reservationPackageEntity.setPacketBarCode(n.get(0).getOrderPackageCode());
|
|
|
|
|
// reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.xinzeng.getValue());
|
|
|
|
|
// reservationPackageEntity.setReservationId(reservationEntity.getId());
|
|
|
|
|
// reservationPackageEntity.setStockArticleId(s.getId());
|
|
|
|
|
// distributionReservationPackageService.save(reservationPackageEntity);
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = n.get(0);
|
|
|
|
|
// parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
|
|
|
|
|
// distributionParcelListService.updateById(parcelListEntity);
|
|
|
|
|
// packageNum.getAndAdd(parcelListEntity.getQuantity());
|
|
|
|
|
// } else {
|
|
|
|
|
// //列表存在这个订单，将它进行移除
|
|
|
|
|
// oldPackage.remove(m);
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// oldPackage.forEach((i, j) -> {
|
|
|
|
|
// DistributionReservationPackageEntity distributionReservationPackageEntity = j.get(0);
|
|
|
|
|
// distributionReservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue());
|
|
|
|
|
// distributionReservationPackageService.updateById(distributionReservationPackageEntity);
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionReservationPackageEntity.getParceListId());
|
|
|
|
|
// parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
|
|
|
|
|
// distributionParcelListService.updateById(parcelListEntity);
|
|
|
|
|
// //统计减少包件数量
|
|
|
|
|
// reduceNum.getAndAdd(parcelListEntity.getQuantity());
|
|
|
|
|
// //移除订单信息前端不会将取消的包件信息传递至后端，这里需要找出该订单下被选择的包件信息进行全部取消的操作
|
|
|
|
|
//
|
|
|
|
|
// //这些数据就是取消的包件
|
|
|
|
|
// });
|
|
|
|
|
// //这里修改结束需要对包件信息进行维护
|
|
|
|
|
// //订单的预约状态判断改变
|
|
|
|
|
// s.setReservationStatus(distributionReservationPackageService.judgmentStatus(s));
|
|
|
|
|
// distributionStockArticleService.updateById(s);
|
|
|
|
|
// List<DistributionReservationStockarticleEntity> reservationStockarticleEntities = oldStockArticle.get(s.getId());
|
|
|
|
|
// DistributionReservationStockarticleEntity reservationStockarticleEntity = reservationStockarticleEntities.get(0);
|
|
|
|
|
// reservationStockarticleEntity.setReservationNum(reservationStockarticleEntity.getReservationNum() + packageNum.get() - reduceNum.get());
|
|
|
|
|
// distributionReservationStockarticleService.updateById(reservationStockarticleEntity);
|
|
|
|
|
// packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum());
|
|
|
|
|
// oldStockArticle.remove(s.getId());
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// //需要进行移除的订单
|
|
|
|
|
// oldStockArticle.forEach((a, b) -> {
|
|
|
|
|
// DistributionReservationStockarticleEntity reservationStockarticleEntity = b.get(0);
|
|
|
|
|
// DistributionStockArticleEntity articleEntity = distributionStockArticleService.getById(reservationStockarticleEntity.getStockArticleId());
|
|
|
|
|
// DistributionStockArticleDTO articleDTO = Func.copy(articleEntity, DistributionStockArticleDTO.class);
|
|
|
|
|
// reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
|
|
|
|
|
// distributionReservationStockarticleService.updateById(reservationStockarticleEntity);
|
|
|
|
|
// //这里需要对订单的预约状态进行判断后修改
|
|
|
|
|
// articleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(articleDTO));
|
|
|
|
|
// distributionStockArticleService.updateById(articleEntity);
|
|
|
|
|
// //订单自编号取消
|
|
|
|
|
// orderNumber.remove(articleEntity.getOrderCode());
|
|
|
|
|
// reduceOrder.getAndAdd(reservationStockarticleEntity.getReservationNum());
|
|
|
|
|
// // 这里移除订单还需要对这个订单下存在的包件进行批量取消
|
|
|
|
|
// List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.getBaseMapper().selectList(
|
|
|
|
|
// Wrappers.<DistributionReservationPackageEntity>query().lambda()
|
|
|
|
|
// .eq(DistributionReservationPackageEntity::getReservationId, b.get(0).getReservationId())
|
|
|
|
|
// .eq(DistributionReservationPackageEntity::getStockArticleId, b.get(0).getStockArticleId()));
|
|
|
|
|
// reservationPackageEntityList.forEach(rs -> {
|
|
|
|
|
// rs.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue());
|
|
|
|
|
// distributionReservationPackageService.updateById(rs);
|
|
|
|
|
// });
|
|
|
|
|
// });
|
|
|
|
|
// // 对预约任务进行修改信息完善
|
|
|
|
|
// //对预约进行修改
|
|
|
|
|
// DistributionReservationDTO reservation = deliveryListDTO.getReservation();
|
|
|
|
|
// reservationEntity.setReservationNum(packageTotal.get());
|
|
|
|
|
// reservationEntity.setStockArticleId(String.join(",", orderNumber));
|
|
|
|
|
// reservationEntity.setServeType(reservation.getServeType());
|
|
|
|
|
// reservationEntity.setDeliveryWay(reservation.getDeliveryWay());
|
|
|
|
|
// reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
|
|
|
|
|
// reservationEntity.setOtherFee(reservation.getOtherFee());
|
|
|
|
|
// originalClient.remove(k);
|
|
|
|
|
// distributionReservationMapper.updateById(reservationEntity);
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// //TODO 对取消的预约进行标识
|
|
|
|
|
// originalClient.forEach((f, g) -> {
|
|
|
|
|
// DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomer(deliveryListEntity.getId(), f);
|
|
|
|
|
// reservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue());
|
|
|
|
|
// distributionReservationMapper.updateById(reservationEntity);
|
|
|
|
|
// //这里还需要将减少的预约单下的所有订单、包件进行取消状态
|
|
|
|
|
// List<DistributionReservationStockarticleEntity> entities = distributionReservationStockarticleMapper.selectList(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
|
|
|
|
|
// .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, "2")
|
|
|
|
|
// .eq(DistributionReservationStockarticleEntity::getReservationId, reservationEntity.getId()));
|
|
|
|
|
// entities.forEach(e->{
|
|
|
|
|
// e.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
|
|
|
|
|
// distributionReservationStockarticleService.updateById(e);
|
|
|
|
|
// //这个订单的包件预约进行取消
|
|
|
|
|
// List<DistributionReservationPackageEntity> packageEntityList = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda().eq(DistributionReservationPackageEntity::getStockArticleId, e.getStockArticleId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, "2"));
|
|
|
|
|
// packageEntityList.forEach(p->{
|
|
|
|
|
// p.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue());
|
|
|
|
|
// distributionReservationPackageService.updateById(p);
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p.getParceListId());
|
|
|
|
|
// parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
|
|
|
|
|
// distributionParcelListService.updateById(parcelListEntity);
|
|
|
|
|
// });
|
|
|
|
|
// DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(e.getStockArticleId());
|
|
|
|
|
// stockArticleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(Func.copy(stockArticleEntity,DistributionStockArticleDTO.class)));
|
|
|
|
|
// distributionStockArticleService.updateById(stockArticleEntity);
|
|
|
|
|
// //修改预约状态和包件状态
|
|
|
|
|
// });
|
|
|
|
|
// List<DistributionReservationEntity> reservationEntities = originalClient.get(f);
|
|
|
|
|
// reservationEntities.forEach(r->{
|
|
|
|
|
// distributionSignforMapper.deleteByReservationAndDeliveryId(r.getId(),deliveryListEntityId);
|
|
|
|
|
// });
|
|
|
|
|
// });
|
|
|
|
|
// 执行发送推送
|
|
|
|
|
distributionReservationService.createBusinessPreConversionQueue(deliveryListEntity.getId()); |
|
|
|
|
|
|
|
|
|
return R.status(true); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
