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/CPath.h | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPath.h b/SourceCode/Bond/Servo/CPath.h
index b9dcf5f..61f8955 100644
--- a/SourceCode/Bond/Servo/CPath.h
+++ b/SourceCode/Bond/Servo/CPath.h
@@ -1,4 +1,5 @@
#pragma once
+#include "ServoCommo.h"
namespace SERVO {
@@ -6,26 +7,38 @@
{
public:
CPath();
- CPath(unsigned int nSiteId);
- ~CPath();
+ CPath(unsigned int nEqId, unsigned int nUnit, unsigned int nSlot);
+ virtual ~CPath();
public:
void getDescription(std::string& strOut);
+ void getSimpleDescription(std::string& strOut);
void serialize(CArchive& ar);
CPath* getPrev();
CPath* getNext();
void addPath(CPath* pPath);
CPath* getTailPath();
CPath* getHeadPath();
- unsigned int getSiteID();
+ unsigned int getEqID();
+ unsigned int getUnit();
+ unsigned int getSlot();
+ void setInTime(ULONGLONG time);
ULONGLONG getInTime();
void setOutTime(ULONGLONG time);
ULONGLONG getOutTime();
+ void processEnd();
+ BOOL isProcessEnd();
+ void setInspResult(InspResult result);
+ InspResult getInspResult();
private:
- unsigned int m_nSiteID;
+ unsigned int m_nEqID;
+ unsigned int m_nUnit;
+ unsigned int m_nSlot;
ULONGLONG m_timeIn;
ULONGLONG m_timeOut;
+ BOOL m_bProcessed;
+ InspResult m_inspResult;
CPath* m_pPrev;
CPath* m_pNext;
};
--
Gitblit v1.9.3