Browse Source

fix(service): 修改部分签收节点不正确问题

pull/24/head
zhaoqiaobo 6 months ago
parent
commit
72f77d43a0
  1. 6
      blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java

6
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());

Loading…
Cancel
Save