From 8d55ed4a167d9b09d65e4a26ece287c6e37a9c84 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 10:58:58 +0800
Subject: [PATCH] 1. 修复SG精度检编辑框修改覆盖问题（界面频繁刷新导致）
---
SourceCode/Bond/Servo/CEquipment.cpp | 109 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 81 insertions(+), 28 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index e9eee92..f89dcf9 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -5,6 +5,7 @@
#include "CArm.h"
#include "CGlassPool.h"
#include "Servo.h"
+#include "GlassJson.h"
namespace SERVO {
@@ -335,11 +336,16 @@
for (int i = 0; i < SLOT_MAX; i++) {
m_slot[i].serialize(ar);
CGlass* pGlass = (CGlass *)m_slot[i].getContext();
- if (pGlass != nullptr) {
- pGlass->serialize(ar);
+ if (pGlass != nullptr) {
+ const std::string pretty = GlassJson::ToPrettyString(*pGlass);
+ CString strPretty = CString(pretty.c_str());
+ ar << strPretty;
+
CGlass* pBuddy = pGlass->getBuddy();
if (pBuddy != nullptr) {
- pBuddy->serialize(ar);
+ const std::string prettyBuddy = GlassJson::ToPrettyString(*pBuddy);
+ CString strPrettyBuddy = CString(prettyBuddy.c_str());
+ ar << strPrettyBuddy;
}
}
}
@@ -349,17 +355,29 @@
for (int i = 0; i < SLOT_MAX; i++) {
m_slot[i].serialize(ar);
if (m_slot[i].getTempContext() != nullptr) {
- CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
- pGlass->serialize(ar);
- m_slot[i].setContext(pGlass);
- if (pGlass->getBuddy() != nullptr) {
- CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
- pBuddy->serialize(ar);
- pGlass->forceSetBuddy(pBuddy);
+ CString strPretty;
+ std::string pretty;
+ ar >> strPretty;
+ pretty = (LPTSTR)(LPCTSTR)strPretty;
+ if (!pretty.empty()) {
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ GlassJson::FromString(pretty, *pGlass);
+ m_slot[i].setContext(pGlass);
+
+ if (!pGlass->getBuddyId().empty()) {
+ CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
+ CString strPrettyBuddy;
+ std::string prettyBuddy;
+ ar >> strPrettyBuddy;
+ prettyBuddy = (LPTSTR)(LPCTSTR)strPrettyBuddy;
+ GlassJson::FromString(prettyBuddy, *pBuddy);
+ pGlass->forceSetBuddy(pBuddy);
+ }
}
+
}
}
-
+
// 梳理各玻璃之间的绑定关系
/*
Lock();
@@ -839,7 +857,7 @@
CEquipment* pFromEq = pFromPin->getEquipment();
ASSERT(pFromEq);
- LOGI("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
+ LOGD("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
this->getName().c_str(),
pPin->getName().c_str(),
pFromEq->getName().c_str(),
@@ -916,7 +934,9 @@
ASSERT(pGlass);
Lock();
- pGlass->addPath(m_nID, getSlotUnit(putSlot));
+ pGlass->addPath(m_nID, getSlotUnit(putSlot), putSlot);
+ CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) pBuddy->addPath(m_nID, getSlotUnit(putSlot), putSlot);
m_slot[putSlot - 1].setContext(pGlass);
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
@@ -990,6 +1010,22 @@
return nullptr;
+ }
+
+ int CEquipment::getAllGlass(std::vector<CGlass*>& glasses)
+ {
+ Lock();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr) {
+ pGlass->addRef();
+ glasses.push_back(pGlass);
+ }
+ }
+ Unlock();
+
+ return (int)glasses.size();
}
CJobDataS* CEquipment::getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo)
@@ -1138,7 +1174,7 @@
LOGI("<CEquipment-%s>设置DispatchingMode成功.", m_strName.c_str());
}
else {
- LOGI("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
}
return 0;
@@ -1168,7 +1204,7 @@
LOGI("<CEquipment-%s>返回值: %d", m_strName.c_str(), retCode);
}
else {
- LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
}
if (onWritedRetBlock != nullptr) {
@@ -1199,7 +1235,7 @@
}
else {
m_recipesManager.syncFailed();
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败，code:%d", m_strName.c_str(), unitNo, code);
+ LOGE("<CEquipment-%s>请求单元<%d>主配方列表失败，code:%d", m_strName.c_str(), unitNo, code);
}
return 0;
@@ -1234,7 +1270,7 @@
}
else {
m_recipesManager.syncFailed();
- LOGI("<CEquipment-%s>请求单元<%d>主配方参数列表失败，code:%d", m_strName.c_str(), unitNo, code);
+ LOGE("<CEquipment-%s>请求单元<%d>主配方参数列表失败，code:%d", m_strName.c_str(), unitNo, code);
}
return 0;
@@ -1358,32 +1394,32 @@
CSlot* CEquipment::getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode/* = FALSE*/)
{
for (int i = 0; i < SLOT_MAX; i++) {
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 001");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 001");
if (!m_slot[i].isEnable()) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 002");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 002");
if (m_slot[i].isLock()) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 003");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 003");
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (!isSlotProcessed(i)) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 004");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 004");
if (pGlass == nullptr) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 005");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 005");
if (!pGlass->isScheduledForProcessing()) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 006");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 006");
if (bJobMode && pGlass->getProcessJob() == nullptr) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 007");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 007");
if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) continue;
int lsPath = m_slot[i].getLinkSignalPath();
if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE] ) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 008");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 008");
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 009");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 009");
if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 00a");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 00a");
return &m_slot[i];
}
@@ -1547,7 +1583,14 @@
std::vector<CParam> params;
this->parsingParams((const char*)rawData.data(), rawData.size(), params);
pGlass->addParams(params);
-
+
+ // 关联的Glass也要更新
+ CGlass* pBuddy = pGlass->getBuddy();
+ LOGI("<Equipment-%s>decodeProcessDataReport pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
+ if (pBuddy != nullptr) {
+ LOGI("<Equipment-%s>decodeProcessDataReport addParams pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
+ pBuddy->addParams(params);
+ }
return nRet;
}
@@ -1724,14 +1767,24 @@
vcrEventReport.getGlassId().c_str());
+ // 更新Glass的ID
+ CGlass* pGlass = getGlassWithCassette(vcrEventReport.getCassetteSequenceNo(),
+ vcrEventReport.getJobSequenceNo());
+ if (pGlass != nullptr) {
+ pGlass->setID(vcrEventReport.getGlassId().c_str());
+ }
+
+
// 缓存Attribute，用于调试时显示信息
unsigned int weight = 201;
CAttributeVector& attrubutes = pStep->attributeVector();
vcrEventReport.getAttributeVector(attrubutes, weight);
+
// 0426, 先固定返回1(OK)
((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
+
return 0;
}
--
Gitblit v1.9.3