From ea7ecc91c23b8b893e8d7e0d85b80d6ea781cd2d Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Thu, 23 May 2024 23:35:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?=
 =?UTF-8?q?=E5=A4=A9=E6=8C=87=E5=AE=9A=E8=8A=82=E7=82=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receiver/HwyUnloadCarComHandler.java      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java
index 8e40199b2..cdf04f883 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java
@@ -3,14 +3,13 @@ package com.logpm.factory.receiver;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.EnumUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.logpm.factory.comfac.dto.UnloadCarDTO;
 import com.logpm.factory.mt.entity.MtPushData;
 import com.logpm.factory.mt.service.IMtFactoryDataService;
 import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
@@ -18,7 +17,6 @@ import com.logpm.factory.mt.service.IMtPushDataService;
 import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
 import com.logpm.factorydata.enums.BrandEnums;
 import com.logpm.factorydata.vo.NodePushMsg;
-import com.logpm.factorydata.vo.SendMsg;
 import com.logpm.oldproject.feign.IAdvanceDetailClient;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
@@ -76,11 +74,13 @@ public class HwyUnloadCarComHandler {
 	}
 
 	private void pushMentTian(NodePushMsg nodePushMsg) {
-
+		if (!ObjectUtil.equals(WorkNodeEnums.END_WAREHOUSE_UNLOADING, nodePushMsg.getNode())) {
+			return;
+		}
 		// 根据包件获取车次
 		List<Object> content = nodePushMsg.getContent();
 		List<String> carNumList = new ArrayList<>();
-		if(CollUtil.isNotEmpty(content)){
+		if (CollUtil.isNotEmpty(content)) {
 			for (Object s : content) {
 				JSONObject jsonObject = JSONUtil.parseObj(s);
 				String packageCode = (String) jsonObject.get("packageCode");
@@ -114,7 +114,7 @@ public class HwyUnloadCarComHandler {
 				}
 			}
 
-			r.forEach(t->{
+			r.forEach(t -> {
 				sendDataCarNum(t, DateUtil.formatDateTime(nodePushMsg.getOperatorTime()));
 			});
 
@@ -127,13 +127,13 @@ public class HwyUnloadCarComHandler {
 	/**
 	 * 根基匹配到的发货单编号 推送梦天
 	 *
-	 * @param carNum 车次号
+	 * @param carNum       车次号
 	 * @param completeDate 完成时间
 	 * @throws ParseException
 	 * @throws NoSuchAlgorithmException
 	 * @throws JsonProcessingException
 	 */
-	private void sendDataCarNum(String carNum, String completeDate)  {
+	private void sendDataCarNum(String carNum, String completeDate) {
 		log.info("##################sendDataCarNum carNum：{},completeDate{}", carNum, completeDate);
 
 		// 需要判断这个发货单编号是否推送过
@@ -144,15 +144,15 @@ public class HwyUnloadCarComHandler {
 			log.info("##################{} 车次已经推送过", carNum);
 			return;
 		}
-		try{
+		try {
 
 			R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate);
 
-			log.info("MT 数据卸车推送 {}",r.getMsg());
-		}catch (Exception e){
+			log.info("MT 数据卸车推送 {}", r.getMsg());
+		} catch (Exception e) {
 
 
-			log.error(">>>> 梦天数据卸车推送异常",e);
+			log.error(">>>> 梦天数据卸车推送异常", e);
 		}
 		log.info("##################{} 梦天确认签收数据推送1", carNum);