From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目;

---
 Plugin.TestResult/DataTable.xaml.cs |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Plugin.TestResult/DataTable.xaml.cs b/Plugin.TestResult/DataTable.xaml.cs
index aa54886..200341f 100644
--- a/Plugin.TestResult/DataTable.xaml.cs
+++ b/Plugin.TestResult/DataTable.xaml.cs
@@ -1,5 +1,6 @@
 锘縰sing HMI.Core.Util;
 using HMI.Util;
+using Plugin.TestResult;
 using Plugin.TestResult_WPF.Model;
 using Plugin.TestResult_WPF.Util;
 using SuperSocket.SocketBase.Protocol;
@@ -99,6 +100,7 @@
             this.chartTitle = config.MainChartTitle;
             DataContext = this;
             InitializeComponent();
+            mainGrid.Columns = config.PositionColumn;
             this.chart = new Chart(this.chartTitle, false, config.MaxSize, config.RefreshInterval);
             this.multiChart = new Chart(config.DetailChartTitle, true, config.MaxSize, config.RefreshInterval)
             {
@@ -110,7 +112,7 @@
 
             for (int i = 0; i < this.cellCount; i++)
             {
-                var cell = new SingleCell(title, i, config.CellListMaxSize);
+                var cell = new SingleCell(title, i, config.CellListMaxSize, countIniPath);
                 mainGrid.Children.Add(cell);
                 cells[i] = cell;
             }
@@ -252,9 +254,12 @@
 
             //灏嗚鍒扮殑鏉$爜鍐欏叆鍒癝N涓�
             int dutNo = Convert.ToInt16(positionCode.Split('-')[2]) - 1;
-            string LookupStr = e.name == "Zone1" ? $"StationState.SN[{dutNo}]" : $"StationState.SN[{(dutNo + 54)}]";
+            dutNo = this.index * this.cellCount + dutNo;
+
+            string LookupStr = $"StationState.SN[{dutNo}]";
 
             parent.engine.Globals.SetValString(LookupStr, 0, snrCode);
+            parent.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
             string code = parent.engine.Globals.GetValString(LookupStr, 0);
             parent.nameTables[cellInfo.OvenName].GetSingleCell(cellInfo.Index).SetStatus("hadCode");
         }
@@ -496,5 +501,22 @@
                 parent.SetOvenProduct(index, "");
             }
         }
+
+        public void ClearElectricData()
+        {
+            foreach (var cell in cells)
+            {
+                cell.ClearElectricData();
+            }
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            ScannerSetting setting = new ScannerSetting()
+            {
+                Owner = Window.GetWindow(this)
+            };
+            setting.Open(true, this.title);
+        }
     }
 }

--
Gitblit v1.9.1