From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。
---
SourceCode/Bond/Servo/RecipeDeviceBindDlg.h | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h b/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h
index c6634bf..d23b01d 100644
--- a/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h
+++ b/SourceCode/Bond/Servo/RecipeDeviceBindDlg.h
@@ -1,6 +1,6 @@
锘�#pragma once
#include "afxdialogex.h"
-
+#include "RecipeManager.h"
// CRecipeDeviceBindDlg 瀵硅瘽妗�
@@ -12,6 +12,9 @@
CRecipeDeviceBindDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CRecipeDeviceBindDlg();
+ const RecipeInfo& GetRecipeInfo() const;
+ void SetRecipeInfo(const RecipeInfo& info);
+
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_DIALOG_RECIPE_DEVICE_BIND };
@@ -19,6 +22,27 @@
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
-
+ virtual BOOL OnInitDialog();
+ afx_msg void OnClose();
+ afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnBnClickedOk();
DECLARE_MESSAGE_MAP()
+
+private:
+ void ReleaseDeviceControls();
+ void CreateDeviceControls(int nXStart, int nYStart, int nTotalControlWidth, int nRowHeight);
+ bool FillDeviceInfo(int idx, int nDeviceID, const CString& strDeviceName, int nSelectedRecipeID = -1);
+ bool FillComboRecipeList(CComboBox* pCombo, int nDeviceID, int nSelectedRecipeID = -1);
+
+ struct DeviceWidget {
+ CEdit* editDeviceID;
+ CEdit* editDeviceName;
+ CComboBox* comboRecipeID;
+ };
+
+ CFont m_font;
+ CString m_strPPID;
+ CString m_strDesc;
+ RecipeInfo m_recipe;
+ std::vector<DeviceWidget> m_vecDevices;
};
--
Gitblit v1.9.3