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/CDoubleGlass.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CDoubleGlass.cpp b/SourceCode/Bond/Servo/CDoubleGlass.cpp
index 1701145..782685a 100644
--- a/SourceCode/Bond/Servo/CDoubleGlass.cpp
+++ b/SourceCode/Bond/Servo/CDoubleGlass.cpp
@@ -1,5 +1,7 @@
#include "stdafx.h"
+#include "Servo.h"
#include "CDoubleGlass.h"
+#include "CGlassPool.h"
namespace SERVO {
@@ -72,11 +74,11 @@
ULONGLONG ulGlass1;
ar >> ulGlass1;
if (ulGlass1 != 0) {
- m_pGlass1 = new CGlass();
+ m_pGlass1 = theApp.m_model.m_glassPool.allocaGlass();
m_pGlass1->serialize(ar);
}
if (ulGlass1 != 0) {
- m_pGlass2 = new CGlass();
+ m_pGlass2 = theApp.m_model.m_glassPool.allocaGlass();
m_pGlass2->serialize(ar);
}
--
Gitblit v1.9.3