Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2025-09-05 fc8d367963a16de61dfbc4a0ff34c78c91ec2cfe

 SourceCode/Bond/Servo/PortConfigurationDlg.cpp

@@ -11,8 +11,6 @@
#include "RecipeManager.h"
#include "ServoCommo.h"



#define CHECKBOX_ALL_ID        0x1234

// CPortConfigurationDlg 对话框
@@ -102,11 +100,26 @@
        // 回填 Job 信息（只取第一个有效 Glass）
        if (!bJobInfoSet && pGlass) {
            SERVO::CJobDataS* pJS = pGlass->getJobDataS();
            if (pJS) {
            if (pJS) {        
                int nRecipeID = pJobDataS->getMasterRecipe();
                std::string strRecipeName = RecipeManager::getInstance().getPPIDById(nRecipeID);
                SetDlgItemText(IDC_EDIT_LOTID, CString(pJS->getLotId().c_str()));
                SetDlgItemText(IDC_EDIT_PRODUCTID, CString(pJS->getProductId().c_str()));
                SetDlgItemText(IDC_EDIT_OPERATIONID, CString(pJS->getOperationId().c_str()));
                m_comboMaterialsType.SetCurSel(pJS->getMaterialsType() - 1);

                if (!strRecipeName.empty()) {
                    CString csRecipeName(strRecipeName.c_str());
                    int nIndex = m_comboRecipe.FindStringExact(-1, csRecipeName);
                    if (nIndex != CB_ERR) {
                        m_comboRecipe.SetCurSel(nIndex);
                    }
                    else {
                  AfxMessageBox(_T("当前配方在系统中不存在，请重新选择！"), MB_ICONWARNING);
                        m_comboRecipe.SetCurSel(0);
                    }
            }

                bJobInfoSet = true;
            }
        }
@@ -252,7 +265,6 @@
        SetWindowText(_T("Port Configuration"));
    }


    // Porcess Start / Process Cancel 按钮状态
    GetDlgItem(IDC_BUTTON_PROCESS_START)->EnableWindow(FALSE);
    GetDlgItem(IDC_BUTTON_PROCESS_CANCEL)->EnableWindow(FALSE);
@@ -299,6 +311,9 @@
        m_comboRecipe.GetLBText(selRecipe, str);
        config.strRecipe = CT2A(str.GetString());
    }
    int nRecipeID = RecipeManager::getInstance().getIdByPPID(config.strRecipe);
    RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(config.strRecipe);
    std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;

    // 获取 Material Type 索引（索引从 0 开始，对应枚举从 1 开始）
    //int selMaterial = m_comboMaterialsType.GetCurSel();
@@ -349,9 +364,7 @@
            pJobDataS->setProductId(config.strProductID.c_str());
            pJobDataS->setOperationId(config.strOperationID.c_str());
            pJobDataS->setMaterialsType(nMaterialType);

            RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(config.strRecipe);
            std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;
            pJobDataS->setMasterRecipe(nRecipeID);

            for (const auto& info : vecRecipeInfo) {
                const std::string& name = info.strDeviceName;