From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图,目前灰色表示掉线,绿色表示在线。增加Slot的小点表示有没有料,及加工状态 。 2.增加图示

---
 SourceCode/Bond/Servo/CCjPage3.cpp |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage3.cpp b/SourceCode/Bond/Servo/CCjPage3.cpp
index 44428e9..aac7455 100644
--- a/SourceCode/Bond/Servo/CCjPage3.cpp
+++ b/SourceCode/Bond/Servo/CCjPage3.cpp
@@ -29,6 +29,7 @@
 
 BEGIN_MESSAGE_MAP(CCjPage3, CCjPageBase)
 	ON_WM_DESTROY()
+    ON_EN_CHANGE(IDC_EDIT_CJ_ID, &CCjPage3::OnEnChangeEditCjId)
 END_MESSAGE_MAP()
 
 
@@ -67,7 +68,42 @@
         */
 }
 
-void CCjPage3::OnApply()
+int CCjPage3::OnApply()
 {
+    // SERVO::CControlJob*
+    if (m_pContext == nullptr) return -1;
+    SERVO::CControlJob* pControlJob = (SERVO::CControlJob*)m_pContext;
 
+    // 鏇存柊鍚嶇О
+    BOOL bOkName = TRUE;
+    char szBuffer[256];
+    GetDlgItemText(IDC_EDIT_CJ_ID, szBuffer, 256);
+    pControlJob->setId(std::string(szBuffer));
+
+
+    ContentChanged(1);
+    return 0;
+}
+
+void CCjPage3::OnSetContext(void* pContext)
+{
+    UpdateCjData();
+}
+
+void CCjPage3::UpdateCjData()
+{
+    if (m_pContext == nullptr) return;
+
+    m_bContentChangedLock = TRUE;
+
+    SERVO::CControlJob* pControlJob = (SERVO::CControlJob*)m_pContext;
+    SetDlgItemText(IDC_EDIT_CJ_ID, pControlJob->id().c_str());
+
+
+    m_bContentChangedLock = FALSE;
+}
+
+void CCjPage3::OnEnChangeEditCjId()
+{
+    ContentChanged(0);
 }
\ No newline at end of file

--
Gitblit v1.9.3