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/CEquipmentPage1.h | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.h b/SourceCode/Bond/Servo/CEquipmentPage1.h
index 994b0a0..5db7005 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.h
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.h
@@ -1,9 +1,17 @@
锘�#pragma once
#include "CHMPropertyPage.h"
#include "CEquipment.h"
+#include "JobSlotGrid.h"
// CEquipmentPage1 瀵硅瘽妗�
+
+struct SignalInfo
+{
+ CString strName; // 淇″彿鍚嶇О
+ bool bCurrentState; // 褰撳墠鐘舵�侊紙ON/OFF锛�
+ bool bClickable; // 鏄惁鍏佽鐐瑰嚮
+};
class CEquipmentPage1 : public CHMPropertyPage
{
@@ -16,7 +24,18 @@
void setEquipment(SERVO::CEquipment* pEquipment);
private:
+ int m_nCurrentDeviceID;
SERVO::CEquipment* m_pEquipment;
+ std::vector<SignalInfo> m_vSignalList;
+ CJobSlotGrid m_ctrlSignalPanel;
+ std::map<int, std::vector<SignalInfo>> m_mapSignalListByID;
+
+ void LoadSignalListFromCSV(const CString& strFilePath);
+ void InitSignalListForDevice(int nDeviceID);
+ void UpdateSignalState(int nRow, int nCol, bool bNewState);
+ void InitSignalSlotTextAndClickable();
+ void UpdateAllSignalStatesFromDevice();
+ void ResetSignalPanel();
// 瀵硅瘽妗嗘暟鎹�
@@ -30,4 +49,8 @@
DECLARE_MESSAGE_MAP()
public:
virtual BOOL OnInitDialog();
+ afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+ afx_msg void OnDestroy();
+ afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
};
--
Gitblit v1.9.3