From 9e9e63ef44ff672989d7b78bf37afb2054267671 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 22 九月 2025 15:47:04 +0800
Subject: [PATCH] 1.完善工艺批次逻辑; 2.PortType保存到本地,不再同步到efem

---
 SourceCode/Bond/Servo/CMaster.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 47bf8cf..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);
@@ -192,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