fix:修复欧派数据回传 在没有增加计划的情况 将没有计划的包件回传到了欧派系统

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

@@ -1535,29 +1535,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				}
 
 				if (Func.isNotEmpty(brand.get("欧派"))) {
-
+					List<MtReceiveContentDTO> oupai = brand.get("欧派");
-					// 重新筛选出欧派的包件
+					for (MtReceiveContentDTO mtReceiveContentDTO : oupai) {
-					for (DistributionReservationStockarticleEntity distributionReservationStockarticleEntity : distributionReservationStockarticleEntities) {
+						OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
-
+						orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo());  //包条
-						// 查询预约单下面的包件信息
+						orderStatusDTO.setUsername(distributionSignforEntity.getSigneeName());  //操作人名称
-						log.info(">>>>>>>>>>>>>>>>>>>>> 欧派循环包件信息 {} ", distributionReservationStockarticleEntity);
+						orderStatusDTO.setStatus("7");
-						List<DistributionParcelListEntity> distributionParcelListEntities = buildOpByReservationId(distributionReservationStockarticleEntity);
+						orderStatusDTO.setOperationTime(distributionSignforEntity.getSigningTime());   //时间
-
+						ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO);
-
-						for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
-							// todo 查询签收信息
-							DistributionSignforEntity distributionSignfor = distributionSignforMapper.getByReservationId(distributionReservationStockarticleEntity.getReservationId());
-							OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
-							orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode());  //单号
-							orderStatusDTO.setUsername(distributionSignfor.getSigneeName());  //操作人名称
-							orderStatusDTO.setStatus("7");
-							orderStatusDTO.setOperationTime(distributionSignfor.getSigningTime());   //时间
-							ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO);
-							log.info(">>>>>>>>>>>>>>>>>进入newSystemHandleStatusData   orderStatusDTO值 ：{}", orderStatusDTO);
-						}
 					}
-
-//					orderMainClinet.sendReceiveInfoByNewSystem(mtReceiveDTO);
 				}
 				if (Func.isNotEmpty(brand.get("志邦"))) {
 					List<MtReceiveContentDTO> zb = brand.get("志邦");
@@ -3021,7 +3007,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					}
 					orderList.add(order);
 
-					if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){
+					if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
 						//构建包件信息
 						List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), distributionStockArticleEntity.getId(), distributionStockArticleEntity.getWarehouseId());
 						if (!distributionParcelListEntities.isEmpty()) {
@@ -3040,7 +3026,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								}
 							}
 						}
-					}else {
+					} else {
 						//整理零担的数据
 						List<DistributionParcelNumberVO> distributionParcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(distributionStockArticleEntity.getId(), reservationEntity.getId());
 						if (!distributionParcelNumberVOS.isEmpty()) {
@@ -3115,7 +3101,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		}
 		pushInstallDTO.setOrder(orderList);
 		pushInstallDTO.setOrder_detail(orderDetailList);
-		log.info(">>>>>>>>>>>>>>安装推送整理数据:{}",JSONObject.toJSON(pushInstallDTO));
+		log.info(">>>>>>>>>>>>>>安装推送整理数据:{}", JSONObject.toJSON(pushInstallDTO));
 		String jsonString = JSONObject.toJSONString(pushInstallDTO);
 		rabbitTemplate.convertAndSend(RabbitConstant.PUSH_INSTALL_PLATFORM_EXCHANGE, RabbitConstant.PUSH_INSTALL_PLATFORM_ROUTING, jsonString);