From 72f77d43a09d1c4cc6d0543bbb36e01a450f4148 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Thu, 11 Apr 2024 11:01:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=AD=BE=E6=94=B6=E8=8A=82=E7=82=B9=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 84e863a3d..7aa75fe8a 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 @@ -262,14 +262,16 @@ public class ZbomNodeDataPushListener { Integer noSignNum = noSignNumberMap.get(key); if (noSignNum <= signNumber) { // 全部签收 + log.info("{} 全部签收", platformOrderCode); paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_ALL_STATUS).getCode()); } } else { continue; } - String pushNode = nodeOrderEntity.getPushNode(); + Integer currentNode1 = nodeOrderEntity.getCurrentNode(); // 如果之前发送的是部分签收，则之后的所有签收节点都发部分签收 - if (StrUtil.isNotEmpty(pushNode) && pushNode.contains(ZbomNodeEnums.PARTIAL_RECEIPT.getIndex().toString())) { + if (ObjectUtil.isNotEmpty(currentNode1) && ObjectUtil.equal(currentNode1, ZbomNodeEnums.PARTIAL_RECEIPT.getIndex())) { + log.info("{} 部分签收", platformOrderCode); paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_SECTION_STATUS).getCode()); } currentNode = ZbomNodeEnums.getByCode(paramDTO.getNode());