From ff9a50732b4d18395f7a80c192fcb2a8ba1cd885 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 26 Jul 2024 11:59:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?=
 =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factorydata/mengtian/entity/FactoryNodePushEntity.java   | 5 +++++
 .../logpm/factorydata/mengtian/mq/NodeDataPushListener.java  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java
index ba295edb2..51de31170 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/entity/FactoryNodePushEntity.java
@@ -55,6 +55,11 @@ public class FactoryNodePushEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "发货单编号")
 	private String senderCode;
+	/**
+	 * 作业仓库
+	 */
+	@ApiModelProperty(value = "作业仓库")
+	private String warehouse;
 	/**
 	 * 订单号
 	 */
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
index cf5c132af..194793e1c 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
@@ -132,6 +132,7 @@ public class NodeDataPushListener {
 							throw new RuntimeException(e);
 						}
 						FactoryNodePushEntity entity = FactoryNodePushEntity.builder()
+							.warehouse(warehouse)
 							.senderCode(centralStkInVO.getSenderCode())
 							.orderCode(centralStkInVO.getOrderCode())
 							.packageCode(centralStkInVO.getPackageCode())
@@ -190,6 +191,7 @@ public class NodeDataPushListener {
 							return pushData.getPackageCode();
 						}).collect(Collectors.toSet()), ",");
 					FactoryNodePushEntity entity = FactoryNodePushEntity.builder()
+						.warehouse(warehouse)
 						.senderCode(senderCode)
 						.orderCode(orderCodes)
 						.packageCode(packageCodes)
@@ -239,6 +241,7 @@ public class NodeDataPushListener {
 						return pushData.getSenderCode();
 					}).collect(Collectors.toSet()), ",");
 					FactoryNodePushEntity entity = FactoryNodePushEntity.builder()
+						.warehouse(warehouse)
 						.senderCode(signForVO.getSenderCode())
 						.orderCode(signForVO.getOrderCode())
 						.packageCode(signForVO.getPackageCode())
@@ -297,6 +300,7 @@ public class NodeDataPushListener {
 				return pushData.getSenderCode();
 			}).collect(Collectors.toSet()), ",");
 			FactoryNodePushEntity entity = FactoryNodePushEntity.builder()
+				.warehouse(warehouse)
 				.senderCode(senderCodes)
 				.orderCode(orderCodes)
 				.packageCode(packageCodes)