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/CJobDataB.h | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataB.h b/SourceCode/Bond/Servo/CJobDataB.h
index 632285b..b609376 100644
--- a/SourceCode/Bond/Servo/CJobDataB.h
+++ b/SourceCode/Bond/Servo/CJobDataB.h
@@ -1,35 +1,33 @@
#pragma once
-#include <vector>
-#include <string>
+#define JOBDATAB_SIZE (14 * 2)
namespace SERVO {
class CJobDataB
{
public:
CJobDataB();
- ~CJobDataB();
+ CJobDataB::CJobDataB(CJobDataB&& other) noexcept;
+ virtual ~CJobDataB();
public:
- short getPortNo();
- std::string& getCarrierId();
- std::string& getPruductId();
- short getCarrierState();
- std::string& getCarrierStateDescription(std::string& strDescription);
- int getSlotMapping();
- int getSlotSelectedFlag();
- std::vector<std::string>& getGlassIds();
+ void* getOwner();
+ void setOwner(void* pOwner);
+ void copy(CJobDataB* pScr);
+ int getCassetteSequenceNo();
+ void setCassetteSequenceNo(int no);
+ int getJobSequenceNo();
+ void setJobSequenceNo(int no);
+ std::string& getGlassId();
+ void setGlassId(const char* pszGlassId);
int serialize(char* pszBuffer, int nBufferSize);
- int unserialize(char* pszBuffer, int nBufferSize);
+ int unserialize(const char* pszBuffer, int nBufferSize);
private:
- short m_nPortNo;
- std::string m_strCarrierId;
- std::string m_pruductId;
- short m_nCarrierState;
- int m_nSlotMapping;
- int m_nSlotSelectedFlag;
- std::vector<std::string> m_glassIds;
+ void* m_pOwner;
+ int m_nCassetteSequenceNo;
+ int m_nJobSequenceNo;
+ std::string m_strGlassId;
};
}
--
Gitblit v1.9.3