From a556e71f3618e023ade105e71b21546ce6c7b081 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 25 Oct 2024 18:21:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=87=91?=
 =?UTF-8?q?=E7=89=8C=E5=9B=9E=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改金牌回传问题
---
 .../com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java
index 536ad3f1e..45b34c78c 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java
@@ -166,7 +166,7 @@ public class NodeDataPushListener {
 						}
 						String arriveFor = "stock";
 						PushOrderEntity pushOrderEntity = pushOrderEntityMap.get(orderCode);
-						if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
+						if (ObjectUtil.isNotEmpty(pushOrderEntity) && StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
 							arriveFor = "carrier";
 						}
 						PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(orderCode);