From 334b16b4abb4cbe3d1d4e4f211efd6f4468ae09f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 15:12:52 +0800
Subject: [PATCH] 1.ControlJob和ProcessJob的中断操作,强制结批增加字符串描述原因,方便生产跟踪。

---
 SourceCode/Bond/Servo/CControlJobDlg.cpp        |   85 ++++++++++------
 SourceCode/Bond/Servo/CControlJobDlg.h          |    3 
 SourceCode/Bond/Servo/ProcessJob.h              |    2 
 SourceCode/Bond/Servo/ProcessJob.cpp            |    4 
 SourceCode/Bond/Servo/resource.h                |    0 
 SourceCode/Bond/Servo/CControlJob.cpp           |    9 +
 SourceCode/Bond/Servo/Servo.vcxproj.user        |    2 
 SourceCode/Bond/Servo/CControlJob.h             |    3 
 SourceCode/Bond/Servo/CControlJobManagerDlg.cpp |  119 ++++++++++++++++++++++-
 SourceCode/Bond/Servo/CMaster.h                 |    1 
 SourceCode/Bond/Servo/ServoDlg.cpp              |    1 
 SourceCode/Bond/Servo/CCjPage2.cpp              |   41 ++++++--
 SourceCode/Bond/Servo/Servo.rc                  |    0 
 SourceCode/Bond/Servo/CMaster.cpp               |   27 +++++
 14 files changed, 244 insertions(+), 53 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage2.cpp b/SourceCode/Bond/Servo/CCjPage2.cpp
index 5e79f6a..c156c44 100644
--- a/SourceCode/Bond/Servo/CCjPage2.cpp
+++ b/SourceCode/Bond/Servo/CCjPage2.cpp
@@ -77,15 +77,6 @@
     m_grid.SetPortInfo(3, _T("Port 4"), _T(""));
 
 
-    // 娴嬭瘯鏁版嵁
-    char szBuffer[256];
-    for (int port = 0; port < 4; port++) {
-        for (int slot = 0; slot < 8; slot++) {
-            sprintf_s(szBuffer, 256, "Gls%04d%04d", port + 1, slot + 1);
-            m_grid.SetSlotGlass(port, slot, TRUE, szBuffer, CCarrierSlotGrid::MAT_G1);
-        }
-    }
-
     UpdatePjData();
 
 
@@ -237,11 +228,41 @@
     }
 
 
+    // 璇诲彇鍑虹湡瀹炴暟鎹�
+    auto& master = theApp.m_model.getMaster();
+    int EQID[] = {EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4};
+    for (int p = 0; p < 4; p++) {
+        SERVO::CLoadPort* pPort = (SERVO::CLoadPort*)master.getEquipment(EQID[p]);
+        m_grid.SetPortInfo(p, 
+            (std::string("Port ") + std::to_string(p+1)).c_str(),
+            pPort->getCassetteId().c_str()
+        );
+        for (int i = 0; i < SLOT_MAX; ++i) {
+            SERVO::CSlot* pSlot = pPort->getSlot(i);
+            if (!pSlot) {
+                continue;
+            }
+
+            // 璁剧疆 Panel ID 
+            SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pSlot->getContext());
+            SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+            if (pGlass != nullptr && pJobDataS != nullptr) {
+                m_grid.SetSlotGlass(p, i, TRUE, 
+                    pGlass->getID().c_str(), 
+                    m_pjWarps[p].material[i]);
+            }
+            else {
+                m_grid.SetSlotGlass(p, i, FALSE, nullptr, CCarrierSlotGrid::MAT_G1);
+            }
+        }
+    }
+
+
     // 璁剧疆鍕鹃�夋暟鎹�
     if (portIndex != -1) {
         for (int i = 0; i < 8; i++) {
             m_grid.SetSlotChecked(portIndex, i, ((PJWarp*)m_pContext)->checkSlot[i]);
-            m_grid.SetSlotMaterialType(portIndex, i, ((PJWarp*)m_pContext)->material[i]);
+            // m_grid.SetSlotMaterialType(portIndex, i, ((PJWarp*)m_pContext)->material[i]);
         }
     }
 
diff --git a/SourceCode/Bond/Servo/CControlJob.cpp b/SourceCode/Bond/Servo/CControlJob.cpp
index 02939b2..39726f8 100644
--- a/SourceCode/Bond/Servo/CControlJob.cpp
+++ b/SourceCode/Bond/Servo/CControlJob.cpp
@@ -98,6 +98,11 @@
         return m_issues;
     }
 
