From c119b8ef36718a8ca24b719cdbff86913cbca129 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 09 九月 2025 17:59:23 +0800
Subject: [PATCH] 1.Glass数据库保存,查询,分页,关键字,时间段等功能;

---
 SourceCode/Bond/Servo/CServoUtilsTool.cpp |   83 ++++++++++++++++++++++++++++++++---------
 1 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/SourceCode/Bond/Servo/CServoUtilsTool.cpp b/SourceCode/Bond/Servo/CServoUtilsTool.cpp
index 841e980..bfa0a43 100644
--- a/SourceCode/Bond/Servo/CServoUtilsTool.cpp
+++ b/SourceCode/Bond/Servo/CServoUtilsTool.cpp
@@ -16,31 +16,13 @@
 
 	std::string CServoUtilsTool::getEqUnitName(int eqid, int unit)
 	{
-		/*
-#define EQ_ID_LOADPORT1			1
-#define EQ_ID_LOADPORT2			2
-#define EQ_ID_LOADPORT3			3
-#define EQ_ID_LOADPORT4			4
-#define EQ_ID_ARM_TRAY1			5
-#define EQ_ID_ARM_TRAY2			6
-#define EQ_ID_ALIGNER			7
-#define EQ_ID_FLIPER			8
-#define EQ_ID_VACUUMBAKE		9
-#define EQ_ID_Bonder1			10
-#define EQ_ID_Bonder2			11
-#define EQ_ID_BAKE_COOLING		12
-#define EQ_ID_MEASUREMENT		13
-#define EQ_ID_EFEM				100
-#define EQ_ID_ARM				101
-#define EQ_ID_OPERATOR_REMOVE	102
-*/
 		char szBuffer[256];
 		if (eqid == EQ_ID_LOADPORT1
 			|| eqid == EQ_ID_LOADPORT2
 			|| eqid == EQ_ID_LOADPORT3
 			|| eqid == EQ_ID_LOADPORT4
 			) {
-			sprintf_s(szBuffer, 256, "Port%d(Slot%d)", unit, eqid - EQ_ID_LOADPORT1 + 1);
+			sprintf_s(szBuffer, 256, "Port%d(Slot%d)", eqid - EQ_ID_LOADPORT1 + 1, unit + 1);
 			return std::string(szBuffer);
 		}
 
@@ -84,4 +66,67 @@
 
 		return "";
 	}
+
+	std::string CServoUtilsTool::getMaterialsTypeText(MaterialsType type)
+	{
+		if (type == MaterialsType::G1) {
+			return "G1";
+		}
+
+		if (type == MaterialsType::G2) {
+			return "G2";
+		}
+
+		return "";
+	}
+
+	std::string CServoUtilsTool::getGlassStateText(SERVO::GlsState state)
+	{
+		switch (state)
+		{
+		case SERVO::GlsState::NoState:
+			return "NoState";
+			break;
+		case SERVO::GlsState::Queued:
+			return "Queued";
+			break;
+		case SERVO::GlsState::InProcess:
+			return "InProcess";
+			break;
+		case SERVO::GlsState::Paused:
+			return "Paused";
+			break;
+		case SERVO::GlsState::Completed:
+			return "Completed";
+			break;
+		case SERVO::GlsState::Aborted:
+			return "Aborted";
+			break;
+		case SERVO::GlsState::Failed:
+			return "Failed";
+			break;
+		default:
+			return "";
+			break;
+		}
+	}
+
+	std::string CServoUtilsTool::getInspResultText(SERVO::InspResult result)
+	{
+		switch (result)
+		{
+		case SERVO::InspResult::NotInspected:
+			return "";
+			break;
+		case SERVO::InspResult::Pass:
+			return "Pass";
+			break;
+		case SERVO::InspResult::Fail:
+			return "Fail";
+			break;
+		default:
+			return "";
+			break;
+		}
+	}
 }

--
Gitblit v1.9.3