From f0e39146e438836dfa44f6b3adcc28de81810c92 Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 17 Dec 2025 09:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=A8=E8=BD=AC=E7=9B=98?= =?UTF-8?q?=E5=85=88=E7=82=B9=E5=87=BB=E7=A4=BA=E6=95=99=E5=86=8D=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=82=B9=E4=BD=8D=E6=97=B6=E7=82=B9=E4=BD=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs | 1 + Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 88647ac..0e9ebf1 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("20.25.15.03")] + [assembly: AssemblyVersion("20.25.15.04")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs index 9bbd5d1..733e0b3 100644 --- a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs +++ b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs @@ -184,6 +184,7 @@ namespace Rs.MotionPlat.Recipe { if(NormalTrayLogic.Update(txt.Name.Replace("txt", ""),pos,GlobalVar.CurRecipe,m_trayName)>0) { + BindPoints(); Msg.ShowInfo("teach point ok!"); } } diff --git a/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs b/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs index ce208f5..4f5144b 100644 --- a/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs +++ b/Rs.SkyLine/Recipe/TurnoverLocationRecipe.cs @@ -64,6 +64,7 @@ namespace Rs.MotionPlat.Recipe private void BindPoints() { + dt = BindTrayInfo(); DataTable dtRunPoints = TrayPointsLogic.GetData(GlobalVar.CurRecipe, trayName); if (ObjectHelper.IsNotNullorEmpty(dtRunPoints)) { @@ -89,7 +90,7 @@ namespace Rs.MotionPlat.Recipe { LanguageHelper.LoadLanguage(this, this.GetType()); dgvSlotOffset.AutoGenerateColumns = false; - dt= NormalTrayLogic.GetData(GlobalVar.CurRecipe,trayName); + dt = BindTrayInfo(); if(ObjectHelper.IsNotNullorEmpty(dt)) { DataRow dr = dt.Rows[0]; @@ -159,14 +160,18 @@ namespace Rs.MotionPlat.Recipe { if(NormalTrayLogic.Update(txt.Name.Replace("txtTurnoverTray", ""),pos,GlobalVar.CurRecipe,trayName)>0) { - string querySql = "select * from NormalTray where trayname='Turnover'"; - dt = db.GetDataTable(querySql); + Msg.ShowInfo("teach point ok!"); } } } } + DataTable BindTrayInfo() + { + return NormalTrayLogic.GetData(GlobalVar.CurRecipe, trayName); + } + private void btnMove_Click(object sender, EventArgs e) { Button btnTeach = (Button)sender;