维护预约单状态BUG修复

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

@@ -4164,6 +4164,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			stockupEntity.setCreateTime(new Date());
 //			stockupEntity.setOutboundDate(new Date());
 			stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
+			List<Long> newstockUpIds = new ArrayList<>();
+
 			distributionStockupMapper.insert(stockupEntity);
 			for (DistributionReservationEntity distributionReservationEntity : needStockUpReservationList) {
 				DistributionStockupInfoEntity distributionStockupInfoEntity = new DistributionStockupInfoEntity();
@@ -4171,11 +4173,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionStockupInfoEntity.setStockupId(stockupEntity.getId());
 				distributionStockupInfoEntity.setStockUpType(distributionReservationEntity.getDeliveryType());
 				distributionStockupInfoService.save(distributionStockupInfoEntity);
+				newstockUpIds.add(distributionReservationEntity.getId());
+				log.info("编辑配送车次维护预约备货状态 reservationId>>>>>>>>>>>>>>>>>:{}",distributionReservationEntity.getId());
+			}
+			if (!newstockUpIds.isEmpty()){
+				log.info("新增预约单至配送计划>>>>>>>>>>>>>>>>>>>>ids:{}",newstockUpIds);
 				distributionReservationService.update(Wrappers.<DistributionReservationEntity>update().lambda()
-					.eq(DistributionReservationEntity::getId,distributionReservationEntity.getId())
+					.in(DistributionReservationEntity::getId,newstockUpIds)
 					.set(DistributionReservationEntity::getStockupStatus,ReservationStockupStatusConstant.daibeihuo.getValue())
 				);
-				log.info("编辑配送车次维护预约备货状态 reservationId>>>>>>>>>>>>>>>>>:{}",distributionReservationEntity.getId());
 			}
 		}
 		//这里暂时不考虑出现新增的情况
@@ -4189,6 +4195,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		AtomicInteger inventoryTotal = new AtomicInteger();
 		//客户数量
 		AtomicInteger clientTotal = new AtomicInteger();
+		List<Long> newIds = new ArrayList<>();
 		newReservation.forEach((k, v) -> {
 			clientTotal.getAndIncrement();
 			//统计配送包件总数量
@@ -4203,10 +4210,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			} else {
 				//新增
 				DistributionReservationEntity distributionReservationEntity = v.get(0);
-				distributionReservationService.update(Wrappers.<DistributionReservationEntity>update().lambda()
-					.eq(DistributionReservationEntity::getId,distributionReservationEntity.getId())
-					.set(DistributionReservationEntity::getReservationStatus,ReservationStatusConstant.daipeisong.getValue())
-				);
+				newIds.add(distributionReservationEntity.getId());
+
 				DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
 //			String trainNumberMa = trainNumberMa();
 				distributionSignforEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
@@ -4217,6 +4222,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionSignforService.save(distributionSignforEntity);
 			}
 		});
+		if (!newIds.isEmpty()){
+			log.info("新增预约单至配送计划   维护预约单状态>>>>>>>>>>>>>>>>>>>>ids:{}",newIds);
+			distributionReservationService.update(Wrappers.<DistributionReservationEntity>update().lambda()
+				.in(DistributionReservationEntity::getId,newIds)
+				.set(DistributionReservationEntity::getReservationStatus,ReservationStatusConstant.daipeisong.getValue())
+			);
+		}
 
 		oldReservation.forEach((m, n) -> {
 			//这里就是取消的预约单，进行状态回退