From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险: S1F3:项目用 getSubItemU4(0) 取 SVID;日志里有 U2 的情况,可能导致解析失败后回退成 SV=0。 S6F11:项目发送 DATAID(U4) + CEID(U4);日志样例里第一个字段是 U2,可能存在类型/字段定义不一致。
---
SourceCode/Bond/Servo/ToolUnits.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.cpp b/SourceCode/Bond/Servo/ToolUnits.cpp
index 6d5df0d..974121c 100644
--- a/SourceCode/Bond/Servo/ToolUnits.cpp
+++ b/SourceCode/Bond/Servo/ToolUnits.cpp
@@ -574,4 +574,44 @@
std::ostringstream oss;
oss << std::put_time(&tm, "%Y%m%d%H%M%S"); // 例:2025-09-15 08:23:07
return oss.str();
+}
+
+std::wstring CToolUnits::AnsiToWString(const std::string& str)
+{
+ if (str.empty()) return std::wstring();
+
+ int len = ::MultiByteToWideChar(CP_ACP, 0,
+ str.c_str(), -1,
+ nullptr, 0);
+ if (len <= 0) return std::wstring();
+
+ std::wstring ws;
+ ws.resize(len - 1);
+
+ ::MultiByteToWideChar(CP_ACP, 0,
+ str.c_str(), -1,
+ &ws[0], len);
+
+ return ws;
+}
+
+std::string CToolUnits::WStringToAnsi(const std::wstring& wstr)
+{
+ if (wstr.empty()) return std::string();
+
+ int len = ::WideCharToMultiByte(CP_ACP, 0,
+ wstr.c_str(), -1,
+ nullptr, 0,
+ nullptr, nullptr);
+ if (len <= 0) return std::string();
+
+ std::string str;
+ str.resize(len - 1);
+
+ ::WideCharToMultiByte(CP_ACP, 0,
+ wstr.c_str(), -1,
+ &str[0], len,
+ nullptr, nullptr);
+
+ return str;
}
\ No newline at end of file
--
Gitblit v1.9.3