From 356e8690cbe0f9abbcd67182f9071d3b8079c089 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 7 Jan 2025 18:14:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加配送模块一键装车推送工厂
---
 .../DistributionDeliveryListServiceImpl.java  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 4ce786c50..79e3114d9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -1524,6 +1524,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionLoadscaninvnEntity> kucuns = new ArrayList<>();
 		List<DistributionLoadscanEntity> dingzhis= new ArrayList<>();
 		List<DistributionLoadscanEntity> lingdans = new ArrayList<>();
+		List<DistributionParcelListEntity> pushList = new ArrayList<>();
 
 		for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
 			switch (reservationStockarticleEntity.getIsZero()) {
@@ -1600,6 +1601,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							newT.setOrderPackageStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 
 							distributionParcelListService.updateById(newT);
+							pushList.add(newT);
 							//扣减在库订单的在库数量
 //							Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
 							updatePackageList.add(parcelListEntity);
@@ -1838,7 +1840,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if(Func.isNotEmpty(lingdans)){
 			sendBuildNodeFanoutMsgByZeroOrder(deliveryList,lingdans);
 		}
-
+		if (CollUtil.isNotEmpty(pushList)) {
+			for (DistributionParcelListEntity parcelListEntity : pushList) {
+				List<Object> contents = new ArrayList<>();
+				PushData pushData = PushData.builder()
+					.packageCode(parcelListEntity.getOrderPackageCode())
+					.orderCode(parcelListEntity.getOrderCode())
+					.warehouseName(myCurrentWarehouse.getName())
+					.waybillNumber(parcelListEntity.getWaybillNumber()).build();
+				contents.add(pushData);
+				NodePushMsg msg = new NodePushMsg();
+				msg.setNode(WorkNodeEnums.DISTRIBUTION_LOADING);
+				msg.setBrand(BrandEnums.getByValue(parcelListEntity.getBrandName()));
+				msg.setOperator(AuthUtil.getNickName());
+				msg.setOperatorTime(new Date());
+				msg.setContent(contents);
+				log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
+				factoryDataMessageSender.sendNodeDataByBrand(msg);
+			}
+		}
 		return Resp.scanSuccess("操作成功", "装车成功");
 	}