From 16fe8474c740e9f2a497854d4291c48ea7a62878 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 25 四月 2025 11:53:36 +0800
Subject: [PATCH] 1.增加CJobDataB, CJobDataC, CJobDataS
---
SourceCode/Bond/Servo/Servo.vcxproj | 6
SourceCode/Bond/Servo/Servo.vcxproj.filters | 6
SourceCode/Bond/Servo/CEqJobEventStep.cpp | 8
SourceCode/Bond/Servo/CJobDataB.h | 25 +++
SourceCode/Bond/Servo/CJobDataC.cpp | 66 ++++++++
SourceCode/Bond/Servo/CJobDataC.h | 31 +++
SourceCode/Bond/Servo/CJobDataS.h | 79 +++++++++
SourceCode/Bond/Servo/CEqJobEventStep.h | 2
SourceCode/Bond/Servo/CJobDataB.cpp | 46 +++++
SourceCode/Bond/Servo/CJobDataS.cpp | 204 +++++++++++++++++++++++++
10 files changed, 468 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 724f000..a0efb8b 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -6,7 +6,7 @@
namespace SERVO {
CEqJobEventStep::CEqJobEventStep() : CReadStep()
{
- m_nJobDataBDev = 0;
+ m_nJobDataADev = 0;
}
CEqJobEventStep::~CEqJobEventStep()
@@ -16,7 +16,7 @@
void CEqJobEventStep::setJobDataDev(int nDev)
{
- m_nJobDataBDev = nDev;
+ m_nJobDataADev = nDev;
}
void CEqJobEventStep::getAttributeVector(CAttributeVector& attrubutes)
@@ -25,7 +25,7 @@
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nJobDataBDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), ""));
attrubutes.addAttribute(new CAttribute("PortNo",
std::to_string(m_jobDataA.getPortNo()).c_str(), ""));
attrubutes.addAttribute(new CAttribute("CarrierId",
@@ -51,7 +51,7 @@
char szBuffer[1024];
- int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nJobDataBDev,
+ int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nJobDataADev,
640, szBuffer);
if (0 != nRet) {
return -1;
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.h b/SourceCode/Bond/Servo/CEqJobEventStep.h
index 71e7e77..380470f 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.h
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.h
@@ -19,7 +19,7 @@
CJobDataA* getJobDataA();
private:
- int m_nJobDataBDev;
+ int m_nJobDataADev;
CJobDataA m_jobDataA;
};
}
diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataB.cpp
new file mode 100644
index 0000000..cf25ff2
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataB.cpp
@@ -0,0 +1,46 @@
+#include "stdafx.h"
+#include "CJobDataB.h"
+
+
+namespace SERVO {
+ CJobDataB::CJobDataB()
+ {
+ m_nCassetteSequenceNo = 0;
+ m_nJobSequenceNo = 0;
+ }
+
+ CJobDataB::~CJobDataB()
+ {
+
+ }
+
+ int CJobDataB::getCassetteSequenceNo()
+ {
+ return m_nCassetteSequenceNo;
+ }
+
+ void CJobDataB::setCassetteSequenceNo(int no)
+ {
+ m_nCassetteSequenceNo = no;
+ }
+
+ int CJobDataB::getJobSequenceNo()
+ {
+ return m_nJobSequenceNo;
+ }
+
+ void CJobDataB::setJobSequenceNo(int no)
+ {
+ m_nJobSequenceNo = no;
+ }
+
+ std::string& CJobDataB::getGlassId()
+ {
+ return m_strGlassId;
+ }
+
+ void CJobDataB::setGlassId(const char* pszGlassId)
+ {
+ m_strGlassId = pszGlassId;
+ }
+}
diff --git a/SourceCode/Bond/Servo/CJobDataB.h b/SourceCode/Bond/Servo/CJobDataB.h
new file mode 100644
index 0000000..589ba72
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataB.h
@@ -0,0 +1,25 @@
+#pragma once
+
+
+namespace SERVO {
+ class CJobDataB
+ {
+ public:
+ CJobDataB();
+ ~CJobDataB();
+
+ public:
+ int getCassetteSequenceNo();
+ void setCassetteSequenceNo(int no);
+ int getJobSequenceNo();
+ void setJobSequenceNo(int no);
+ std::string& getGlassId();
+ void setGlassId(const char* pszGlassId);
+
+ private:
+ int m_nCassetteSequenceNo;
+ int m_nJobSequenceNo;
+ std::string m_strGlassId;
+ };
+}
+
diff --git a/SourceCode/Bond/Servo/CJobDataC.cpp b/SourceCode/Bond/Servo/CJobDataC.cpp
new file mode 100644
index 0000000..4781964
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataC.cpp
@@ -0,0 +1,66 @@
+#include "stdafx.h"
+#include "CJobDataC.h"
+
+
+namespace SERVO {
+ CJobDataC::CJobDataC()
+ {
+ m_nCassetteSequenceNo = 0;
+ }
+
+ CJobDataC::~CJobDataC()
+ {
+ m_nCassetteProcessFlag = 0;
+ }
+
+ int CJobDataC::getCassetteSequenceNo()
+ {
+ return m_nCassetteSequenceNo;
+ }
+
+ void CJobDataC::setCassetteSequenceNo(int no)
+ {
+ m_nCassetteSequenceNo = no;
+ }
+
+ std::string& CJobDataC::getCassetteId()
+ {
+ return m_strCassetteId;
+ }
+
+ void CJobDataC::setCassetteId(const char* pszId)
+ {
+ m_strCassetteId = pszId;
+ }
+
+ std::string& CJobDataC::getCassetteJudge()
+ {
+ return m_strCassetteJudge;
+ }
+
+ void CJobDataC::setCassetteJudge(const char* pszJudge)
+ {
+ m_strCassetteJudge = pszJudge;
+ }
+
+ int CJobDataC::getCassetteProcessFlag()
+ {
+ return m_nCassetteProcessFlag;
+ }
+
+ void CJobDataC::setCassetteProcessFlag(int flag)
+ {
+ m_nCassetteProcessFlag = flag;
+ }
+
+ std::string& CJobDataC::getMasterRecipe()
+ {
+ return m_strMasterRecipe;
+ }
+
+ void CJobDataC::setMasterRecipe(const char* pszRecipe)
+ {
+ m_strMasterRecipe = pszRecipe;
+ }
+}
+
diff --git a/SourceCode/Bond/Servo/CJobDataC.h b/SourceCode/Bond/Servo/CJobDataC.h
new file mode 100644
index 0000000..6b8189f
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataC.h
@@ -0,0 +1,31 @@
+#pragma once
+
+
+namespace SERVO {
+ class CJobDataC
+ {
+ public:
+ CJobDataC();
+ ~CJobDataC();
+
+ public:
+ int getCassetteSequenceNo();
+ void setCassetteSequenceNo(int no);
+ std::string& getCassetteId();
+ void setCassetteId(const char* pszId);
+ std::string& getCassetteJudge();
+ void setCassetteJudge(const char* pszJudge);
+ int getCassetteProcessFlag();
+ void setCassetteProcessFlag(int flag);
+ std::string& getMasterRecipe();
+ void setMasterRecipe(const char* pszRecipe);
+
+ private:
+ int m_nCassetteSequenceNo;
+ std::string m_strCassetteId;
+ std::string m_strCassetteJudge;
+ int m_nCassetteProcessFlag;
+ std::string m_strMasterRecipe;
+ };
+}
+
diff --git a/SourceCode/Bond/Servo/CJobDataS.cpp b/SourceCode/Bond/Servo/CJobDataS.cpp
new file mode 100644
index 0000000..cc07f63
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataS.cpp
@@ -0,0 +1,204 @@
+#include "stdafx.h"
+#include "CJobDataS.h"
+
+
+namespace SERVO {
+ CJobDataS::CJobDataS()
+ {
+ m_nCassetteSequenceNo = 0;
+ m_nJobSequenceNo = 0;
+ m_nJobType = 0;
+ m_nMaterialsType = 0;
+ m_nProductType = 0;
+ m_nDummyType = 0;
+ m_nSkipFlag = 0;
+ m_nProcessFlag = 0;
+ m_nProcessResonCode = 0;
+ m_nLastGlassFlag = 0;
+ m_nFirstGlassFlag = 0;
+ m_nQTime[3] = {0};
+ m_nQTimeOverFlag = 0;
+ m_nMasterRecipe = 0;
+ m_nMode = 0;
+ m_nSlotUnitSelectFlag = 0;
+ m_nSourcePortNo = 0;
+ m_nSourceSlotNo = 0;
+ m_nTargetPortNo = 0;
+ m_nTargetSlotNo = 0;
+ }
+
+ CJobDataS::~CJobDataS()
+ {
+
+ }
+
+ int CJobDataS::getCassetteSequenceNo()
+ {
+ return m_nCassetteSequenceNo;
+ }
+
+ void CJobDataS::setCassetteSequenceNo(int no)
+ {
+ m_nCassetteSequenceNo = no;
+ }
+
+ int CJobDataS::getJobSequenceNo()
+ {
+ return m_nJobSequenceNo;
+ }
+
+ void CJobDataS::setJobSequenceNo(int no)
+ {
+ m_nJobSequenceNo = no;
+ }
+
+ std::string& CJobDataS::getLotId()
+ {
+ return m_strLotId;
+ }
+
+ void CJobDataS::setLotId(const char* pszId)
+ {
+ m_strLotId = pszId;
+ }
+
+ std::string& CJobDataS::getProductId()
+ {
+ return m_strProductId;
+ }
+
+ void CJobDataS::setProductId(const char* pszId)
+ {
+ m_strProductId = pszId;
+ }
+
+ std::string& CJobDataS::getOperationId()
+ {
+ return m_strOperationId;
+ }
+
+ void CJobDataS::setOperationId(const char* pszId)
+ {
+ m_strOperationId = pszId;
+ }
+
+ std::string& CJobDataS::getGlass1Id()
+ {
+ return m_strGlass1Id;
+ }
+
+ void CJobDataS::setGlass1Id(const char* pszId)
+ {
+ m_strGlass1Id = pszId;
+ }
+
+ std::string& CJobDataS::getGlass2Id()
+ {
+ return m_strGlass1Id;
+ }
+
+ void CJobDataS::setGlass2Id(const char* pszId)
+ {
+ m_strGlass2Id = pszId;
+ }
+
+ std::string& CJobDataS::getProductRecipeId()
+ {
+ return m_strProductRecipeId;
+ }
+
+ void CJobDataS::setProductRecipeId(const char* pszId)
+ {
+ m_strProductRecipeId = pszId;
+ }
+
+ std::string& CJobDataS::getPCode()
+ {
+ return m_strPCode;
+ }
+
+ void CJobDataS::setPCode(const char* pszCode)
+ {
+ m_strPCode = pszCode;
+ }
+
+ std::string& CJobDataS::getUseType()
+ {
+ return m_strPCode;
+ }
+
+ void CJobDataS::setUseType(const char* pszType)
+ {
+ m_strPCode = pszType;
+ }
+
+ std::string& CJobDataS::getPanelMeasure()
+ {
+ return m_strPanelMeasure;
+ }
+
+ void CJobDataS::setPanelMeasure(const char* pszMeasure)
+ {
+ m_strPanelMeasure = pszMeasure;
+ }
+
+ int CJobDataS::getMode()
+ {
+ return m_nMode;
+ }
+
+ void CJobDataS::setMode(int mode)
+ {
+ m_nMode = mode;
+ }
+
+ int CJobDataS::getSlotUnitSelectFlag()
+ {
+ return m_nSlotUnitSelectFlag;
+ }
+
+ void CJobDataS::setSlotUnitSelectFlag(int flag)
+ {
+ m_nSlotUnitSelectFlag = flag;
+ }
+
+ int CJobDataS::getSourcePortNo()
+ {
+ return m_nSourcePortNo;
+ }
+
+ void CJobDataS::setSourcePortNo(int no)
+ {
+ m_nSourcePortNo = no;
+ }
+
+ int CJobDataS::getSourceSlotNo()
+ {
+ return m_nSourceSlotNo;
+ }
+
+ void CJobDataS::setSourceSlotNo(int no)
+ {
+ m_nSourceSlotNo = no;
+ }
+
+ int CJobDataS::getTargetPortNo()
+ {
+ return m_nTargetPortNo;
+ }
+
+ void CJobDataS::setTargetPortNo(int no)
+ {
+ m_nTargetPortNo = no;
+ }
+
+ int CJobDataS::getTargetSlotNo()
+ {
+ return m_nTargetSlotNo;
+ }
+
+ void CJobDataS::setTargetSlotNo(int no)
+ {
+ m_nTargetSlotNo = no;
+ }
+}
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
new file mode 100644
index 0000000..757832a
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -0,0 +1,79 @@
+#pragma once
+
+
+namespace SERVO {
+ class CJobDataS
+ {
+ public:
+ CJobDataS();
+ ~CJobDataS();
+
+ public:
+ int getCassetteSequenceNo();
+ void setCassetteSequenceNo(int no);
+ int getJobSequenceNo();
+ void setJobSequenceNo(int no);
+ std::string& getLotId();
+ void setLotId(const char* pszId);
+ std::string& getProductId();
+ void setProductId(const char* pszId);
+ std::string& getOperationId();
+ void setOperationId(const char* pszId);
+ std::string& getGlass1Id();
+ void setGlass1Id(const char* pszId);
+ std::string& getGlass2Id();
+ void setGlass2Id(const char* pszId);
+ std::string& getProductRecipeId();
+ void setProductRecipeId(const char* pszId);
+ std::string& getPCode();
+ void setPCode(const char* pszCode);
+ std::string& getUseType();
+ void setUseType(const char* pszType);
+ std::string& getPanelMeasure();
+ void setPanelMeasure(const char* pszMeasure);
+ int getMode();
+ void setMode(int mode);
+ int getSlotUnitSelectFlag();
+ void setSlotUnitSelectFlag(int flag);
+ int getSourcePortNo();
+ void setSourcePortNo(int no);
+ int getSourceSlotNo();
+ void setSourceSlotNo(int no);
+ int getTargetPortNo();
+ void setTargetPortNo(int no);
+ int getTargetSlotNo();
+ void setTargetSlotNo(int no);
+
+ private:
+ int m_nCassetteSequenceNo;
+ int m_nJobSequenceNo;
+ std::string m_strLotId;
+ std::string m_strProductId;
+ std::string m_strOperationId;
+ std::string m_strGlass1Id;
+ std::string m_strGlass2Id;
+ int m_nJobType;
+ int m_nMaterialsType;
+ int m_nProductType;
+ int m_nDummyType;
+ int m_nSkipFlag;
+ int m_nProcessFlag;
+ int m_nProcessResonCode;
+ int m_nLastGlassFlag;
+ int m_nFirstGlassFlag;
+ int m_nQTime[3];
+ int m_nQTimeOverFlag;
+ int m_nMasterRecipe;
+ std::string m_strProductRecipeId;
+ std::string m_strPCode;
+ std::string m_strUseType;
+ std::string m_strPanelMeasure;
+ int m_nMode;
+ int m_nSlotUnitSelectFlag;
+ int m_nSourcePortNo;
+ int m_nSourceSlotNo;
+ int m_nTargetPortNo;
+ int m_nTargetSlotNo;
+ };
+}
+
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index f44aa10..5944a3f 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -228,6 +228,9 @@
<ClInclude Include="CHMPropertyDlg.h" />
<ClInclude Include="CHMPropertyPage.h" />
<ClInclude Include="CJobDataA.h" />
+ <ClInclude Include="CJobDataB.h" />
+ <ClInclude Include="CJobDataC.h" />
+ <ClInclude Include="CJobDataS.h" />
<ClInclude Include="CLoadPort.h" />
<ClInclude Include="CMeasurement.h" />
<ClInclude Include="ColorTransfer.h" />
@@ -308,6 +311,9 @@
<ClCompile Include="CHMPropertyDlg.cpp" />
<ClCompile Include="CHMPropertyPage.cpp" />
<ClCompile Include="CJobDataA.cpp" />
+ <ClCompile Include="CJobDataB.cpp" />
+ <ClCompile Include="CJobDataC.cpp" />
+ <ClCompile Include="CJobDataS.cpp" />
<ClCompile Include="CLoadPort.cpp" />
<ClCompile Include="CMeasurement.cpp" />
<ClCompile Include="ColorTransfer.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 0c1fbc0..576e90a 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -86,6 +86,9 @@
<ClCompile Include="CJobDataA.cpp" />
<ClCompile Include="CPageCassetteCtrlCmd.cpp" />
<ClCompile Include="CEqJobEventStep.cpp" />
+ <ClCompile Include="CJobDataB.cpp" />
+ <ClCompile Include="CJobDataC.cpp" />
+ <ClCompile Include="CJobDataS.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -170,6 +173,9 @@
<ClInclude Include="CJobDataA.h" />
<ClInclude Include="CPageCassetteCtrlCmd.h" />
<ClInclude Include="CEqJobEventStep.h" />
+ <ClInclude Include="CJobDataB.h" />
+ <ClInclude Include="CJobDataC.h" />
+ <ClInclude Include="CJobDataS.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
--
Gitblit v1.9.3