商配计划订单移除

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -327,7 +327,6 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "customArgs")
 	public R<IPage<DistributionStockArticleVO>> selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map<String, Object> params, Query query) {
-
 		IPage<DistributionStockArticleVO> distributionStockArticle =  distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query);
 		return R.data(distributionStockArticle);
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -312,7 +312,6 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入distrbutionReservation")
 	public R<IPage<DistributionStockArticleVO>> selectUpdateAvailableStockArticle(@ApiIgnore @RequestParam Long id, Query query,@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle) {
 		IPage<DistributionStockArticleVO> page = Condition.getPage(query);
-
 		List<DistributionStockArticleVO>  stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id,distributionStockArticle);
 		page.setRecords(stockArticleVOS);
 		page.setTotal(stockArticleVOS.size());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -1384,7 +1384,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		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))) {
 				//不存在，意味这里应该进行客户的新增
@@ -1417,6 +1420,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				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();
@@ -1479,6 +1483,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				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();
@@ -1628,6 +1633,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionStockArticleService.updateById(stockArticleEntity);
 				//修改预约状态和包件状态
 			});
+			List<DistributionReservationEntity> reservationEntities = originalClient.get(f);
+			reservationEntities.forEach(r->{
+				distributionSignforMapper.deleteByReservationAndDeliveryId(r.getId(),deliveryListEntityId);
+			});
 		});
 		String kind = deliveryListEntity.getKind();
 		switch (kind) {
@@ -1675,6 +1684,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryListEntity.setDriverName(driverNames.deleteCharAt(driverNames.length() - 1).toString());
 			deliveryListEntity.setVehicleName(vehicleNubs.deleteCharAt(vehicleNubs.length() - 1).toString());
 		}
+		deliveryListEntity.setOrderNumber(orderNum.get());
+		deliveryListEntity.setCustomersNumber(clientNum.get());
 		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);