From cca3d0db76b2b9a970e55d991ef27d39094fcd09 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Thu, 7 Nov 2024 00:58:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=BF=97=E9=82=A6=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改志邦工厂补推节点时可能造成字段丢失问题
---
 .../zbom/mapper/OrderPackageMapper.xml          |  1 -
 .../zbom/mq/ZbomNodeDataPushListener.java       | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml
index d68a0f0b6..31369d55a 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml
@@ -20,7 +20,6 @@
     <select id="findOrderCodebypackageCodes" resultType="com.logpm.factorydata.zbom.vo.NodeDataDTO">
         select t.depart_code,
         t.platform_order_code,
-        t.package_code,
         group_concat(t.package_code) packageCode,
         count(*) signQty
         from zb_order_package t
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java
index c84a9f6d0..7b19eb7f2 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java
@@ -82,6 +82,7 @@ public class ZbomNodeDataPushListener {
 	))
 	public void nodeDataPushDelayed(String msg) {
 		// 直接调用nodeDataPush方法处理接收到的消息
+		log.info("延时队列消息-----");
 		nodeDataPush(msg);
 	}
 
@@ -128,7 +129,7 @@ public class ZbomNodeDataPushListener {
 							NodeDataDTO value = stringNodeDataDTOEntry.getValue();
 							// 卸车入库只发推一次
 							List<ZbFactoryNodePushEntity> list = nodePushService.list(Wrappers.<ZbFactoryNodePushEntity>lambdaQuery()
-								.eq(ZbFactoryNodePushEntity::getPlatformOrderCode, orderCode)
+								.eq(ZbFactoryNodePushEntity::getPlatformOrderCode, value.getPlatformOrderCode())
 								.eq(ZbFactoryNodePushEntity::getWorkNode, node)
 								.eq(ZbFactoryNodePushEntity::getWarehouseName, warehouseName)
 								.eq(ZbFactoryNodePushEntity::getDepartCode, value.getDepartCode())
@@ -158,7 +159,7 @@ public class ZbomNodeDataPushListener {
 				List<NodeConfirmParamDTO> nodeConfirmLsit = new ArrayList<>();
 				Map<String, SendMsg> sendMsgMap = new HashMap<>();
 				// 构建提交参数
-				buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap);
+				buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap, warehouseName);
 				if (CollUtil.isNotEmpty(nodeConfirmLsit)) {
 					for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) {
 						log.info("zb节点数据推送NodeConfirmParamDTO：{}", JSONUtil.toJsonStr(nodeConfirmParam));
@@ -246,7 +247,7 @@ public class ZbomNodeDataPushListener {
 
 	private void buildParam(JSONObject entries, String node, WorkNodeEnums workNodeEnums, List<NodeDataDTO> orders,
 							Map<String, Integer> noSignNumberMap, Map<String, ZbFactoryNodeOrderEntity> nodeOrderMap,
-							List<NodeConfirmParamDTO> nodeConfirmLsit, Map<String, SendMsg> sendMsgMap) {
+							List<NodeConfirmParamDTO> nodeConfirmLsit, Map<String, SendMsg> sendMsgMap, String warehouseName) {
 		if (CollUtil.isNotEmpty(orders)) {
 			Integer nodeDelay = zbProperties.getDelayedTime() * 60 * 1000;
 			for (NodeDataDTO nodeData : orders) {
@@ -277,7 +278,7 @@ public class ZbomNodeDataPushListener {
 					if (ObjectUtil.isNotEmpty(nodeOrderEntity.getPushNode()) && !StrUtil.contains(nodeOrderEntity.getPushNode(), ZbomNodeEnums.DELIVERY_ARRIVAL.getIndex().toString())) {
 						// 第一次签收，节点改为送货抵达
 						currentNode = ZbomNodeEnums.DELIVERY_ARRIVAL;
-						buildSendMag(sendMsgMap, nodeData, key, paramDTO, node, nodeDelay);
+						buildSendMag(sendMsgMap, nodeData, key, paramDTO, node, nodeDelay,warehouseName);
 					} else {
 						// 查询当前未签收的数量与当前签收数量比较，如果未签收数较大，则是部分签收
 						currentNode = ZbomNodeEnums.PARTIAL_RECEIPT;
@@ -306,14 +307,14 @@ public class ZbomNodeDataPushListener {
 					// 历史不存在，当前节点不是第一个节点，则需要补发第一个节点
 					if (!ObjectUtil.equal(index, ZbomNodeEnums.STATION_DEPART.getIndex())) {
 						currentNode = ZbomNodeEnums.STATION_DEPART;
-						buildSendMag(sendMsgMap, nodeData, key, paramDTO, node, nodeDelay);
+						buildSendMag(sendMsgMap, nodeData, key, paramDTO, node, nodeDelay, warehouseName);
 					}
 				} else {
 					// 历史节点存在，但是历史节点中不包含第一个节点，且当前节点不是第一个节点，则需要补发第一个节点
 					if (!ObjectUtil.equal(index, ZbomNodeEnums.STATION_DEPART.getIndex())
 						&& !StrUtil.contains(nodeOrderEntity.getPushNode(), ZbomNodeEnums.STATION_DEPART.getIndex().toString())) {
 						currentNode = ZbomNodeEnums.STATION_DEPART;
-						buildSendMag(sendMsgMap, nodeData, key, paramDTO, node, nodeDelay);
+						buildSendMag(sendMsgMap, nodeData, key, paramDTO, node, nodeDelay, warehouseName);
 					}
 				}
 				// 组装历史节点数据
@@ -326,11 +327,13 @@ public class ZbomNodeDataPushListener {
 		}
 	}
 
-	private void buildSendMag(Map<String, SendMsg> sendMsgMap, NodeDataDTO nodeData, String key, NodeConfirmParamDTO paramDTO, String node, Integer delay) {
+	private void buildSendMag(Map<String, SendMsg> sendMsgMap, NodeDataDTO nodeData, String key, NodeConfirmParamDTO paramDTO, String node, Integer delay, String warehouseName) {
 		List<Object> js = new ArrayList<>();
 		for (String s : nodeData.getPackageCode().split(",")) {
 			JSONObject entries1 = new JSONObject();
 			entries1.set("packageCode", s);
+			entries1.set("orderCode", nodeData.getPlatformOrderCode());
+			entries1.set("warehouseName", warehouseName);
 			js.add(entries1);
 		}
 		NodePushMsg nodePushMsg = NodePushMsg.builder()