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/CPanelEquipment.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPanelEquipment.h b/SourceCode/Bond/Servo/CPanelEquipment.h
index 460e858..9aa3580 100644
--- a/SourceCode/Bond/Servo/CPanelEquipment.h
+++ b/SourceCode/Bond/Servo/CPanelEquipment.h
@@ -14,11 +14,13 @@
 	virtual ~CPanelEquipment();
 	int getPanelWidth();
 	void SetEquipment(SERVO::CEquipment* pEquipment);
+	void loadDataFromEquipment(SERVO::CEquipment* pEquipment);
 
 private:
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
 	int m_nPanelWidth;
+	CMFCPropertyGridCtrl m_gridCtrl;
 	CBlButton m_btnClose;
 	SERVO::CEquipment* m_pEquipment;
 

--
Gitblit v1.9.3