From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。
---
SourceCode/Bond/Servo/ServoDlg.h | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ee43ac3..df4b01d 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -1,29 +1,34 @@
-
-// ServoDlg.h : 头文件
+锘�
+// ServoDlg.h : 澶存枃浠�
//
#pragma once
#include "BlButton.h"
#include "PageLog.h"
#include "PageAlarm.h"
+#include "PageTransferLog.h"
#include "PageRecipe.h"
#include "TerminalDisplayDlg.h"
#include "CPanelMaster.h"
#include "CPanelEquipment.h"
#include "CPanelAttributes.h"
+#include "CPanelProduction.h"
#include "CPageGraph1.h"
#include "CPageGraph2.h"
#include "TopToolbar.h"
#include "CMyStatusbar.h"
#include "CRobotTaskDlg.h"
+#include "CPageGlassList.h"
+#include "CPageVarialbles.h"
+#include "CPageDataVarialbles.h"
-// CServoDlg 对话框
+// CServoDlg 瀵硅瘽妗�
class CServoDlg : public CDialogEx
{
-// 构造
+// 鏋勯��
public:
- CServoDlg(CWnd* pParent = NULL); // 标准构造函数
+ CServoDlg(CWnd* pParent = NULL); // 鏍囧噯鏋勯�犲嚱鏁�
public:
@@ -32,7 +37,9 @@
private:
void InitRxWindows();
void Resize();
+ void SetLeftPanelType(int type, bool resize = true);
void ShowChildPage(int index);
+ void UpdateLoginStatus();
CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix);
private:
@@ -41,31 +48,35 @@
CRobotTaskDlg* m_pRobotTaskDlg;
CPageGraph1* m_pPageGraph1;
CPageGraph2* m_pPageGraph2;
+ CPageGlassList* m_pPageGlassList;
CPageRecipe* m_pPageRecipe;
CPageAlarm* m_pPageAlarm;
CPageLog* m_pPageLog;
+ CPageTransferLog* m_pPageTransferLog;
-// 对话框数据
+// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_SERVO_DIALOG };
#endif
protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
-// 实现
+// 瀹炵幇
protected:
HICON m_hIcon;
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
+ int m_nLeftPanelType; // 1: CPanelMaster, 2: CPanelProduction
CTopToolbar* m_pTopToolbar;
CPanelMaster* m_pPanelMaster;
+ CPanelProduction* m_pPanelProduction;
CPanelEquipment* m_pPanelEquipment;
CPanelAttributes* m_pPanelAttributes;
CMyStatusbar* m_pMyStatusbar;
- // 生成的消息映射函数
+ // 鐢熸垚鐨勬秷鎭槧灏勫嚱鏁�
virtual BOOL OnInitDialog();
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnPaint();
@@ -87,10 +98,18 @@
afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
afx_msg void OnMenuFileExit();
afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
+ afx_msg void OnMenuProjectVarialbleList();
+ afx_msg void OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI);
afx_msg void OnMenuTestMessageSet();
afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
afx_msg void OnMenuTestMessageClear();
afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
+ afx_msg void OnMenuToolsClientList();
+ afx_msg void OnUpdateMenuToolsClientList(CCmdUI* pCmdUI);
+ afx_msg void OnMenuWndTestPanel();
+ afx_msg void OnUpdateMenuWndTestPanel(CCmdUI* pCmdUI);
+ afx_msg void OnMenuWndProPanel();
+ afx_msg void OnUpdateMenuWndProPanel(CCmdUI* pCmdUI);
afx_msg void OnMenuHelpAbout();
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
--
Gitblit v1.9.3