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/Servo.rc | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index 3f3b197..1c07a27 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
@@ -812,8 +812,27 @@
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- LTEXT "Test",IDC_STATIC,95,67,15,8
CONTROL "Custom1",IDC_LINE1,"BYVerticalLine",WS_TABSTOP,286,7,18,240
+ CONTROL "Custom1",IDC_ACCORDION_WND1,"AccordionWnd",WS_TABSTOP,7,7,271,240
+END
+
+IDD_PROD_OVERVIEW DIALOGEX 0, 0, 271, 159
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ CTEXT "0",IDC_PROD_DAY_OUTPUT,16,12,68,45,SS_CENTERIMAGE
+ CTEXT "0",IDC_PROD_NIGHT_OUTPUT,126,12,68,45,SS_CENTERIMAGE
+ CTEXT "-",IDC_PROD_DAY_TAKT,16,82,68,45,SS_CENTERIMAGE
+ CTEXT "-",IDC_PROD_NIGHT_TAKT,126,82,68,45,SS_CENTERIMAGE
+END
+
+IDD_PROD_CTRL_STATE DIALOGEX 0, 0, 216, 97
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ PUSHBUTTON "Offline",IDC_BUTTON_OFFLINE,9,15,58,27
+ PUSHBUTTON "Online Local",IDC_BUTTON_ONLINE_LOCAL,74,15,58,27
+ PUSHBUTTON "Online Remote",IDC_BUTTON_ONLINE_REMOTE,138,15,58,27
END
@@ -1253,6 +1272,22 @@
TOPMARGIN, 7
BOTTOMMARGIN, 247
END
+
+ IDD_PROD_OVERVIEW, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 264
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 152
+ END
+
+ IDD_PROD_CTRL_STATE, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 209
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 90
+ END
END
#endif // APSTUDIO_INVOKED
@@ -1507,6 +1542,16 @@
0
END
+IDD_PROD_OVERVIEW AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
+IDD_PROD_CTRL_STATE AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
/////////////////////////////////////////////////////////////////////////////
//
--
Gitblit v1.9.3