From 7efd1ba6a40c6604c11fa7599a27785affa4e7cf Mon Sep 17 00:00:00 2001
From: wklyj <157651241@qq.com>
Date: Mon, 15 Apr 2024 16:59:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E8=89=B2=E8=BD=AF=E4=BB=B6Recipe?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=99=E7=9B=92=E5=B1=82=E6=95=B0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaipuDrawing/DlgChildRecipe.cpp |  1 +
 LaipuDrawing/GlobalDefine.h     |  2 ++
 LaipuDrawing/RecipeMgr.cpp      | 13 +++++++++++++
 LaipuDrawing/RecipeMgr.h        |  3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/LaipuDrawing/DlgChildRecipe.cpp b/LaipuDrawing/DlgChildRecipe.cpp
index 6275acb..e8c14a0 100644
--- a/LaipuDrawing/DlgChildRecipe.cpp
+++ b/LaipuDrawing/DlgChildRecipe.cpp
@@ -522,6 +522,7 @@ void CDlgChildRecipe::OnNMClickEditRecipeList(NMHDR *pNMHDR, LRESULT *pResult)
                    CString s = ListCtrl.GetItemText(Row,Col);//取得子项的内容
                    if((Row <Rcp_AreaName_Idx)
                    ||(Row == Rcp_RunTimes_Idx)
+				   ||(Row == Rcp_Cassette_Tier_Idx)
                    )//编辑框
                    {
                           CEdit &Edit = m_DoubleParEdit;
diff --git a/LaipuDrawing/GlobalDefine.h b/LaipuDrawing/GlobalDefine.h
index 0bcac4a..2205475 100644
--- a/LaipuDrawing/GlobalDefine.h
+++ b/LaipuDrawing/GlobalDefine.h
@@ -133,6 +133,8 @@ using namespace std;/*使
 #define RECIPE_PAR_NAME_LASER_EDI_OFFSET_2           "RECIPE_PAR_NAME_LASER_EDI_OFFSET_2"
 #define RECIPE_PAR_NAME_ALIGNER_ANG                       "RECIPE_PAR_NAME_ALIGNER_ANG"//准直角度
 
+#define RECIPE_PAR_NAME_CASSETTE_TIER_COUNT                 "RECIPE_PAR_NAME_CASSETTE_TIER_COUNT" //料盒层数
+
 #define RECIPE_PAR_NAME_RUNTIMES                 "RECIPE_PAR_NAME_RUNTIMES" //执行次数
 
 
diff --git a/LaipuDrawing/RecipeMgr.cpp b/LaipuDrawing/RecipeMgr.cpp
index 128d003..63a3ede 100644
--- a/LaipuDrawing/RecipeMgr.cpp
+++ b/LaipuDrawing/RecipeMgr.cpp
@@ -361,6 +361,19 @@ void CSubRecipe::IntiRecipeParVec()
 			RecipePar.m_DetailInfo = "工艺运行次数：正常设置为1，大于1时表示跑cycle，多subrcp的情况第一个sub的值为有效值";
             m_RecipeParVec.push_back(RecipePar);
       }
+
+	  {
+		  CRecipeParameter RecipePar;
+		  RecipePar.m_ParName = RECIPE_PAR_NAME_CASSETTE_TIER_COUNT;
+		  RecipePar.m_ParShowName = "Cassette Tier Cout";
+		  RecipePar.m_ParUnit = "";
+		  RecipePar.m_ParType = _RecipeParType_Int;//参数的类型
+		  RecipePar.m_ParDoubleVal = 13;//默认值
+		  RecipePar.m_DoubleMinVal = 13;
+		  RecipePar.m_DoubleMaxVal = 25;
+		  RecipePar.m_DetailInfo = "料盒层数设置：设置料盒层数，机械手根据料盒层数mapping";
+		  m_RecipeParVec.push_back(RecipePar);
+	  }
       
       //不能被编辑的参数---------------------------------------------------------------
       #if 1
diff --git a/LaipuDrawing/RecipeMgr.h b/LaipuDrawing/RecipeMgr.h
index da80e88..be37d89 100644
--- a/LaipuDrawing/RecipeMgr.h
+++ b/LaipuDrawing/RecipeMgr.h
@@ -12,8 +12,9 @@
 #define Rcp_UseCurN2Val_Idx (Rcp_N2_Idx+1)//使用Recipe的MFC流量值开关
 #define Rcp_OffsetTab_Idx (Rcp_UseCurN2Val_Idx+1)//补偿表
 #define Rcp_RunTimes_Idx (Rcp_OffsetTab_Idx+1)//运行次数
+#define Rcp_Cassette_Tier_Idx (Rcp_RunTimes_Idx+1)//料盒层数
 
-#define Rcp_CalInfo_Start_Idx (Rcp_RunTimes_Idx+1) //计算参数开始的索引值
+#define Rcp_CalInfo_Start_Idx (Rcp_Cassette_Tier_Idx+1) //计算参数开始的索引值