From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 14:32:27 +0800
Subject: [PATCH] 1.修复 : 多 PJ 支持仍是单槽实现:isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ;Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要:协议上明示只支持 1,或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。
---
SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
index ab3c04b..181b34e 100644
--- a/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
@@ -1,11 +1,12 @@
锘�#pragma once
#include "afxdialogex.h"
#include "GridCtrl.h"
+#include "CBaseDlg.h"
// CAxisDetailSettingsDlg 瀵硅瘽妗�
-class CAxisDetailSettingsDlg : public CDialogEx
+class CAxisDetailSettingsDlg : public CBaseDlg
{
DECLARE_DYNAMIC(CAxisDetailSettingsDlg)
@@ -22,13 +23,14 @@
#endif
private:
+ void InitAnchorPontManager();
+ void FillAnchorPontManager();
void UpdateAxisDetailSettings();
-
+ bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr);
+ void writeAxisDataToPLC(int nAxisId);
private:
CPLC* m_pPLC;
- int m_nInitialWidth;
- int m_nInitialHeight;
// 鏁版嵁
int m_nAxisNO;
@@ -36,11 +38,13 @@
// 鎺т欢
CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
- CGridCtrl m_gridAxisDetailSettings;
+ CGridCtrl m_grid;
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
virtual BOOL OnInitDialog();
+ afx_msg void OnGridItemChanged(NMHDR* pNotifyStruct, LRESULT* pResult);
afx_msg void OnBnClickedButtonAxisDetailSettingsSave();
+ afx_msg void OnBnClickedButtonSetAxisPositioningPoints();
DECLARE_MESSAGE_MAP()
};
--
Gitblit v1.9.3