From 2ee440d9e85eccd73d2c3d4cbfe42cb8c1c25ec0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 14:35:24 +0800
Subject: [PATCH] 1.在stroedJob和Fetchout Job中增加Port的校验; 2.在物料调度中增加检测物料是否已经处理完成的校验;

---
 SourceCode/Bond/Servo/ServoCommo.h |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoCommo.h b/SourceCode/Bond/Servo/ServoCommo.h
index aa02acc..1e63c8e 100644
--- a/SourceCode/Bond/Servo/ServoCommo.h
+++ b/SourceCode/Bond/Servo/ServoCommo.h
@@ -1,5 +1,6 @@
 #pragma once
-
+#include <string>
+#include <vector>
 
 namespace SERVO {
 #define BLOCK_BUFFER_MAX			1024
@@ -8,6 +9,12 @@
 #define PATH_MAX					8
 #define SIGNAL_MAX					8
 #define ARM_ALL						99
+
+	enum class RET {
+		OK = 1,
+		NG,
+	};
+	typedef RET JobDataRequestAck;
 
 	enum class PortType {
 		Loading = 1,
@@ -111,10 +118,12 @@
 		Ready = 0,
 		Running,
 		Picking,
+		Picked,
 		Placing,
 		Restoring,
 		Error,
 		Abort,
+		Restored,
 		Completed
 	};
 
@@ -149,6 +158,29 @@
 		BOOL armState[2];
 	} ROBOT_MONITORING_DATA, RMDATA;
 
+	/* 工艺(加工处理)状态 */
+	enum class PROCESS_STATE {
+		Ready = 0,
+		Processing,
+		Complete,
+		Error
+	};
+
+	/* Port Status */
+	struct SlotConfig {
+		int nSlotID = 0;
+		bool isEnabled = false;
+	};
+
+	struct PortConfig {
+		int nMaterialType;			   // 物料类型,1: G1, 2: G2, 3: G1+G2
+		std::string strPortName;       // 例如 "Port 1"
+		std::string strRecipe;         // 例如 "P1001"
+		std::string strLotID;
+		std::string strProductID;
+		std::string strOperationID;
+		std::vector<SlotConfig> vecSlot;
+	};
 
 	/* EQ Data changed code */
 #define EDCC_FETCHOUT_JOB				1000	/* 取片 */

--
Gitblit v1.9.3