From ecdb299523e6f58dba16e23c0e5292203803313b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 26 八月 2025 17:48:03 +0800
Subject: [PATCH] Merge branch 'clh' of http://soft.boounion.cn/r/~chenluhua/Bond2 into clh
---
SourceCode/Bond/Servo/CMaster.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 3c3d79a..631ff24 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -66,7 +66,7 @@
ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onPjStart;
-
+ ONPJSTART onPjEnd;
} MasterListener;
class CMaster : public IResourceView
@@ -167,6 +167,9 @@
bool addGlassToQueue(CGlass* pGlass);
bool glassFromQueueToInPorcess(CGlass* pGlass);
bool glassFromInPorcessToComplete(CGlass* pGlass);
+ bool checkAndUpdatePjComplete(CProcessJob* pJob);
+ CProcessJob* getGlassProcessJob(CGlass* pGlass);
+
private:
CRITICAL_SECTION m_criticalSection;
--
Gitblit v1.9.3