From cbe189228810812547d16a3211ab0b174831f609 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 11:56:04 +0800
Subject: [PATCH] 1.修复一个闪退问题(Glass列表为空仍要下传导致); 2.在CEquipment派生类中实现限制上游移动(如下在加工且加工数量有限制);

---
 SourceCode/Bond/BondEq/CComponentPLCDlg.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp b/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
index d380353..5ce1ae9 100644
--- a/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
+++ b/SourceCode/Bond/BondEq/CComponentPLCDlg.cpp
@@ -152,9 +152,14 @@
 
 void CComponentPLCDlg::OnBnClickedButtonAxisSetting()
 {
+	std::string strName = RecipeManager::getInstance().getCurrentRecipeName();
+	if (strName.empty()) {
+		AfxMessageBox("鏈�夋嫨閰嶆柟锛�", MB_ICONERROR);
+	}
+
 	CAxisSettingsDlg axisDlg;
 	axisDlg.SetPLC((CPLC*)m_pContext);
-	axisDlg.SetRecipeName(_T("Default"));
+	axisDlg.SetRecipeName(strName.c_str());
 	axisDlg.DoModal();
 }
 

--
Gitblit v1.9.3