From cb9456e93002220b7247fadac088c7bddf6908d3 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 01 二月 2026 21:03:23 +0800
Subject: [PATCH] 1.LoadPort1装G1,LoadPort2装G2, LoadPort3装G1, LoadPort4装G4, 加工完成回到G1的原位。按此增加生产模式的调度和连接图；
---
SourceCode/Bond/Servo/ToolUnits.h | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h
index d369213..0d171c7 100644
--- a/SourceCode/Bond/Servo/ToolUnits.h
+++ b/SourceCode/Bond/Servo/ToolUnits.h
@@ -3,9 +3,11 @@
#include <chrono>
#include <optional>
#include <utility>
+#include <vector>
+#include <cstdarg>
enum class QuickRange { Today, Last7Days, ThisMonth, ThisYear };
-
+using TP = std::chrono::system_clock::time_point;
class CToolUnits
{
public:
@@ -49,10 +51,18 @@
static bool IsLeap(int y);
static int DaysInMonth(int y, int m);
static void GetTodayYMD_Local(int& y, int& m, int& d);
- static void CToolUnits::LocalCalendarMinusDays(int& y, int& m, int& d, int nDays);
+ static void LocalCalendarMinusDays(int& y, int& m, int& d, int nDays);
static std::pair<std::chrono::system_clock::time_point,
std::chrono::system_clock::time_point>
- CToolUnits::CalcQuickRangeUtc(QuickRange r);
-
+ CalcQuickRangeUtc(QuickRange r);
+ static bool containsCI(const std::string& hay, const std::string& needle);
+ static std::string TimePointToLocalString(const std::optional<TP>& tp,
+ const char* fmt = "%Y-%m-%d %H:%M:%S");
+ static std::string TimePointToUtcString(const std::optional<TP>& tp,
+ const char* fmt = "%Y-%m-%d %H:%M:%S");
+ static std::string TimePointToLocalStringMs(const std::optional<TP>& tp);
+ static std::string NowStrSec();
+ static std::wstring AnsiToWString(const std::string& str);
+ static std::string WStringToAnsi(const std::wstring& wstr);
+ static std::string formatString(const char* fmt, ...);
};
-
--
Gitblit v1.9.3