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/CJobDataA.cpp | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataA.cpp b/SourceCode/Bond/Servo/CJobDataA.cpp
index 4c5e3e4..4a1e3f3 100644
--- a/SourceCode/Bond/Servo/CJobDataA.cpp
+++ b/SourceCode/Bond/Servo/CJobDataA.cpp
@@ -6,12 +6,22 @@
namespace SERVO {
CJobDataA::CJobDataA()
{
-
+ m_pOwner = nullptr;
}
CJobDataA::~CJobDataA()
{
+ }
+
+ void* CJobDataA::getOwner()
+ {
+ return m_pOwner;
+ }
+
+ void CJobDataA::setOwner(void* pOwner)
+ {
+ m_pOwner = pOwner;
}
short CJobDataA::getPortNo()
@@ -37,11 +47,11 @@
memcpy(&pszBuffer[index], &m_nPortNo, sizeof(short));
index += sizeof(short);
- int strLen = min(20, m_strCarrierId.size());
+ int strLen = min(20, (int)m_strCarrierId.size());
memcpy(&pszBuffer[index], m_strCarrierId.c_str(), strLen);
index += 20;
- strLen = min(20, m_pruductId.size());
+ strLen = min(20, (int)m_pruductId.size());
memcpy(&pszBuffer[index], m_pruductId.c_str(), strLen);
index += 20;
@@ -56,7 +66,7 @@
for (int i = 0; i < min(25, m_glassIds.size()); i++) {
std::string& strGlassId = m_glassIds.at(i);
- strLen = min(20, strGlassId.size());
+ strLen = min(20, (int)strGlassId.size());
memcpy(&pszBuffer[index], strGlassId.c_str(), strLen);
index += 20;
}
@@ -64,7 +74,7 @@
return 320 * 2;
}
- int CJobDataA::unserialize(char* pszBuffer, int nBufferSize)
+ int CJobDataA::unserialize(const char* pszBuffer, int nBufferSize)
{
if (nBufferSize < 640) return -1;
--
Gitblit v1.9.3