From 4d158834479e98a3cf64fc1e4e48240a25044eea Mon Sep 17 00:00:00 2001 From: lhiven Date: Thu, 11 Jan 2024 11:07:48 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8E=E5=B7=A6=E5=88=B0?= =?UTF-8?q?=E5=8F=B3=E5=8F=96=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs | 2 +- Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs index aff9aa0..2e7e5d7 100644 --- a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs +++ b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.Designer.cs @@ -306,7 +306,7 @@ this.rsTray1.ShowText = true; this.rsTray1.SinglePoint = false; this.rsTray1.Size = new System.Drawing.Size(775, 242); - this.rsTray1.SortDir = Rs.Controls.ESortDir.RightToLeft; + this.rsTray1.SortDir = Rs.Controls.ESortDir.LeftToRight; this.rsTray1.Status = null; this.rsTray1.TabIndex = 0; this.rsTray1.TopSpaceHeight = 20; diff --git a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs index beee40c..9b9b13e 100644 --- a/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs +++ b/Rs.SkyLine/Recipe/StockTrayLocationRecipe.cs @@ -98,16 +98,9 @@ namespace Rs.MotionPlat.Recipe for (int j = 0; j < colNum; j++) { int tempIndex = (colNum + 1) - (index - (i * colNum)) + (i * colNum); - //int tempIndex = ((i+1) * 20) - (colNum - 1) - index; - //int tempIndex = index + colNum - 1;// (i + 1) * 10 - index + 1; - - //double xBase = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); - //double yBase = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); - //double xRun = double.Parse(dt.Rows[0]["MarkX1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistX"].ToString()) + (j * double.Parse(dt.Rows[0]["SlotOffsetDistX"].ToString())); - //double yRun = double.Parse(dt.Rows[0]["MarkY1"].ToString()) + double.Parse(dt.Rows[0]["Mark2CenterDistY"].ToString()) + (i * double.Parse(dt.Rows[0]["SlotOffsetDistY"].ToString())); double xRun = double.Parse(txtMarkX1.Text) + (j * double.Parse(txtSlotOffsetDistX.Text))+GlobalVar.StockTrayOffsetX; double yRun = double.Parse(txtMarkY1.Text) + (i * double.Parse(txtSlotOffsetDistY.Text))+GlobalVar.StockTrayOffsetY; - string insertRunSql = $"insert into TrayPoints(trayid,recipename,trayname,slotindex,x,y) values('{dt.Rows[0]["id"]}','{dt.Rows[0]["recipename"]}','{dt.Rows[0]["TrayName"]}',{tempIndex},{xRun},{yRun})"; + string insertRunSql = $"insert into TrayPoints(trayid,recipename,trayname,slotindex,x,y) values('{dt.Rows[0]["id"]}','{dt.Rows[0]["recipename"]}','{dt.Rows[0]["TrayName"]}',{index},{xRun},{yRun})"; db.ExecuteNonQuery(insertRunSql); index++; }