From 96579a48b3b558f5ce58cffe372b1f563a9e62ce Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 03 九月 2025 17:23:56 +0800
Subject: [PATCH] 1.配方列表和配方参数获取合并在线程中获取，并更新状态到对话框； 2.配方参数获取； 3.Bonder, AOI, 真空烘烤, 冷却烧烤配方参数解释。
---
SourceCode/Bond/Servo/CMaster.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index cae98db..2d4d697 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -171,7 +171,9 @@
bool addGlassToQueue(CGlass* pGlass);
bool glassFromQueueToInPorcess(CGlass* pGlass);
bool glassFromInPorcessToComplete(CGlass* pGlass);
+ bool processJobFromInPorcessToComplete(CProcessJob* pProcessJob);
bool checkAndUpdatePjComplete(CProcessJob* pJob);
+ bool checkAndUpdateCjComplete(CControlJob* pJob);
CProcessJob* getGlassProcessJob(CGlass* pGlass);
@@ -221,6 +223,7 @@
// 新增已经开始处理的ProcessJob列表
std::vector<CProcessJob*> m_inProcesJobs;
+ std::vector<CProcessJob*> m_completeProcessJobs;
std::vector<CGlass*> m_queueGlasses;
std::vector<CGlass*> m_inProcesGlasses;
std::vector<CGlass*> m_completeGlasses;
--
Gitblit v1.9.3