From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
SourceCode/Bond/Servo/CEquipment.cpp | 309 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 210 insertions(+), 99 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index e390343..599a79c 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1,10 +1,11 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
#include "CEquipment.h"
#include "ToolUnits.h"
#include <regex>
#include "CArm.h"
#include "CGlassPool.h"
#include "Servo.h"
+#include "GlassJson.h"
namespace SERVO {
@@ -25,7 +26,6 @@
m_pCclink = nullptr;
m_nBaseAlarmId = 0;
m_pArm = nullptr;
- m_processState = PROCESS_STATE::Ready;
m_blockReadBit = { 0 };
m_nTestFlag = 0;
InitializeCriticalSection(&m_criticalSection);
@@ -103,7 +103,7 @@
void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
{
container.clear();
- // 示例：将一些属性添加到容器
+ // 绀轰緥锛氬皢涓�浜涘睘鎬ф坊鍔犲埌瀹瑰櫒
container.push_back(std::make_pair("DeviceName", "ServoMotor"));
container.push_back(std::make_pair("SerialNumber", "123456789"));
container.push_back(std::make_pair("Version", "1.0"));
@@ -143,13 +143,16 @@
return 0;
}
- void CEquipment::setProcessState(PROCESS_STATE state)
+ void CEquipment::setProcessState(int nSlotNo, PROCESS_STATE state)
{
- m_processState = state;
- onProcessStateChanged(m_processState);
+ if (nSlotNo <= 0 || nSlotNo > 8) return;
+
+ const auto prevState = m_processState[nSlotNo - 1];
+ m_processState[nSlotNo - 1] = state;
+ onProcessStateChanged(nSlotNo, prevState, m_processState[nSlotNo - 1]);
if (m_listener.onProcessStateChanged != nullptr) {
- m_listener.onProcessStateChanged(this, m_processState);
+ m_listener.onProcessStateChanged(this, nSlotNo, prevState, m_processState[nSlotNo - 1]);
}
}
@@ -203,6 +206,21 @@
std::string& CEquipment::getDescription()
{
return m_strDescription;
+ }
+
+ void CEquipment::setCurrentRecipe(const std::string& recipe)
+ {
+ Lock();
+ m_currentRecipe = recipe;
+ Unlock();
+ }
+
+ std::string CEquipment::getCurrentRecipe()
+ {
+ Lock();
+ std::string out = m_currentRecipe;
+ Unlock();
+ return out;
}
void CEquipment::setStation(int network, int station)
@@ -313,7 +331,7 @@
void CEquipment::onTimer(UINT nTimerid)
{
- // 每隔一秒，检查一下ALIVE状态
+ // 姣忛殧涓�绉掞紝妫�鏌ヤ竴涓婣LIVE鐘舵��
static int tick = 0;
tick++;
@@ -335,11 +353,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,18 +372,30 @@
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();
for (int i = 0; i < SLOT_MAX; i++) {
@@ -372,7 +407,7 @@
CGlass* pBudy = (CGlass*)m_slot[j].getContext();
if (pBudy != nullptr && strBuddyId.compare(pBudy->getID()) == 0) {
pGlass->setBuddy(pBudy);
- TRACE("绑定关系: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
+ TRACE("缁戝畾鍏崇郴: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
}
}
}
@@ -393,7 +428,7 @@
}
*/
- // 连接信号解释和保存
+ // 杩炴帴淇″彿瑙ｉ噴鍜屼繚瀛�
BOOL bFlag;
int index = 0;
for (int i = 0; i < 8; i++) {
@@ -423,7 +458,7 @@
}
- // 其它信号及响应
+ // 鍏跺畠淇″彿鍙婂搷搴�
index = 0x540;
@@ -433,7 +468,7 @@
m_alive.flag = bFlag;
m_alive.count = 0;
- // 状态
+ // 鐘舵��
if (!m_alive.alive) {
m_alive.alive = TRUE;
if (m_listener.onAlive != nullptr) {
@@ -482,7 +517,7 @@
}
- // 以下根据信号做流程处理
+ // 浠ヤ笅鏍规嵁淇″彿鍋氭祦绋嬪鐞�
for (int i = 0; i < 7; i++) {
CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
}
@@ -491,15 +526,22 @@
CHECK_READ_STEP_SIGNAL(STEP_ID_PROCESS_DATA_REPORT, pszData, size);
// FAC Data report
- CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
+ // CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
+ {
+ SERVO::CStep* pStep = getStep(STEP_ID_FAC_DATA_REPORT);
+ if (pStep != nullptr) {
+ ((CReadStep*)pStep)->onReadSignal(TRUE);
+ }
+ }
- // 配方改变
+
+ // 閰嶆柟鏀瑰彉
CHECK_READ_STEP_SIGNAL(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pszData, size);
- // 主配方上报
+ // 涓婚厤鏂逛笂鎶�
CHECK_READ_STEP_SIGNAL(STEP_ID_MASTER_RECIPE_LIST_REPORT, pszData, size);
- // 配方参数
+ // 閰嶆柟鍙傛暟
CHECK_WRITE_STEP_SIGNAL(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIPE_PARAMETER_REPORT, pszData, size);
@@ -737,11 +779,21 @@
return 1;
}
+ else if (pStep->getName().compare(STEP_STATUS) == 0) {
+ SERVO::CEqStatusStep* pEqStatusStep = (SERVO::CEqStatusStep*)pStep;
+ if (m_listener.onEqStatusChanged != nullptr) {
+ const unsigned int unitId = pEqStatusStep->getUnitId();
+ const int status = pEqStatusStep->getStatus(unitId);
+ const int reason = pEqStatusStep->getReasonCode(unitId);
+ m_listener.onEqStatusChanged(this, (int)unitId, status, reason);
+ }
+ return 1;
+ }
else if (isCimMessageConfirmStep(pStep)) {
SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
int value = pEqReadIntStep->getValue();
- // 此处将value按高低位拆分为message id和panel no.
- // 可能还需要上报到cim
+ // 姝ゅ灏唙alue鎸夐珮浣庝綅鎷嗗垎涓簃essage id鍜宲anel no.
+ // 鍙兘杩橀渶瑕佷笂鎶ュ埌cim
short msgId, panelNo;
msgId = (value & 0xffff0000 >> 16);
panelNo = (value & 0xffff);
@@ -756,7 +808,7 @@
m_listener.onVcrEventReport(this, pVcrEventReport);
}
- // 0426, 先固定返回1(OK)
+ // 0426, 鍏堝浐瀹氳繑鍥�1(OK)
pEqVcrEventStep->setReturnCode(1);
return 1;
}
@@ -769,12 +821,12 @@
CPin* CEquipment::addPin(PinType type, char* pszName)
{
- // 不允许名字添加重复的pin
+ // 涓嶅厑璁稿悕瀛楁坊鍔犻噸澶嶇殑pin
CPin* pPin = getPin(pszName);
if (pPin != nullptr) return nullptr;
- // 添加到Pin列表，看是输入pin或输出pin
+ // 娣诲姞鍒癙in鍒楄〃锛岀湅鏄緭鍏in鎴栬緭鍑簆in
if (type == PinType::INPUT) {
pPin = new CPin(this, type, pszName);
m_inputPins.push_back(pPin);
@@ -839,7 +891,7 @@
CEquipment* pFromEq = pFromPin->getEquipment();
ASSERT(pFromEq);
- LOGD("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
+ LOGD("<CEquipment><%s-%s>鏀跺埌鏉ヨ嚜<%s.%s>鐨処ntent<%d,%s,0x%x>",
this->getName().c_str(),
pPin->getName().c_str(),
pFromEq->getName().c_str(),
@@ -850,11 +902,11 @@
- // 以下解释处理数据
+ // 浠ヤ笅瑙ｉ噴澶勭悊鏁版嵁
int code = pIntent->getCode();
- // 测试
+ // 娴嬭瘯
if (code == FLOW_TEST) {
AfxMessageBox(pIntent->getMsg());
}
@@ -869,7 +921,7 @@
return -1;
}
- // 找到指定的glass id,
+ // 鎵惧埌鎸囧畾鐨刧lass id,
Lock();
CGlass* pContext = nullptr;
for (int i = 0; i < SLOT_MAX; i++) {
@@ -891,8 +943,8 @@
Unlock();
- if (m_processState != PROCESS_STATE::Ready) {
- setProcessState(PROCESS_STATE::Ready);
+ if (m_processState[port] != PROCESS_STATE::Ready) {
+ setProcessState(port, PROCESS_STATE::Ready);
}
if (m_listener.onDataChanged != nullptr) {
@@ -917,13 +969,17 @@
ASSERT(pGlass);
Lock();
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
+ pGlass->release(); // tempFetchOut闇�瑕佽皟鐢ㄤ竴娆elease
Unlock();
+ /*
if (m_processState != PROCESS_STATE::Processing) {
setProcessState(PROCESS_STATE::Processing);
}
+ */
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, EDCC_STORED_JOB);
@@ -1144,17 +1200,17 @@
return -1;
}
- LOGI("<CEquipment-%s>准备设置DispatchingMode<%d>", m_strName.c_str(), (int)mode);
+ LOGI("<CEquipment-%s>鍑嗗璁剧疆DispatchingMode<%d>", m_strName.c_str(), (int)mode);
if (onWritedBlock != nullptr) {
pStep->writeShort((short)mode, onWritedBlock);
}
else {
pStep->writeShort((short)mode, [&, mode](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>设置DispatchingMode成功.", m_strName.c_str());
+ LOGI("<CEquipment-%s>璁剧疆DispatchingMode鎴愬姛.", m_strName.c_str());
}
else {
- LOGE("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>璁剧疆DispatchingMode澶辫触锛宑ode:%d", m_strName.c_str(), code);
}
return 0;
@@ -1172,19 +1228,19 @@
}
unsigned short operationMode = (unsigned short)((unsigned short)mode + getIndexerOperationModeBaseValue());
- LOGI("<CEquipment-%s>准备设置indexerOperationMode<%d>", m_strName.c_str(), (int)mode);
+ LOGI("<CEquipment-%s>鍑嗗璁剧疆indexerOperationMode<%d>", m_strName.c_str(), (int)mode);
pStep->writeShort(operationMode, [&, pStep, mode, onWritedRetBlock](int code) -> int {
int retCode = 0;
if (code == WOK) {
- LOGI("<CEquipment-%s>设置indexerOperationMode成功.", m_strName.c_str());
+ LOGI("<CEquipment-%s>璁剧疆indexerOperationMode鎴愬姛.", m_strName.c_str());
const char* pszRetData = nullptr;
pStep->getReturnData(pszRetData);
ASSERT(pszRetData);
retCode = (unsigned int)CToolUnits::toInt16(pszRetData);
- LOGI("<CEquipment-%s>返回值: %d", m_strName.c_str(), retCode);
+ LOGI("<CEquipment-%s>杩斿洖鍊�: %d", m_strName.c_str(), retCode);
}
else {
- LOGE("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>璁剧疆indexerOperationMode澶辫触锛宑ode:%d", m_strName.c_str(), code);
}
if (onWritedRetBlock != nullptr) {
@@ -1204,18 +1260,18 @@
return -1;
}
- LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>姝ｅ湪璇锋眰鍗曞厓<%d>涓婚厤鏂瑰垪琛�", m_strName.c_str(), unitNo);
m_recipesManager.setOnSyncingStateChanged(block);
if (m_recipesManager.syncing() != 0) {
return -2;
}
pStep->writeShort(unitNo, [&, unitNo](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表成功，正在等待数据.", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>璇锋眰鍗曞厓<%d>涓婚厤鏂瑰垪琛ㄦ垚鍔燂紝姝ｅ湪绛夊緟鏁版嵁.", m_strName.c_str(), unitNo);
}
else {
m_recipesManager.syncFailed();
- LOGE("<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;
@@ -1225,7 +1281,7 @@
int CEquipment::recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo, ONSYNCINGSTATECHANGED block)
{
- LOGI("<CEquipment-%s>正在请求单元<%d>主配参数列表", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>姝ｅ湪璇锋眰鍗曞厓<%d>涓婚厤鍙傛暟鍒楄〃", m_strName.c_str(), unitNo);
m_recipesManager.setOnSyncingStateChanged(block);
if (m_recipesManager.syncing() != 0) {
return -2;
@@ -1246,11 +1302,11 @@
pStep->writeDataEx(szBuffer, 14 * 2, [&, unitNo](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>请求单元<%d>主配方参数列表成功，正在等待数据.", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>璇锋眰鍗曞厓<%d>涓婚厤鏂瑰弬鏁板垪琛ㄦ垚鍔燂紝姝ｅ湪绛夊緟鏁版嵁.", m_strName.c_str(), unitNo);
}
else {
m_recipesManager.syncFailed();
- LOGE("<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;
@@ -1477,6 +1533,19 @@
return &m_slot[index];
}
+ CSlot* CEquipment::getSlotWithNo(int slotNo)
+ {
+ CSlot* pSlot = nullptr;
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].getNo() != slotNo) continue;
+ pSlot = &m_slot[i];
+ break;
+ }
+
+ return pSlot;
+ }
+
CGlass* CEquipment::getAnyGlass()
{
CSlot* pSlot = nullptr;
@@ -1541,7 +1610,7 @@
int nRet = processData.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
CAttributeVector& attrubutes = pStep->attributeVector();
processData.getAttributeVector(attrubutes, weight);
@@ -1549,21 +1618,37 @@
- // 找到玻璃，关联数据
+ // 鎵惧埌鐜荤拑锛屽叧鑱旀暟鎹�
CGlass* pGlass = this->getGlassWithCassette(processData.getCassetteSequenceNo(),
processData.getJobSequenceNo());
if (pGlass == nullptr) {
- LOGE("<CEquipment-%s>找不到对应Glass, 关联工艺参数失败。", this->getName().c_str(),
+ LOGE("<CEquipment-%s>鎵句笉鍒板搴擥lass, 鍏宠仈宸ヨ壓鍙傛暟澶辫触銆侰assetteSequenceNo:%d/%d",
+ this->getName().c_str(),
processData.getCassetteSequenceNo(),
processData.getJobSequenceNo());
return -1;
}
auto rawData = processData.getParamsRawData();
- std::vector<CParam> params;
- this->parsingParams((const char*)rawData.data(), rawData.size(), params);
+ std::vector<CParam> tempParams;
+ this->parsingProcessData((const char*)rawData.data(), rawData.size(), tempParams);
+ int n = processData.getTotalParameter();
+ std::vector<CParam> params(tempParams.begin(), tempParams.begin() + (std::min)(n, (int)tempParams.size()));
pGlass->addParams(params);
-
+ if (m_listener.onProcessDataReport != nullptr) {
+ m_listener.onProcessDataReport(this, params);
+ }
+
+ // 鍏宠仈鐨凣lass涔熻鏇存柊
+ 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);
+ if (m_listener.onProcessDataReport != nullptr) {
+ m_listener.onProcessDataReport(this, params);
+ }
+ }
return nRet;
}
@@ -1574,7 +1659,7 @@
int nRet = jobDataS.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
CAttributeVector& attrubutes = pStep->attributeVector();
jobDataS.getAttributeVector(attrubutes, weight);
@@ -1588,11 +1673,15 @@
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
- // 可以在此更新JobDataS数据了
+ // 鍙互鍦ㄦ鏇存柊JobDataS鏁版嵁浜�
int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
if (nRet < 0) {
- LOGE("<CEquipment-%s>onReceivedJob,更新JobDataS失败，glassUpdateJobDataS返回%d",
+ LOGE("<CEquipment-%s>onReceivedJob,鏇存柊JobDataS澶辫触锛実lassUpdateJobDataS杩斿洖%d",
m_strName.c_str(), nRet);
+ }
+
+ if (m_listener.onReceivedJob != nullptr) {
+ m_listener.onReceivedJob(this, port, pJobDataS);
}
return nRet;
@@ -1604,7 +1693,7 @@
int nRet = jobDataS.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
CAttributeVector& attrubutes = pStep->attributeVector();
jobDataS.getAttributeVector(attrubutes, weight);
@@ -1616,6 +1705,10 @@
int CEquipment::onSentOutJob(int port, CJobDataS* pJobDataS)
{
LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
+
+ if (m_listener.onSentOutJob != nullptr) {
+ m_listener.onSentOutJob(this, port, pJobDataS);
+ }
return 0;
}
@@ -1639,7 +1732,7 @@
index += sizeof(short);
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("UnitOrPort",
std::to_string(unitOrPort).c_str(), "", weight++));
@@ -1683,7 +1776,7 @@
return fetchedOutJob(port, pJobDataB);
}
- // 数据异常，处理或显示
+ // 鏁版嵁寮傚父锛屽鐞嗘垨鏄剧ず
LOGI("<CEquipment-%s>onFetchedOutJob Error.ort:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
return -1;
@@ -1708,7 +1801,7 @@
index += sizeof(short);
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("UnitOrPort",
std::to_string(unitOrPort).c_str(), "", weight++));
@@ -1740,7 +1833,7 @@
vcrEventReport.getGlassId().c_str());
- // 更新Glass的ID
+ // 鏇存柊Glass鐨処D
CGlass* pGlass = getGlassWithCassette(vcrEventReport.getCassetteSequenceNo(),
vcrEventReport.getJobSequenceNo());
if (pGlass != nullptr) {
@@ -1748,13 +1841,13 @@
}
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
CAttributeVector& attrubutes = pStep->attributeVector();
vcrEventReport.getAttributeVector(attrubutes, weight);
- // 0426, 先固定返回1(OK)
+ // 0426, 鍏堝浐瀹氳繑鍥�1(OK)
((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
@@ -1776,7 +1869,7 @@
index += 256 * 2;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("CassetteNo",
std::to_string(cassetteNo).c_str(), "", weight++));
@@ -1788,14 +1881,19 @@
strPanelGradeData.c_str(), "", weight++));
- // 更新检测结果
+ // 鏇存柊妫�娴嬬粨鏋�
CGlass* pGlass = getGlassWithCassette(cassetteNo, jobSequenceNo);
if (pGlass == nullptr) {
- LOGE("<CEquipment-%s>更新Panel Data失败，找不到对应的Glass.cassetteNo=%d, jobSequenceNo=%d",
+ LOGE("<CEquipment-%s>鏇存柊Panel Data澶辫触锛屾壘涓嶅埌瀵瑰簲鐨凣lass.cassetteNo=%d, jobSequenceNo=%d",
getName().c_str(), cassetteNo, jobSequenceNo);
return -1;
}
- pGlass->setInspResult(m_nID, 0, judgeStringToInspResult(strPanelJudgeData));
+ auto result = judgeStringToInspResult(strPanelJudgeData);
+ pGlass->setInspResult(m_nID, 0, result);
+
+ if (m_listener.onPanelDataReport != nullptr) {
+ m_listener.onPanelDataReport(this, pGlass);
+ }
return 0;
}
@@ -1805,7 +1903,9 @@
CSVData svData;
int nRet = svData.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
+ Lock();
m_svDatas.push_back(svData);
+ Unlock();
if (m_listener.onSVDataReport != nullptr) {
m_listener.onSVDataReport(this, &svData);
@@ -1827,7 +1927,7 @@
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("CassetteSequenceNo",
(std::to_string(cassetteSequenceNo)).c_str(), "", weight++));
@@ -1881,16 +1981,21 @@
year, month, day, hour, minute, second
);
+ CGlass* pGlass = getGlassFromSlot(slotNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>decodeJobProcessStartReport, 鎵句笉鍒板搴攇lass", getName().c_str());
+ }
+ if (slotNo <= 0 || slotNo > 8) return -1;
- if (m_processState != PROCESS_STATE::Processing) {
+ if (m_processState[slotNo -1] != PROCESS_STATE::Processing) {
Lock();
m_svDatas.clear();
Unlock();
- setProcessState(PROCESS_STATE::Processing);
+ setProcessState(slotNo, PROCESS_STATE::Processing);
}
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("CassetteNo",
std::to_string(cassetteNo).c_str(), "", weight++));
@@ -1954,25 +2059,22 @@
);
- if (m_processState != PROCESS_STATE::Complete) {
- setProcessState(PROCESS_STATE::Complete);
- }
-
CGlass* pGlass = getGlassFromSlot(slotNo);
+ if (m_processState[slotNo - 1] != PROCESS_STATE::Complete) {
+ setProcessState(slotNo, PROCESS_STATE::Complete);
+ }
+
if (pGlass == nullptr) {
- LOGE("<CEquipment-%s>decodeJobProcessEndReport, 找不到对应glass", getName().c_str());
+ LOGE("<CEquipment-%s>decodeJobProcessEndReport, 鎵句笉鍒板搴攇lass", getName().c_str());
}
else {
CJobDataS* pJs = pGlass->getJobDataS();
if (pJs->getCassetteSequenceNo() == cassetteNo
&& pJs->getJobSequenceNo() == jobSequenceNo) {
pGlass->processEnd(m_nID, getSlotUnit(slotNo));
- if (m_processState != PROCESS_STATE::Complete) {
- setProcessState(PROCESS_STATE::Complete);
- }
}
else {
- LOGE("<CEquipment-%s>decodeJobProcessEndReport, jobSequenceNo或jobSequenceNo不匹配",
+ LOGE("<CEquipment-%s>decodeJobProcessEndReport, jobSequenceNo鎴杍obSequenceNo涓嶅尮閰�",
getName().c_str());
}
}
@@ -1980,7 +2082,7 @@
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("CassetteNo",
std::to_string(cassetteNo).c_str(), "", weight++));
@@ -2004,10 +2106,10 @@
LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
- // 当前要存片，之前肯定有拔片，因此片子在Arm那里
+ // 褰撳墠瑕佸瓨鐗囷紝涔嬪墠鑲畾鏈夋嫈鐗囷紝鍥犳鐗囧瓙鍦ˋrm閭ｉ噷
CGlass* pGlass = ((CArm*)m_pArm)->getGlassFromSlot(1);
if (pGlass == nullptr) {
- LOGE("<CFliper-%s>onPreStoredJob,缓存中没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)，请检查数据，注意风险。", m_strName.c_str(),
+ LOGE("<CFliper-%s>onPreStoredJob,缂撳瓨涓病鏈夋壘鍒板搴旂殑Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)锛岃妫�鏌ユ暟鎹紝娉ㄦ剰椋庨櫓銆�", m_strName.c_str(),
pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
return FALSE;
}
@@ -2015,19 +2117,19 @@
CJobDataS* pJobDataS = pGlass->getJobDataS();
ASSERT(pJobDataS);
if (!compareJobData(pJobDataB, pJobDataS)) {
- LOGE("<CEquipemnt-%s>onPreStoredJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
+ LOGE("<CEquipemnt-%s>onPreStoredJob,JobData鏁版嵁涓嶅尮閰�(JobDataB(%d, %d),JobDataS(%d, %d)), 娉ㄦ剰鎺掓煡椋庨櫓!", m_strName.c_str(),
pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
return FALSE;
}
- // 如果没有可用位置，报错
+ // 濡傛灉娌℃湁鍙敤浣嶇疆锛屾姤閿�
Lock();
CSlot* pSlot = getSlot(putSlot - 1);
ASSERT(pSlot);
if (pSlot->getContext() != nullptr) {
Unlock();
- LOGE("<CEquipemnt-%s>onPreStoredJob,指定slot(port:%d)有料，请注意风险！", m_strName.c_str(), port);
+ LOGE("<CEquipemnt-%s>onPreStoredJob,鎸囧畾slot(port:%d)鏈夋枡锛岃娉ㄦ剰椋庨櫓锛�", m_strName.c_str(), port);
return FALSE;
}
Unlock();
@@ -2057,7 +2159,7 @@
return storedJob(port, pJobDataB, putSlot);
}
- // 数据异常，处理或显示
+ // 鏁版嵁寮傚父锛屽鐞嗘垨鏄剧ず
LOGI("<CEquipment-%s>onStoredJob Error.port:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
return -1;
@@ -2071,8 +2173,8 @@
}
/*
- * 当从CC-Link检测到设备Send Able为On时调用此函数
- * 可能会多次重复调用(根据扫描频率), 注意防呆
+ * 褰撲粠CC-Link妫�娴嬪埌璁惧Send Able涓篛n鏃惰皟鐢ㄦ鍑芥暟
+ * 鍙兘浼氬娆￠噸澶嶈皟鐢�(鏍规嵁鎵弿棰戠巼), 娉ㄦ剰闃插憜
*/
int CEquipment::onSendAble(int port)
{
@@ -2088,7 +2190,7 @@
return 0;
}
- int CEquipment::onProcessStateChanged(PROCESS_STATE state)
+ int CEquipment::onProcessStateChanged(int nSlotNo, PROCESS_STATE prevState, PROCESS_STATE state)
{
return 0;
}
@@ -2189,15 +2291,24 @@
return -1;
});
pStep->setName(STEP_EQ_FAC_DATA_REPORT);
- pStep->setProp("Port", (void*)port);
+ pStep->setProp("Port", (void*)(__int64)port);
+ pStep->setReadContinue(TRUE);
pStep->setWriteSignalDev(writeSignalDev);
if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
delete pStep;
}
}
+ PROCESS_STATE CEquipment::getProcessState(int slotNo) const
+ {
+ if (slotNo <= 0 || slotNo > SLOT_MAX) {
+ return PROCESS_STATE::Ready;
+ }
+ return m_processState[slotNo - 1];
+ }
+
std::vector<SERVO::CSVData>& CEquipment::getSVDatas()
{
return m_svDatas;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3