From fda7833a7652e3b8290947bf6451bdbb1ca0587f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 17 十一月 2025 14:06:45 +0800
Subject: [PATCH] Merge branch 'clh' of http://soft.boounion.cn/r/~chenluhua/Bond2 into clh

---
 SourceCode/Bond/Servo/CControlJobManagerDlg.cpp |   42 ++++++++++++++++++++----------------------
 1 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index 2d8ee00..78036f4 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -616,33 +616,31 @@
 				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;
+			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);
-					}
+				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);
 				}
 			}
 		}
 	}
-
 
 	// process start
 	for (int p = 0; p < 4; p++) {

--
Gitblit v1.9.3