Merge branch 'pre-production'

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

@@ -893,8 +893,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			}
 
 			//维护预约的预约数量
-			maintenanceReservationPackageNum(reservationId);
-			maintenanceDeliveryPackageNum(deliveryId);
+//			maintenanceReservationPackageNum(reservationId);
+//			maintenanceDeliveryPackageNum(deliveryId);
 		}
 	}
 

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

@@ -9944,7 +9944,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockArticleService.maintenanceOrderInfoByIds(ids);
 		distributionParcelListService.maintenanceZerpPackageInfo(orderPackageId);
 		distributionParcelListService.maintenanceZerpPackageInfo(orderPackageId);
-		distributionReservationService.maintenanceReservationNum(reservationId);
+//		distributionReservationService.maintenanceReservationNum(reservationId);
 		distributionReservationService.maintenanceReservationInfo(reservationId);
 		distributionDeliveryListService.maintenanceDeliveryNum(deliveryId);
 		distributionDeliveryListService.maintenanceDeliveryInfo(deliveryId);

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

@@ -498,6 +498,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			}
 
 		}
+		Map<String,List> map = new HashMap<>();
+		List<DistributionReservationPackageEntity> reservationPackageEntityList = new ArrayList<>();
+		List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = new ArrayList<>();
+		List<DistributionReservationStocklistEntity> reservationStocklistEntityList = new ArrayList<>();
 		//构建预约单
 		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
 		Func.copy(distributionReservationDTO, reservationEntity);
@@ -620,6 +624,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 									distributionReservationPackageEntity.setParceListId(dp.getId());
 									distributionReservationPackageEntity.setStockArticleId(s.getId());
 									distributionReservationPackageEntity.setPacketBarCode(dp.getOrderPackageCode());
+									reservationPackageEntityList.add(distributionReservationPackageEntity);
 									//维护订单下包件信息
 									distributionReservationPackageService.save(distributionReservationPackageEntity);
 									//此时订单下的所有包件都处于预约状态，可用数为0
@@ -652,6 +657,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 									distributionReservationPackageEntity.setParceListId(p.getId());
 									distributionReservationPackageEntity.setStockArticleId(s.getId());
 									distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
+									reservationPackageEntityList.add(distributionReservationPackageEntity);
 									distributionReservationPackageService.save(distributionReservationPackageEntity);
 									packageNum.getAndAdd(p.getQuantity());
 									p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
@@ -725,6 +731,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								distributionReservationZeroPackageEntity.setParcelListId(p.getParcelListId());
 								distributionReservationZeroPackageEntity.setType(DistributionTypeConstant.shipie.getValue());
 								distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue());
+								reservationZeroPackageEntityList.add(distributionReservationZeroPackageEntity);
 								distributionReservationZeroPackageService.save(distributionReservationZeroPackageEntity);
 								//统计数量
 								zeroPackageNum.getAndAdd(distributionReservationZeroPackageEntity.getQuantity());
@@ -751,6 +758,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								distributionReservationZeroPackageEntity.setCategoryName(l.getFirsts());
 								distributionReservationZeroPackageEntity.setType(DistributionTypeConstant.shipie.getValue());
 								distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue());
+								reservationZeroPackageEntityList.add(distributionReservationZeroPackageEntity);
 								distributionReservationZeroPackageService.save(distributionReservationZeroPackageEntity);
 								//统计数量
 								zeroPackageNum.getAndAdd(distributionReservationZeroPackageEntity.getQuantity());
@@ -826,6 +834,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationStocklistEntity.setStockListStatus("1");
 				distributionReservationStocklistEntity.setLoadingStatus(ReservationInventoryLoadingStatusConstant.weizhuangche.getValue());
 				distributionReservationStocklistEntity.setSigningStatus(ReservationInventorySigningStatusConstant.weiqianshou.getValue());
+				reservationStocklistEntityList.add(distributionReservationStocklistEntity);
 				distributionReservationStocklistService.save(distributionReservationStocklistEntity);
 				stockListCount.getAndAdd(distributionReservationStocklistEntity.getReservationNum());
 				List<DisStockListDetailEntity> detailEntities = new ArrayList<>();
@@ -898,6 +907,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
 		reservationEntity.setWarehouseId(reservationEntity.getWarehouseId());
 		distributionReservationMapper.updateById(reservationEntity);
+		map.put("1",reservationPackageEntityList);
+		map.put("2",reservationZeroPackageEntityList);
+		map.put("3",reservationStocklistEntityList);
+		NodeFanoutMsg<ReservationVO> nodeFanoutMsg = buildNodeFanoutMsgByReservation(reservationEntity,map,BizOperationEnums.ADD);
+		distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser());
+		handleCreatedReservationPlanLog(reservationEntity,AuthUtil.getUser(),myCurrentWarehouse);
 		return R.status(true);
 	}