From 8cd1ad310c5e559435ff38e518b8fad89852b55f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 10 十月 2025 13:38:02 +0800
Subject: [PATCH] 1.ControlJob属性页设置 ；
---
SourceCode/Bond/Servo/CMaster.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 6a17fb1..be3fea6 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -107,8 +107,9 @@
int abortCurrentTask();
int restoreCurrentTask();
int resendCurrentTask();
- void setPortType(unsigned int index, BOOL enable, int type, int mode,
+ void setPortTypeEx(unsigned int index, BOOL enable, int type, int mode,
int cassetteType, int transferMode, BOOL autoChangeEnable);
+ void setPortType(unsigned int index, int type);
void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
void setPortEnable(unsigned int index, BOOL bEnable);
void setCompareMapsBeforeProceeding(BOOL bCompare);
@@ -128,13 +129,15 @@
CControlJob* getControlJob();
CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
bool saveState() const;
- bool loadState(const std::string& path);
+ bool loadState();
+ void setStateFile(const std::string& path);
int getWipGlasses(std::vector<CGlass*>& glasses);
void test();
bool moveGlassToBuf(int eqid, int slotNo);
bool moveGlassToSlot(int eqid, int slotNo);
int getPortCassetteSnSeed(int port);
void setPortCassetteSnSeed(int port, int seed);
+ CGlass* getGlass(int scrPort, int scrSlot);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -190,7 +193,8 @@
bool checkAndUpdatePjComplete(CProcessJob* pJob);
bool checkAndUpdateCjComplete(CControlJob* pJob);
CProcessJob* getGlassProcessJob(CGlass* pGlass);
- bool completeControlJob(std::string description);
+ bool completeControlJob();
+ bool forceCompleteControlJob(std::string description);
bool canCreateControlJob();
bool canCompleteControlJob();
bool canDeleteControlJob();
--
Gitblit v1.9.3