Merge branch 'dev' into pre-production

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;
 	/**
 	 * 订单号
 	 */

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)