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/CControlJobManagerDlg.h | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.h b/SourceCode/Bond/Servo/CControlJobManagerDlg.h
index 380bdf2..031ed7c 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.h
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.h
@@ -5,6 +5,8 @@
#include "ApredTreeCtrl2.h"
+#define WM_AFTER_TVCHECK (WM_USER + 1000)
+
// CControlJobManagerDlg 瀵硅瘽妗�
class CControlJobManagerDlg : public CDialogEx
@@ -14,6 +16,7 @@
public:
CControlJobManagerDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CControlJobManagerDlg();
+ static void FreeState();
private:
void Resize();
@@ -21,15 +24,26 @@
void UpdateControlJob();
bool AddPorcessJob(SERVO::CProcessJob* pj);
bool RemovePorcessJob(SERVO::CProcessJob* pj);
- void UpProcessJobId(SERVO::CProcessJob* pJob);
+ void UpProcessJobId(PJWarp* pjWarp);
+ void UpControlJobId(SERVO::CControlJob* pControlJob);
void InitData();
+ void LoadState();
+ void SaveState();
+ int ShowPage(int index);
private:
std::vector<CCjPageBase*> m_pages;
SERVO::CControlJob* m_pControlJob;
- std::vector<SERVO::CProcessJob*> m_processJobs;
+ std::vector<PJWarp> m_pjWarps;
CApredTreeCtrl2 m_tree;
+public:
+ struct State {
+ SERVO::CControlJob* pControlJob = nullptr;
+ std::vector<PJWarp> pjWarps;
+ };
+ static bool m_bHasState;
+ static State m_state;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -44,7 +58,12 @@
virtual BOOL OnInitDialog();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
- afx_msg void OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnTvnItemChangedTree(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnDestroy();
afx_msg void OnBnClickedButtonApply();
+ afx_msg void OnTvnSelchangingTree1(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnBnClickedButtonBathCompletion();
+ afx_msg void OnTreeClick(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnTreeKeyDown(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg LRESULT OnAfterTvCheck(WPARAM wParam, LPARAM lParam);
};
--
Gitblit v1.9.3