diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index a9a677f8c..a8068ec8b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2856,6 +2856,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl waybillIds = v.stream().map(DistributionStockArticleEntity::getWaybillId).distinct().collect(Collectors.toList()); + List mallIds = v.stream().map(DistributionStockArticleEntity::getMallId).distinct().collect(Collectors.toList()); + List storeIds = v.stream().map(DistributionStockArticleEntity::getStoreId).distinct().collect(Collectors.toList()); + if (Func.isNotEmpty(waybillNumbers)){ + reservationEntity.setWaybillNo(waybillNumbers); + } + if (Func.isNotEmpty(storeCodes)){ + reservationEntity.setStoreName(storeCodes); + } + if (Func.isNotEmpty(waybillIds)){ + String w = waybillIds.stream().map(String::valueOf).collect(Collectors.joining(",")); + reservationEntity.setWaybillId(w); + } + if (Func.isNotEmpty(mallIds) && mallIds.size() == 1){ + reservationEntity.setMallId(mallIds.get(0)); + } + if (Func.isNotEmpty(storeIds) && storeIds.size() == 1){ + reservationEntity.setStoreId(storeIds.get(0)); + } + reservationEntity.setStatus(1); distributionReservationMapper.insert(reservationEntity); //新增一个客户 v.forEach(s -> { @@ -2917,7 +2943,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListEntities = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()).ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue()).ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue()).notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()})); if (Func.isEmpty(distributionParcelListEntities)) { - throw new RuntimeException(s.getOrderCode() + "无可用数量"); } distributionParcelListEntities.forEach(dp -> { @@ -2940,7 +2965,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl