From 7a20b6f44d2ea3f23ef8d228ec4c1424925e5dfb Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 22 八月 2025 17:55:28 +0800
Subject: [PATCH] 1.增加Job模式，如果不是Job模式，沿用原来的调度方式，否则为批处理模式；
---
SourceCode/Bond/Servo/CMaster.h | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index e5f868d..41d4fb0 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -13,10 +13,25 @@
#include "CArmTray.h"
#include "CCLinkIEControl.h"
#include "CRobotTask.h"
+#include "ProcessJob.h"
+#include "CControlJob.h"
-#define CTStep_begin 0
-#define CTStep_end 99
+#define CTStep_Unknow 0
+#define CTStep_LoadPort_Aligner 1
+#define CTStep_Aligner_Fliper 2
+#define CTStep_Fliper_Bonder1 3
+#define CTStep_Bonder1_Bonder2 4
+#define CTStep_Bonder2_VacuumBake 5
+#define CTStep_VacuumBake_VacuumBake 6
+#define CTStep_VacuumBake_BakeCooling 7
+#define CTStep_BakeCooling_BakeCooling1 8
+#define CTStep_BakeCooling_BakeCooling2 9
+#define CTStep_BakeCooling_BakeCooling3 10
+#define CTStep_BakeCooling_Measurement 11
+#define CTStep_Measurement_LoadPort 12
+#define CTStep_begin CTStep_LoadPort_Aligner
+#define CTStep_end CTStep_Measurement_LoadPort
namespace SERVO {
enum class MASTERSTATE {
@@ -50,7 +65,7 @@
ONCTROUNDEND onCTRoundEnd;
} MasterListener;
- class CMaster
+ class CMaster : public IResourceView
{
public:
CMaster();
@@ -73,6 +88,7 @@
void onTimer(UINT nTimerid);
std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
+ CEquipment* getEquipment(int id) const;
void setCacheFilepath(const char* pszFilepath);
int abortCurrentTask();
int restoreCurrentTask();
@@ -82,6 +98,7 @@
void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
void setPortEnable(unsigned int index, BOOL bEnable);
void setCompareMapsBeforeProceeding(BOOL bCompare);
+ void setJobMode(BOOL bJobMode);
void datetimeSync(SYSTEMTIME& time);
void enableEventReport(bool bEnable);
void enableAlarmReport(bool bEnable);
@@ -90,6 +107,14 @@
int carrierRelease(unsigned int port);
int getContinuousTransferCount();
void setContinuousTransferCount(int round);
+ int setProcessJobs(std::vector<CProcessJob*>& pjs);
+ std::vector<CProcessJob*>& getProcessJobs();
+ CProcessJob* getProcessJob(const std::string& id);
+ int setControlJob(CControlJob& controlJob);
+ CControlJob* getControlJob();
+ CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
+ bool saveState() const;
+ bool loadState(const std::string& path);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -113,13 +138,21 @@
void setState(MASTERSTATE state);
CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2,
- int armNo = 1);
+ int armNo = 1, BOOL bJobMode = FALSE);
CRobotTask* createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq);
CRobotTask* createTransferTask_bake_to_cooling(CEquipment* pSrcEq);
CRobotTask* createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq);
CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);
CRobotTask* createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
CEquipment* pTarEq, int nTarSlot, int armNo = 1);
+
+ public:
+ // —— IResourceView 覆写 ——（注意 const）
+ bool isProcessJobsEmpty() const override;
+ bool recipeExists(const std::string& ppid) const override;
+ bool carrierPresent(const std::string& carrierId) const override;
+ bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
+ bool ceidDefined(uint32_t ceid) const override;
private:
CRITICAL_SECTION m_criticalSection;
@@ -157,6 +190,8 @@
// 在开始工艺前是否先需要先比较map
BOOL m_isCompareMapsBeforeProceeding;
+ BOOL m_bJobMode;
+
// 千传圈数计数
int m_nContinuousTransferCount;
@@ -165,6 +200,9 @@
private:
bool m_bEnableEventReport;
bool m_bEnableAlarmReport;
+ SERVO::CControlJob* m_pControlJob;
+ std::vector<SERVO::CProcessJob*> m_processJobs;
+ std::string m_strStatePath;
};
}
--
Gitblit v1.9.3