From 4d9d8d22e3666076988c30afb4e7c6fe365c19aa Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 06 一月 2026 18:53:04 +0800
Subject: [PATCH] 1.修复一个回复错误的问题；
---
SourceCode/Bond/Servo/CEquipment.cpp | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 6a3b56d..792ba3f 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -26,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);
@@ -144,13 +143,15 @@
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;
+
+ m_processState[nSlotNo - 1] = state;
+ onProcessStateChanged(nSlotNo, m_processState[nSlotNo - 1]);
if (m_listener.onProcessStateChanged != nullptr) {
- m_listener.onProcessStateChanged(this, m_processState);
+ m_listener.onProcessStateChanged(this, nSlotNo, m_processState[nSlotNo - 1]);
}
}
@@ -509,7 +510,14 @@
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);
@@ -909,8 +917,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) {
@@ -941,9 +949,11 @@
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
+ /*
if (m_processState != PROCESS_STATE::Processing) {
setProcessState(PROCESS_STATE::Processing);
}
+ */
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, EDCC_STORED_JOB);
@@ -1595,7 +1605,7 @@
auto rawData = processData.getParamsRawData();
std::vector<CParam> tempParams;
- this->parsingParams((const char*)rawData.data(), rawData.size(), tempParams);
+ this->parsingProcessData((const char*)rawData.data(), rawData.size(), tempParams);
int n = processData.getTotalParameter();
std::vector<CParam> params(tempParams.begin(), tempParams.begin() + min(n, (int)tempParams.size()));
pGlass->addParams(params);
@@ -1929,12 +1939,17 @@
year, month, day, hour, minute, second
);
+ CGlass* pGlass = getGlassFromSlot(slotNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>decodeJobProcessStartReport, 找不到对应glass", 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);
}
@@ -2002,11 +2017,11 @@
);
- 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());
}
@@ -2015,9 +2030,6 @@
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不匹配",
@@ -2136,7 +2148,7 @@
return 0;
}
- int CEquipment::onProcessStateChanged(PROCESS_STATE state)
+ int CEquipment::onProcessStateChanged(int nSlotNo, PROCESS_STATE state)
{
return 0;
}
@@ -2237,7 +2249,8 @@
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;
--
Gitblit v1.9.3