1.一键签收时候欧派数据推送 待测

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java

@@ -275,7 +275,7 @@ public interface IDistributionAsyncService {
 	 * 推送信息到工厂
 	 * @param distributionParcelListEntity
 	 */
-    void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,String warehouseName);
+    void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,String warehouseName,String userName);
 
 	/**
 	 * 推送文员

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

@@ -1446,7 +1446,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	@Override
 	@Async
-	public void sendFactory(DistributionParcelListEntity distributionParcelListEntity, String signingTime, Long reservationId, String reservationCode, String warehouseName) {
+	public void sendFactory(DistributionParcelListEntity distributionParcelListEntity, String signingTime, Long reservationId, String reservationCode, String warehouseName,String userName) {
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(distributionParcelListEntity.getStockArticleId());
 		log.info(">>>>>>>>>>> 签收推送 对象 {}", distributionParcelListEntity);
 		if (Func.isNotEmpty(stockArticleEntity)) {
@@ -1459,16 +1459,12 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					} catch (Exception e) {
 						throw new RuntimeException(e);
 					}
+					break;
 				case "欧派":
 					//推送到欧派
 					try {
-						DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = distributionReservationStockarticleService.getOne(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
-							.eq(DistributionReservationStockarticleEntity::getStockArticleId, distributionParcelListEntity.getStockArticleId()));
-						DistributionSignforEntity distributionSignfor = distributionSignforService.getByReservationId(distributionReservationStockarticleEntity.getReservationId());
-						ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime,
-							distributionSignfor.getSigneeName() );//*签收人*//
-						log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime,
-							distributionSignfor.getSigneeName() );
+					//	ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*//
+					//	log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );
 					} catch (Exception e) {
 						throw new RuntimeException(e);
 					}
@@ -1484,7 +1480,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Async
 	public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
 		String brands = "梦天,欧派";//可追加
-		log.info(">>>>>>>>>>> 签收推送 对象tmy {}", "signingId="+signingId+"warehouseName="+warehouseName+"warehouseId="+warehouseId);
+		log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId：="+signingId+"warehouseName：="+warehouseName+"warehouseId：="+warehouseId);
 		//查询签收信息
 		DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);
 		if (Func.isNotEmpty(distributionSignforEntity)) {
@@ -1553,7 +1549,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					// 重新筛选出欧派的包件
 					for (DistributionReservationStockarticleEntity distributionReservationStockarticleEntity : distributionReservationStockarticleEntities) {
 
-						// 查询预约单下面的包间信息
+						// 查询预约单下面的包件信息
 						log.info(">>>>>>>>>>>>>>>>>>>>> 欧派循环包件信息 {} ", distributionReservationStockarticleEntity);
 						List<DistributionParcelListEntity> distributionParcelListEntities = buildOpByReservationId(distributionReservationStockarticleEntity);
 
@@ -1568,9 +1564,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 							orderStatusDTO.setUsername(distributionSignfor.getSigneeName());  //操作人名称
 							orderStatusDTO.setStatus("7");
 							orderStatusDTO.setOperationTime(distributionSignfor.getSigningTime());   //时间
-							System.out.println(orderStatusDTO);
 							ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO);
-
+							log.info(">>>>>>>>>>>>>>>>>进入newSystemHandleStatusData   orderStatusDTO值 ：{}",orderStatusDTO);
 						}
 
 

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

@@ -1009,7 +1009,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//维护签收包件状态
 			distributionStockArticleService.maintenanceOrderInfo(collect.get(0).getOrderCode(), myCurrentWarehouse.getId());
 			//推送信息至工厂
-			distributionAsyncService.sendFactory(collect.get(0), signingTime, distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName());
+			BladeUser user = AuthUtil.getUser();
+			distributionAsyncService.sendFactory(collect.get(0), signingTime, distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(),user.getUserName());
 			//TODO 这里就需要一个异步的包件状态维护方法
 		} else if (Func.isEmpty(collect)) {
 			//这里就需要对该包件信息是否属于该配送计划进行判定。如果属于该配送计划则是串货。不是那么则需要提示是否异常签收或者返回的操作
@@ -2688,7 +2689,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(), loadscanEntities.getReservationId(), loadscanEntities.getDeliveryId());
 					}
 				}
-				distributionAsyncService.sendFactory(parcelListEntity, signingTime, reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName());
+
+				distributionAsyncService.sendFactory(parcelListEntity, signingTime, reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(),user.getUserName());
 				packageIds.add(parcelListEntity.getId());
 				orderCodes.add(parcelListEntity.getOrderCode());
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -653,7 +653,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 				factoryPackageService.updateById(factoryPackageEntity);
 			}
 		}
-		System.out.println("物流状态传递成功");
+		log.info(" >>>>>>>>>>>>>>>>>>>>>>> 物流状态传递成功");
 		return Resp.success("物流状态传递成功");
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/NewSystemReceiveInfoHandler.java

@@ -40,9 +40,12 @@ public class NewSystemReceiveInfoHandler {
 		// 欧派的订单会进来进行推送
 		String json = (String) map.get("messageData");
 		OrderStatusDTO orderStatusDTO = JSON.parseObject(json, OrderStatusDTO.class);
-		log.info(">>>>>>>>>>>>> {}",json);
 		log.info("##################receiveInfoHandler：处理签收信息数据 {}",orderStatusDTO);
-		ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO);
+		try {
+			ouPaiFactoryService.newSystemHandleStatusData(orderStatusDTO);
+		} catch (Exception e) {
+			log.error(">>>>>>", e);
+		}
 
 	}
 }