From d64036c0510cf06009a7252e318d828fbc2658f0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 11 九月 2025 09:22:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/GlassJson.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/GlassJson.cpp b/SourceCode/Bond/Servo/GlassJson.cpp
index c16be0b..91e7bed 100644
--- a/SourceCode/Bond/Servo/GlassJson.cpp
+++ b/SourceCode/Bond/Servo/GlassJson.cpp
@@ -178,6 +178,7 @@
Json::Value n(Json::objectValue);
n["eq_id"] = p->getEqID();
n["unit"] = p->getUnit();
+ n["slot"] = p->getUnit();
put_ull_as_str(n, "time_in", static_cast<unsigned long long>(p->getInTime()));
put_ull_as_str(n, "time_out", static_cast<unsigned long long>(p->getOutTime()));
n["processed"] = p->isProcessEnd() ? true : false;
@@ -199,7 +200,7 @@
// 基本
g.setID(JStr(root, "id").c_str());
g.setType(static_cast<MaterialsType>(JInt(root, "materials", 0)));
- g.getBuddyId() = JStr(root, "buddy_id");
+ g.setBuddyId(JStr(root, "buddy_id"));
g.setScheduledForProcessing(JBool(root, "scheduled") ? TRUE : FALSE);
g.m_failReason = JStr(root, "fail_reason");
g.setOriginPort(JInt(root, "origin_port", 0), JInt(root, "origin_slot", 0));
@@ -293,7 +294,8 @@
for (const auto& n : root["path"]) {
unsigned eq = JUInt(n, "eq_id", 0);
unsigned unit = JUInt(n, "unit", 0);
- g.addPath(eq, unit);
+ unsigned slot = JUInt(n, "slot", 0);
+ g.addPath(eq, unit, slot);
CPath* tail = nullptr;
if (auto head = g.getPath()) tail = head->getTailPath();
--
Gitblit v1.9.3