From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。
---
SourceCode/Bond/Servo/CSlot.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index 958d5c6..629f7ac 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -12,6 +12,7 @@
m_bLock = FALSE;
m_pContext = nullptr;
m_pTempContext = nullptr;
+ m_nLinkSignalPath = 0;
}
CSlot::~CSlot()
@@ -119,26 +120,25 @@
return m_pTempContext;
}
+ void CSlot::setLinkSignalPath(int path)
+ {
+ m_nLinkSignalPath = path;
+ }
+
+ int CSlot::getLinkSignalPath()
+ {
+ return m_nLinkSignalPath;
+ }
+
void CSlot::serialize(CArchive& ar)
{
if (ar.IsStoring()) {
- ar << m_nPosition;
- ar << m_nNo;
- ar << (int)m_materialsType;
- WriteString(ar, m_strName);
ar << (__int64)m_pContext;
- ar << m_bEnable;
ar << m_bLock;
}
else {
- int i32;
__int64 i64;
- ar >> m_nPosition;
- ar >> m_nNo;
- ar >> i32; m_materialsType = (MaterialsType)i32;
- ReadString(ar, m_strName);
ar >> i64; m_pTempContext = (CContext*)i64;
- ar >> m_bEnable;
ar >> m_bLock;
}
}
--
Gitblit v1.9.3