+    void CControlJob::clearIssues()
+    {
+        m_issues.clear();
+    }
+
     bool CControlJob::validateForCreate(
             const std::function<bool(uint32_t& code, std::string& msg)>& canCreateCjFn,
             const std::function<bool(const std::string&)>& getPjExistsFn,
@@ -209,9 +214,11 @@
         return true;
     }
 
-    bool CControlJob::abort() {
+    bool CControlJob::abort(std::string reason) {
         if (m_state == CJState::Completed || m_state == CJState::Aborted || m_state == CJState::Failed)
             return false;
+        m_failReason = trimCopy(reason);
+        clampString(m_failReason, 128);
         m_state = CJState::Aborted;
         markEnd();
         return true;
diff --git a/SourceCode/Bond/Servo/CControlJob.h b/SourceCode/Bond/Servo/CControlJob.h
index 9c85607..30e4184 100644
--- a/SourceCode/Bond/Servo/CControlJob.h
+++ b/SourceCode/Bond/Servo/CControlJob.h
@@ -71,6 +71,7 @@
             const std::function<bool(const std::string&)>& canJoinFn
         );
         const std::vector<ValidationIssue>& CControlJob::issues();
+        void clearIssues();
 
         // —— S14F9 → S14F10 的“应用结果”模型 —— //
         struct CreateRequest {
@@ -97,7 +98,7 @@
         bool pause();          // Executing -> Paused
         bool resume();         // Paused -> Executing
         bool complete();       // Executing/Paused -> Completed
-        bool abort();          // 非终态 -> Aborted
+        bool abort(std::string reason);          // 非终态 -> Aborted
         bool fail(std::string reason); // 任意 -> Failed
 
         const std::string& failReason() const noexcept { return m_failReason; }
diff --git a/SourceCode/Bond/Servo/CControlJobDlg.cpp b/SourceCode/Bond/Servo/CControlJobDlg.cpp
index 7365c3d..d388c2c 100644
--- a/SourceCode/Bond/Servo/CControlJobDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobDlg.cpp
@@ -30,6 +30,7 @@
 
 BEGIN_MESSAGE_MAP(CControlJobDlg, CDialogEx)
     ON_WM_SIZE()
+    ON_BN_CLICKED(IDC_BUTTON_COMPLETION_BATH, &CControlJobDlg::OnBnClickedButtonCompletionBath)
 END_MESSAGE_MAP()
 
 
@@ -68,9 +69,17 @@
 
     // 鎺т欢鐘舵��
     Resize();
-    ShowGroup1(m_pControlJob == nullptr);
-    ShowGroup2(m_pControlJob != nullptr);
-    LoadData();
+
+    // 濡傛灉m_pControlJob涓虹┖锛屽彇master鐨�
+    auto* cj = m_pControlJob;
+    if (cj == nullptr) {
+        cj = theApp.m_model.getMaster().getControlJob();
+    }
+
+    ShowGroup1(cj == nullptr);
+    ShowGroup2(cj != nullptr);
+    GetDlgItem(IDC_BUTTON_COMPLETION_BATH)->EnableWindow(cj != nullptr);
+    LoadData(cj);
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 				  // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -132,38 +141,52 @@
     GetDlgItem(IDC_LIST1)->ShowWindow(bShow ? SW_SHOW : SW_HIDE);
 }
 
-void CControlJobDlg::LoadData()
+void CControlJobDlg::LoadData(SERVO::CControlJob* pControlJob)
 {
-    m_listCtrl.DeleteAllItems();
+    m_listCtrl.ClearTree();
+    if (pControlJob == nullptr) return;
 
-    if (m_pControlJob != nullptr) {
-        auto* root1 = m_listCtrl.InsertRoot({ m_pControlJob->id().c_str(), _T("ControlJob"), 
-            m_pControlJob->getStateText().c_str(), _T("") });
-        auto pjs = m_pControlJob->getPjs();
-        for (auto pj : pjs) {
-            auto* root2 = m_listCtrl.InsertChild(root1, {pj->id().c_str(),  _T("ProcessJob"),
-                pj->getStateText().c_str(), pj->recipeSpec().c_str(), _T(""), _T(""), _T("") });
-            auto cs = pj->carriers();
-            for (auto c : cs) {
-                for (auto g : c.contexts) {
-                    SERVO::CGlass* pGlass = (SERVO::CGlass*)g;
-                    if (pGlass != nullptr) {
-                        int port, slot;
-                        pGlass->getOrginPort(port, slot);
-                        std::string carrier = c.carrierId + " / Port" + std::to_string(port + 1) + " / Slot" + std::to_string(slot + 1);
-                        m_listCtrl.InsertChild(root2, { pGlass->getID().c_str(), _T("Glass"),
-                            pGlass->getStateText().c_str(), _T(""), carrier.c_str(), _T("") });
-                    }
-                    else {
-                        m_listCtrl.InsertChild(root2, { "Null", _T("Glass"), _T(""), _T(""), c.carrierId.c_str(), _T("") });
-                    }
+    auto* root1 = m_listCtrl.InsertRoot({ pControlJob->id().c_str(), _T("ControlJob"),
+            pControlJob->getStateText().c_str(), _T(""), _T(""), pControlJob->failReason().c_str()});
+    auto pjs = pControlJob->getPjs();
+    for (auto pj : pjs) {
+        auto* root2 = m_listCtrl.InsertChild(root1, {pj->id().c_str(),  _T("ProcessJob"),
+                pj->getStateText().c_str(), pj->recipeSpec().c_str(), _T(""), pj->failReason().c_str()});
+        auto cs = pj->carriers();
+        for (auto c : cs) {
+            for (auto g : c.contexts) {
+                SERVO::CGlass* pGlass = (SERVO::CGlass*)g;
+                if (pGlass != nullptr) {
+                    int port, slot;
+                    pGlass->getOrginPort(port, slot);
+                    std::string carrier = c.carrierId + " / Port" + std::to_string(port + 1) + " / Slot" + std::to_string(slot + 1);
+                    m_listCtrl.InsertChild(root2, { pGlass->getID().c_str(), _T("Glass"),
+                        pGlass->getStateText().c_str(), _T(""), carrier.c_str(), _T("") });
+                }
+                else {
+                    m_listCtrl.InsertChild(root2, { "Null", _T("Glass"), _T(""), _T(""), c.carrierId.c_str(), _T("") });
                 }
             }
-            root2->expanded = true;
         }
-        root1->expanded = true;
-
-
-        m_listCtrl.RebuildVisible();
+        root2->expanded = true;
     }
+    root1->expanded = true;
+    m_listCtrl.RebuildVisible();
+}
+
+void CControlJobDlg::OnBnClickedButtonCompletionBath()
+{
+    if (theApp.m_model.getMaster().completeControlJob("娴嬭瘯鎵嬪姩缁撴壒")) {
+        AfxMessageBox("缁撴壒瀹屾垚");
+    }
+
+    auto* cj = m_pControlJob;
+    if (cj == nullptr) {
+        cj = theApp.m_model.getMaster().getControlJob();
+    }
+
+    ShowGroup1(cj == nullptr);
+    ShowGroup2(cj != nullptr);
+    GetDlgItem(IDC_BUTTON_COMPLETION_BATH)->EnableWindow(cj != nullptr);
+    LoadData(cj);
 }
diff --git a/SourceCode/Bond/Servo/CControlJobDlg.h b/SourceCode/Bond/Servo/CControlJobDlg.h
index 410f3ec..c631a5c 100644
--- a/SourceCode/Bond/Servo/CControlJobDlg.h
+++ b/SourceCode/Bond/Servo/CControlJobDlg.h
@@ -20,7 +20,7 @@
 	void Resize();
 	void ShowGroup1(BOOL bShow);
 	void ShowGroup2(BOOL bShow);
-	void LoadData();
+	void LoadData(SERVO::CControlJob* pControlJob);
 
 private:
 	SERVO::CControlJob* m_pControlJob;
@@ -42,4 +42,5 @@
 public:
 	virtual BOOL OnInitDialog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnBnClickedButtonCompletionBath();
 };
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index 0bf7d67..5b19f07 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -6,6 +6,7 @@
 #include "CControlJobManagerDlg.h"
 #include "afxdialogex.h"
 #include "ToolUnits.h"
+#include "RecipeManager.h"
 
 
 bool CControlJobManagerDlg::m_bHasState = false;
@@ -423,6 +424,14 @@
 
 void CControlJobManagerDlg::OnBnClickedButtonBathCompletion()
 {
+	// 鍏堟鏌ュ綋鍓峬aster
+	auto& master = theApp.m_model.getMaster();
+	if (!master.canCreateControlJob()) {
+		AfxMessageBox("褰撳墠Master鏈夋湭缁撴壒鐨凧ob, 璇峰厛缁撴壒澶勭悊");
+		return;
+	}
+
+
 	// 鍏堝簲鐢�
 	for (int i = 0; i < 3; i++) {
 		if (m_pages[i]->IsWindowVisible()) {
@@ -446,8 +455,8 @@
 
 
 
-	auto& master = theApp.m_model.getMaster();
 
+	int EQID[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
 	std::vector<SERVO::CProcessJob*> pjs;
 	for (auto item : m_pjWarps) {
 		if (!item.addToCj) continue;
@@ -461,14 +470,14 @@
 		}
 		if (!bCheck) continue;
 
-
+		SERVO::CLoadPort* pPort = (SERVO::CLoadPort*)master.getEquipment(EQID[item.port]);
 		SERVO::CProcessJob* pScr = (SERVO::CProcessJob*)item.pj;
 		SERVO::CProcessJob * pj = new SERVO::CProcessJob(pScr->id());
 		pj->setRecipe(SERVO::RecipeMethod::NoTuning, pScr->recipeSpec());
 
 		std::vector<SERVO::CarrierSlotInfo> carriers;
 		SERVO::CarrierSlotInfo csi;
-		csi.carrierId = "Port" + std::to_string(item.port + 1);
+		csi.carrierId = pPort->getCassetteId();
 		for (int i = 0; i < 8; i++) {
 			if (item.checkSlot[i]) {
 				csi.slots.push_back(i);
@@ -487,8 +496,108 @@
 		return;
 	}
 
-
 	m_pControlJob->setPJs(pjs);
+	m_pControlJob->clearIssues();
 	int nRet = master.setProcessJobs(pjs);
-	master.setControlJob(*m_pControlJob);
+	if (nRet <= 0) {
+		std::string msg("鍚屾Process Job澶辫触!");
+		for (auto pj : pjs) {
+			auto& issues = pj->issues();
+			if (!issues.empty()) {
+				msg.append("\n");
+				msg.append(pj->id());
+				msg.append(":\n");
+				for (auto i : issues) {
+					msg.append("[");
+					msg.append(std::to_string(i.code));
+					msg.append("]");
+					msg.append(i.text);
+					msg.append("\n");
+				}
+			}
+		}
+		AfxMessageBox(msg.c_str());
+
+		return;
+	}
+
+
+	nRet = master.setControlJob(*m_pControlJob);
+	if (nRet != 0) {
+		std::string msg("鍚屾ControlJob澶辫触!");
+		auto& issues = m_pControlJob->issues();
+		if (!issues.empty()) {
+			msg.append("\n");
+			for (auto i : issues) {
+				msg.append("[");
+				msg.append(std::to_string(i.code));
+				msg.append("]");
+				msg.append(i.text);
+				msg.append("\n");
+			}
+		}
+		AfxMessageBox(msg.c_str());
+		return;
+	}
+
+
+	// 鍋囪鎴愬姛锛岃鍒ゆ柇锛屽悓姝ュ埌slot鐨刧lass涓紝绫诲瀷绛�
+	if (true) {
+		auto& master = theApp.m_model.getMaster();
+		int EQID[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4 };
+		for (int p = 0; p < 4; p++) {
+			SERVO::CLoadPort* pPort = (SERVO::CLoadPort*)master.getEquipment(EQID[p]);
+			for (int i = 0; i < SLOT_MAX; ++i) {
+				SERVO::CSlot* pSlot = pPort->getSlot(i);
+				if (!pSlot) {
+					continue;
+				}
+
+				// 璁剧疆 Panel ID 鍜屽嬀閫夋
+				SERVO::CProcessJob* pj = (SERVO::CProcessJob*)m_pjWarps[p].pj;
+				int nRecipeID = RecipeManager::getInstance().getIdByPPID(pj->recipeSpec());
+				RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(pj->recipeSpec());
+				std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;
+				SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pSlot->getContext());
+				SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+				if (pGlass != nullptr && pJobDataS != nullptr) {
+					pGlass->setScheduledForProcessing(m_pjWarps[p].checkSlot[i]);
+					pGlass->setType(static_cast<SERVO::MaterialsType>(m_pjWarps[p].material[i]));
+
+					SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+					pJobDataS->setLotId("LotID1");
+					pJobDataS->setProductId("ProductId1");
+					pJobDataS->setOperationId("OPerationId");
+					pJobDataS->setMaterialsType(m_pjWarps[p].material[i]);
+					pJobDataS->setMasterRecipe(nRecipeID);
+
+					for (const auto& info : vecRecipeInfo) {
+						const std::string& name = info.strDeviceName;
+						short nRecipeID = (short)info.nRecipeID;
+
+						if (name == EQ_NAME_EFEM) {
+							pJobDataS->setDeviceRecipeId(0, nRecipeID);
+						}
+						else if (name == EQ_NAME_BONDER1) {
+							pJobDataS->setDeviceRecipeId(1, nRecipeID);
+						}
+						else if (name == EQ_NAME_BONDER2) {
+							pJobDataS->setDeviceRecipeId(2, nRecipeID);
+						}
+						else if (name == EQ_NAME_BAKE_COOLING) {
+							pJobDataS->setDeviceRecipeId(3, nRecipeID);
+						}
+						else if (name == EQ_NAME_VACUUMBAKE) {
+							pJobDataS->setDeviceRecipeId(4, nRecipeID);
+						}
+						else if (name == EQ_NAME_MEASUREMENT) {
+							pJobDataS->setDeviceRecipeId(5, nRecipeID);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	AfxMessageBox("鏂偣妫�鏌ヤ竴涓嬫暟鎹�");
 }
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index c39cc13..5572e53 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -2758,6 +2758,33 @@
 		return nullptr;
 	}
 
+
+	bool CMaster::completeControlJob(std::string description)
+	{
+		if (m_pControlJob == nullptr || m_state != SERVO::MASTERSTATE::READY) {
+			return false;
+		}
+		for (auto item : m_processJobs) {
+			item->abort(description);
+		}
+		m_pControlJob->abort(description);
+
+
+		// 释放Job相关
+		for (auto item : m_processJobs) {
+			delete item;
+		}
+		m_processJobs.clear();
+		if (m_pControlJob != nullptr) {
+			delete m_pControlJob;
+			m_pControlJob = nullptr;
+		}
+
+		saveState();
+
+		return true;
+	}
+
 	bool CMaster::canCreateControlJob()
 	{
 		return m_pControlJob == nullptr;
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 98a661f..6a17fb1 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -190,6 +190,7 @@
         bool checkAndUpdatePjComplete(CProcessJob* pJob);
         bool checkAndUpdateCjComplete(CControlJob* pJob);
         CProcessJob* getGlassProcessJob(CGlass* pGlass);
+        bool completeControlJob(std::string description);
         bool canCreateControlJob();
         bool canCompleteControlJob();
         bool canDeleteControlJob();
diff --git a/SourceCode/Bond/Servo/ProcessJob.cpp b/SourceCode/Bond/Servo/ProcessJob.cpp
index 1ae4b9e..a95d78e 100644
--- a/SourceCode/Bond/Servo/ProcessJob.cpp
+++ b/SourceCode/Bond/Servo/ProcessJob.cpp
@@ -186,9 +186,11 @@
         return true;
     }
 
-    bool CProcessJob::abort() {
+    bool CProcessJob::abort(std::string reason) {
         if (m_state == PJState::Completed || m_state == PJState::Aborted || m_state == PJState::Failed)
             return false;
+        m_failReason = trimCopy(reason);
+        clampString(m_failReason, 128);
         m_state = PJState::Aborted;
         markEnd();
         return true;
diff --git a/SourceCode/Bond/Servo/ProcessJob.h b/SourceCode/Bond/Servo/ProcessJob.h
index 5324875..eb20b84 100644
--- a/SourceCode/Bond/Servo/ProcessJob.h
+++ b/SourceCode/Bond/Servo/ProcessJob.h
@@ -131,7 +131,7 @@
         bool pause();           // InProcess -> Paused
         bool resume();          // Paused -> InProcess
         bool complete();        // InProcess -> Completed
-        bool abort();           // Any (未终态) -> Aborted
+        bool abort(std::string reason);           // Any (未终态) -> Aborted
         bool fail(std::string reason); // 任意态 -> Failed(记录失败原因)
 
         // —— 访问器(用于上报/查询)——
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index c8aacbf..732ca8a 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.user b/SourceCode/Bond/Servo/Servo.vcxproj.user
index 0c03257..82c7903 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.user
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.user
@@ -7,6 +7,6 @@
     <RemoteDebuggerCommand>\\DESKTOP-IODBVIQ\Servo\Debug\Servo.exe</RemoteDebuggerCommand>
     <RemoteDebuggerWorkingDirectory>\\DESKTOP-IODBVIQ\Servo\Debug\</RemoteDebuggerWorkingDirectory>
     <RemoteDebuggerServerName>DESKTOP-IODBVIQ</RemoteDebuggerServerName>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor>WindowsRemoteDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index d3cba73..10cecb9 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -1046,7 +1046,6 @@
 		}
 		else {
 			CControlJobDlg dlg;
-			dlg.SetControlJob(theApp.m_model.m_master.getControlJob());
 			dlg.DoModal();
 		}
 	}
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index cf0f3ff..8cd192a 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ

--
Gitblit v1.9.3