From 8d492d8d449d6aaff1825a99055298682ebf71b7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 02 九月 2025 09:55:49 +0800
Subject: [PATCH] 1. 配方数据库管理表里面添加ID（下发JobDataS） 2. 如果任务没有创建，那么配方是当前选择的（不是默认第一个）
---
SourceCode/Bond/Servo/RecipeDeviceBindDlg.cpp | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/RecipeDeviceBindDlg.cpp b/SourceCode/Bond/Servo/RecipeDeviceBindDlg.cpp
index 549fb19..22d0386 100644
--- a/SourceCode/Bond/Servo/RecipeDeviceBindDlg.cpp
+++ b/SourceCode/Bond/Servo/RecipeDeviceBindDlg.cpp
@@ -95,9 +95,15 @@
pCombo->ResetContent();
for (const auto& pair : mapRecipeIds) {
int nRecipeID = pair.second;
- CString strRecipeName;
- strRecipeName.Format(_T("%d"), nRecipeID);
- int idx = pCombo->AddString(strRecipeName);
+
+ std::string strRecipeName = RecipeManager::getInstance().getDeviceRecipeName(pEq->getName(), nRecipeID);
+ if (strRecipeName.empty()) {
+ strRecipeName = std::to_string(nRecipeID);
+ }
+
+ CString str;
+ str.Format(_T("%s"), strRecipeName.c_str());
+ int idx = pCombo->AddString(str);
pCombo->SetItemData(idx, nRecipeID);
if (nSelectedRecipeID == nRecipeID) {
pCombo->SetCurSel(idx);
--
Gitblit v1.9.3