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/CRobotCmdTestDlg.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CRobotCmdTestDlg.h b/SourceCode/Bond/Servo/CRobotCmdTestDlg.h index c605e58..0169495 100644 --- a/SourceCode/Bond/Servo/CRobotCmdTestDlg.h +++ b/SourceCode/Bond/Servo/CRobotCmdTestDlg.h @@ -35,8 +35,10 @@ protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔 virtual BOOL OnInitDialog(); - afx_msg void OnCbnSelchangeComboCmdType(); afx_msg void OnBnClickedButtonExecute(); + afx_msg void OnSelchangeComboCmdType(); + afx_msg void OnSelchangeComboGetPos(); + afx_msg void OnSelchangeComboPutPos(); DECLARE_MESSAGE_MAP() private: @@ -46,6 +48,9 @@ void TrimRichEditLineLimit(int maxLines = 100); void AppendLogLineRichStyled(const CString& content, COLORREF color = RGB(0, 0, 0)); void HighlightAllMatches(const CString& strSearch, COLORREF clrHighlight = RGB(255, 165, 0)); + void UpdateSlotList(CComboBox* pComboDevice, CComboBox* pComboSlot); + void UpdateArmList(CComboBox* pComboDevice, CComboBox* pComboArm); + bool IsDualArmSupported(const CString& strDeviceName); // 鎺т欢 CComboBox m_comboCmdType; -- Gitblit v1.9.3