From 01398f3bc19abcdf4ea98f2bc9020305be3db003 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 15:21:19 +0800
Subject: [PATCH] 1.S1F3修改为支持批查询;

---
 SourceCode/Bond/Servo/HsmsPassive.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 24815d7..576a08d 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -153,6 +153,7 @@
 	std::vector<SERVO::CVariable*>& getVariables();
 	unsigned int getMaxVariableId() const;
 	std::vector<SERVO::CDataVariable*>& getDataVariables();
+	unsigned int getMaxDataVariableId() const;
 
 	// 鍙栧緱鎸囧畾Variable
 	SERVO::CVariable* getVariable(int variableId);
@@ -164,6 +165,9 @@
 	int deleteVariable(int variableId);
 	int addVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId);
 	int updateVariable(int variableId, const char* pszName, const char* pszFormat, const char* pszRemark);
+	int deleteDataVariable(int dvid);
+	int addDataVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId);
+	int updateDataVariable(int dvid, const char* pszName, const char* pszFormat, const char* pszRemark);
 
 	// 璁剧疆鍙橀噺鍊�
 	void setVariableValue(const char* pszName, __int64 value);
@@ -193,7 +197,7 @@
 	int updateCollectionEvent(unsigned int CEID, const char* name, const char* desc, const std::vector<unsigned int>& rptids);
 
 	// 鍙栧緱CCollectionEvent
-	SERVO::CCollectionEvent* getEvent(unsigned short CEID);
+	SERVO::CCollectionEvent* getEvent(unsigned int CEID);
 
 	// 鍙栧緱Report
 	SERVO::CReport* getReport(int rptid);
@@ -231,6 +235,7 @@
 	int requestEventReportSend_Panel_Start();
 	int requestEventReportSend_Panel_End();
 	int requestEventReportSend_OCR_PanelID_Read_OK();
+	int requestEventReportSend_OCR_PanelID_Read(short vcrResult);
 	int requestEventReportSend_LoadPortNotAssoc();
 	int requestEventReportSend_ProcessDataReport();
 	int requestEventReportSend_SubEqpStart();

--
Gitblit v1.9.3