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/CPagePortStatus.cpp | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPagePortStatus.cpp b/SourceCode/Bond/Servo/CPagePortStatus.cpp
index ff38c73..a360f4e 100644
--- a/SourceCode/Bond/Servo/CPagePortStatus.cpp
+++ b/SourceCode/Bond/Servo/CPagePortStatus.cpp
@@ -99,14 +99,15 @@
// 鍒涘缓Job Existence Slots鎺т欢
m_ctrlJobSlotGrid.Create(AfxRegisterWndClass(0), _T("JobSlotGrid"),
- WS_CHILD | WS_VISIBLE, CRect(0, 0, 100, 100), this, 1001);
- m_ctrlJobSlotGrid.SetGridSize(12, 16);
+ WS_CHILD | WS_VISIBLE, CRect(0, 0, 88, 32), this, 1001);
+ m_ctrlJobSlotGrid.SetGridSize(1, 8);
m_ctrlJobSlotGrid.SetColors(RGB(34, 177, 76), RGB(200, 200, 200));
- m_ctrlJobSlotGrid.SetSlotStatus(0, 1, true);
- m_ctrlJobSlotGrid.SetSlotStatus(1, 9, true);
- m_ctrlJobSlotGrid.SetSlotStatus(4, 9, false);
- m_ctrlJobSlotGrid.SetSlotStatus(4, 10, true, TRUE);
+ auto statusMap = m_pPort->getScanCassetteMap();
+ for (int i = 0; i < 8; ++i) {
+ bool isSet = (statusMap >> i) & 1;
+ m_ctrlJobSlotGrid.SetSlotStatus(0, i, isSet);
+ }
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -144,5 +145,5 @@
GetClientRect(rcClient);
m_ctrlJobSlotGrid.MoveWindow(rcComboBox.left, rcLabel.top,
- rcClient.right - 22 - rcComboBox.left, rcClient.bottom - 12 - rcLabel.top);
+ 34 * 8, 32);
}
\ No newline at end of file
--
Gitblit v1.9.3