From 3e91a18f75a75fbe8f646d73e4e68ba107b6750b Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 08 一月 2026 21:04:26 +0800
Subject: [PATCH] 1.增加状态是否远程禁等逻辑；
---
SourceCode/Bond/Servo/CJobDataS.cpp | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 88 insertions(+), 61 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.cpp b/SourceCode/Bond/Servo/CJobDataS.cpp
index 0ac6e18..2231b0b 100644
--- a/SourceCode/Bond/Servo/CJobDataS.cpp
+++ b/SourceCode/Bond/Servo/CJobDataS.cpp
@@ -20,15 +20,17 @@
m_nProcessResonCode = 0;
m_nLastGlassFlag = 0;
m_nFirstGlassFlag = 0;
- m_nQTime[3] = {0};
+ m_nQTime[3] = { 0 };
m_nQTimeOverFlag = 0;
m_nMasterRecipe = 0;
+ m_nRecipeIds[DEVICE_COUNT] = { 0 };
m_nMode = 0;
m_nSlotUnitSelectFlag = 0;
m_nSourcePortNo = 0;
m_nSourceSlotNo = 0;
m_nTargetPortNo = 0;
m_nTargetSlotNo = 0;
+ m_nProductJudge = 0;
m_pRawData = nullptr;
m_pOwner = nullptr;
if (ENABLE_JOBDATAS_RAWDATA) {
@@ -75,9 +77,7 @@
m_nQTime[2] = pScr->m_nQTime[2];
m_nQTimeOverFlag = pScr->m_nQTimeOverFlag;
m_nMasterRecipe = pScr->m_nMasterRecipe;
- m_strProductRecipeId = pScr->m_strProductRecipeId;
- m_strPCode = pScr->m_strPCode;
- m_strUseType = pScr->m_strUseType;
+ memcpy(m_nRecipeIds, pScr->m_nRecipeIds, sizeof(m_nRecipeIds));
m_strPanelMeasure = pScr->m_strPanelMeasure;
m_nMode = pScr->m_nMode;
m_nSlotUnitSelectFlag = pScr->m_nSlotUnitSelectFlag;
@@ -85,6 +85,7 @@
m_nSourceSlotNo = pScr->m_nSourceSlotNo;
m_nTargetPortNo = pScr->m_nTargetPortNo;
m_nTargetSlotNo = pScr->m_nTargetSlotNo;
+ m_nProductJudge = pScr->m_nProductJudge;
m_pOwner = pScr->m_pOwner;
}
@@ -111,9 +112,7 @@
m_nQTime[2] = pScr->m_nQTime[2];
m_nQTimeOverFlag = pScr->m_nQTimeOverFlag;
m_nMasterRecipe = pScr->m_nMasterRecipe;
- m_strProductRecipeId = pScr->m_strProductRecipeId;
- m_strPCode = pScr->m_strPCode;
- m_strUseType = pScr->m_strUseType;
+ memcpy(m_nRecipeIds, pScr->m_nRecipeIds, sizeof(m_nRecipeIds));
m_strPanelMeasure = pScr->m_strPanelMeasure;
m_nMode = pScr->m_nMode;
m_nSlotUnitSelectFlag = pScr->m_nSlotUnitSelectFlag;
@@ -121,7 +120,17 @@
m_nSourceSlotNo = pScr->m_nSourceSlotNo;
m_nTargetPortNo = pScr->m_nTargetPortNo;
m_nTargetSlotNo = pScr->m_nTargetSlotNo;
+ m_nProductJudge = pScr->m_nProductJudge;
m_pOwner = pScr->m_pOwner;
+ }
+
+ CJobDataB& CJobDataS::getJobDataB(CJobDataB& jobDataB)
+ {
+ jobDataB.setCassetteSequenceNo(this->getCassetteSequenceNo());
+ jobDataB.setJobSequenceNo(this->getJobSequenceNo());
+ jobDataB.setGlassId(this->getGlass1Id().c_str());
+
+ return jobDataB;
}
void* CJobDataS::getOwner()
@@ -134,7 +143,7 @@
m_pOwner = pOwner;
}
- int CJobDataS::getCassetteSequenceNo()
+ int CJobDataS::getCassetteSequenceNo() const
{
return m_nCassetteSequenceNo;
}
@@ -144,7 +153,7 @@
m_nCassetteSequenceNo = no;
}
- int CJobDataS::getJobSequenceNo()
+ int CJobDataS::getJobSequenceNo() const
{
return m_nJobSequenceNo;
}
@@ -330,34 +339,40 @@
m_nMasterRecipe = recipe;
}
- std::string& CJobDataS::getProductRecipeId()
+ short CJobDataS::getDeviceRecipeId(int nDeviceIndex) const
{
- return m_strProductRecipeId;
+ if (nDeviceIndex < 0 || nDeviceIndex >= DEVICE_COUNT) {
+ return 0;
+ }
+
+ return m_nRecipeIds[nDeviceIndex];
}
- void CJobDataS::setProductRecipeId(const char* pszId)
+ void CJobDataS::setDeviceRecipeId(int nDeviceIndex, short nRecipeId)
{
- m_strProductRecipeId = pszId;
+ if (nDeviceIndex < 0 || nDeviceIndex >= DEVICE_COUNT) {
+ return;
+ }
+
+ m_nRecipeIds[nDeviceIndex] = nRecipeId;
}
- std::string& CJobDataS::getPCode()
- {
- return m_strPCode;
+ const short* CJobDataS::getRecipeIds() const
+ {
+ return m_nRecipeIds;
}
- void CJobDataS::setPCode(const char* pszCode)
+ void CJobDataS::setRecipeIds(const short* pIds, int nCount)
{
- m_strPCode = pszCode;
- }
+ int nCopyCount = nCount > DEVICE_COUNT ? DEVICE_COUNT : nCount;
+ for (int i = 0; i < nCopyCount; ++i) {
+ m_nRecipeIds[i] = pIds[i];
+ }
- std::string& CJobDataS::getUseType()
- {
- return m_strPCode;
- }
-
- void CJobDataS::setUseType(const char* pszType)
- {
- m_strPCode = pszType;
+ // 如果 nCount < DEVICE_COUNT，可以选择补零
+ for (int i = nCopyCount; i < DEVICE_COUNT; ++i) {
+ m_nRecipeIds[i] = 0;
+ }
}
std::string& CJobDataS::getPanelMeasure()
@@ -430,9 +445,19 @@
m_nTargetSlotNo = no;
}
+ short CJobDataS::getProductJudge() const
+ {
+ return m_nProductJudge;
+ }
+
+ void CJobDataS::setProductJudge(short nProductJudge)
+ {
+ m_nProductJudge = nProductJudge;
+ }
+
int CJobDataS::serialize(char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 256 * 2) return -1;
+ if (nBufferSize < JOBDATAS_SIZE) return -1;
int index = 0;
memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
@@ -488,9 +513,6 @@
memcpy(&pszBuffer[index], &m_nFirstGlassFlag, sizeof(short));
index += sizeof(short);
- memcpy(&pszBuffer[index], &m_nLastGlassFlag, sizeof(short));
- index += sizeof(short);
-
memcpy(&pszBuffer[index], &m_nQTime[0], sizeof(short));
index += sizeof(short);
@@ -506,17 +528,10 @@
memcpy(&pszBuffer[index], &m_nMasterRecipe, sizeof(short));
index += sizeof(short);
- strLen = min(10, (int)m_strProductRecipeId.size());
- memcpy(&pszBuffer[index], m_strProductRecipeId.c_str(), strLen);
- index += 10;
-
- strLen = min(10, (int)m_strPCode.size());
- memcpy(&pszBuffer[index], m_strPCode.c_str(), strLen);
- index += 10;
-
- strLen = min(10, (int)m_strUseType.size());
- memcpy(&pszBuffer[index], m_strUseType.c_str(), strLen);
- index += 10;
+ for (int i = 0; i < DEVICE_COUNT; i++) {
+ memcpy(&pszBuffer[index], &m_nRecipeIds[i], sizeof(short));
+ index += sizeof(short);
+ }
strLen = min(80, (int)m_strPanelMeasure.size());
memcpy(&pszBuffer[index], m_strPanelMeasure.c_str(), strLen);
@@ -540,7 +555,10 @@
memcpy(&pszBuffer[index], &m_nTargetSlotNo, sizeof(short));
index += sizeof(short);
- return 256 * 2;
+ memcpy(&pszBuffer[index], &m_nProductJudge, sizeof(short));
+ index += sizeof(short);
+
+ return JOBDATAS_SIZE;
}
int CJobDataS::unserialize(const char* pszBuffer, int nBufferSize)
@@ -600,9 +618,9 @@
index += sizeof(short);
memcpy(&m_nQTime[1], &pszBuffer[index], sizeof(short));
- index += sizeof(int);
+ index += sizeof(short);
- memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(int));
+ memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(short));
index += sizeof(short);
memcpy(&m_nQTimeOverFlag, &pszBuffer[index], sizeof(short));
@@ -611,16 +629,12 @@
memcpy(&m_nMasterRecipe, &pszBuffer[index], sizeof(short));
index += sizeof(short);
- CToolUnits::convertString(&pszBuffer[index], 10, m_strProductRecipeId);
- index += 10;
+ for (int i = 0; i < DEVICE_COUNT; i++) {
+ memcpy(&m_nRecipeIds[i], &pszBuffer[index], sizeof(short));
+ index += sizeof(short);
+ }
- CToolUnits::convertString(&pszBuffer[index], 10, m_strProductRecipeId);
- index += 10;
-
- CToolUnits::convertString(&pszBuffer[index], 10, m_strProductRecipeId);
- index += 10;
-
- CToolUnits::convertString(&pszBuffer[index], 80, m_strProductRecipeId);
+ CToolUnits::convertString(&pszBuffer[index], 80, m_strPanelMeasure);
index += 80;
memcpy(&m_nMode, &pszBuffer[index], sizeof(short));
@@ -641,12 +655,13 @@
memcpy(&m_nTargetSlotNo, &pszBuffer[index], sizeof(short));
index += sizeof(short);
+ memcpy(&m_nProductJudge, &pszBuffer[index], sizeof(short));
+ index += sizeof(short);
// 缓存原始数据
if (m_pRawData != nullptr) {
memcpy(m_pRawData, pszBuffer, JOBDATAS_SIZE);
}
-
return JOBDATAS_SIZE;
}
@@ -719,14 +734,23 @@
attrubutes.addAttribute(new CAttribute("MasterRecipe",
std::to_string(getMasterRecipe()).c_str(), "", weight++));
- attrubutes.addAttribute(new CAttribute("ProductRecipeId",
- getProductRecipeId().c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Recipe ID(EFEM)",
+ std::to_string(getDeviceRecipeId(0)).c_str(), "", weight++));
- attrubutes.addAttribute(new CAttribute("PCode",
- getPCode().c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Recipe ID(BONDER1)",
+ std::to_string(getDeviceRecipeId(1)).c_str(), "", weight++));
- attrubutes.addAttribute(new CAttribute("UseType",
- getUseType().c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Recipe ID(BONDER2)",
+ std::to_string(getDeviceRecipeId(2)).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("Recipe ID(Bake Cooling)",
+ std::to_string(getDeviceRecipeId(3)).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("Recipe ID(Vacuum Bake)",
+ std::to_string(getDeviceRecipeId(4)).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("Recipe ID(Measurement)",
+ std::to_string(getDeviceRecipeId(5)).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("PanelMeasure",
getPanelMeasure().c_str(), "", weight++));
@@ -745,5 +769,8 @@
attrubutes.addAttribute(new CAttribute("TargetSlotNo",
std::to_string(getTargetSlotNo()).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("ProductJudge",
+ std::to_string(getProductJudge()).c_str(), "", weight++));
}
}
--
Gitblit v1.9.3