Merge branch 'master' of http://192.168.0.12:13000/sc/SunlightCentralizedControlManagement

ConvertMoels/StatexmlConvert.cs

@@ -29,7 +29,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
                 else if (i == "800") Staten = "LinkOff";//未连接
                 else if (i == "801") Staten = "Link";//连接成功
                 else if (i == "899") Staten = "LinkOff";//关闭连接
-                else if (i == "True") Staten = "Lock";//锁
+                else if (i == "True") Staten = "Visible";//
+                else if (i == "False") Staten = "Collapsed";//
 
                 return Staten;
             }

DATA/SCCM.ini

@@ -0,0 +1,24 @@
+[SYS]
+Language=zh-CN
+DyelotsDispenser=True
+COMP1=COM7
+COMP2=COM8
+COMP3=COM9
+COMP4=COM10
+BAUD1 = 57600
+BAUD2= 57600
+BAUD3 =57600
+BAUD4 =57600
+[SQL_SERVER]
+SQL1=www.scserverddns.top\EXPRESS ,21344
+SQL2=BatchDyeingCentral
+SQL3=SQL SERVER
+SQL4=sa
+SQL5=SC971216@server
+[SN]
+SN3=5BEE2D9CF3E1A8DD
+SN2=BED2E58B6EBB4BD4
+SN1=5BEE2D9CF3E1A8DD
+[VOICE]
+V1=-2
+V2=100

ERR/ERR2025-08-28.txt

@@ -0,0 +1,20 @@
+[2025-08-28 17:45:02];[Error] ||
+
+[2025-08-28 17:45:02];[Error source] ||.Net SqlClient Data Provider
+
+[2025-08-28 17:45:02];[Error message] ||在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: Named Pipes Provider, error: 40 - 无法打开到 SQL Server 的连接)
+
+[2025-08-28 17:45:02];[Error area] ||   在 System.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, DbConnectionPool pool, String accessToken, Boolean applyTransientFaultHandling, SqlAuthenticationProviderManager sqlAuthProviderManager)
+   在 System.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)
+   在 System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
+   在 System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+   在 System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)
+   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal& connection)
+   在 System.Data.ProviderBase.DbConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionInternal& connection)
+   在 System.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
+   在 System.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
+   在 System.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry)
+   在 System.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry)
+   在 System.Data.SqlClient.SqlConnection.Open()
+   在 SunlightCentralizedControlManagement_SCCM_.ViewModel.ManualDyelotModel..ctor() 位置 C:\Users\Administrator\source\repos\SunlightCentralizedControlManagement(SCCM)\ViewModel\ManualDyelotModel.cs:行号 35

EX/Exchange/BDC_SQL.cs

@@ -0,0 +1,123 @@
+using LiveChartsCore.Kernel;
+using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using SunlightCentralizedControlManagement_SCCM_.WindowsView;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Contexts;
+using System.Security.Principal;
+using System.Threading.Tasks;
+using TouchSocket.Core;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
+
+namespace SunlightCentralizedControlManagement_SCCM_.EX.Exchange
+{
+    public class BDC_SQL
+    {
+        public class BDCSqlHelper
+        {
+            //  SqlConnection conn_SC = new SqlConnection();//数据库
+            string db;
+            public void Config(string IP, string DATABASE, string USER, string PAWSSD, bool MODE)//连接dbc数据库
+            {
+                if (MODE)    //连接数据库测试
+                {
+                    db="server=" + IP + ";database=" + DATABASE + ";Trusted_Connection=SSPI";
+                }
+                else
+                {
+                    db="server=" + IP + ";database=" + DATABASE + ";User ID=" + USER + ";Password=" + PAWSSD;
+                }
+            }
+
+            public async Task<int> UPDATA(string name,string where,DataRow entity)//dbc数据库
+            {
+                string DAT = null;
+                int rowsAffected = 0;
+                int type = 0;
+                try { type = entity.Field<int>("Type"); } catch { }
+                try
+                {
+                              
+                    DAT = "DispenseDyelot='" + entity.Field<string>("Dyelot") + "',DispenseReDye='" + entity.Field<int>("Redye")+"',";
+                    if (type == 2)
+                    {
+                        DAT = DAT+"DyeCallOff=" + entity.Field<int>("Step") + ",DyeState = 201,DyeTank=" + 
+                            entity.Field<int>("Tank");
+                    }
+                    else if (type == 3)
+                    {
+                        DAT = DAT+"PowderCallOff=" + entity.Field<int>("Step") +",PowderState=201,PowderTank=" + 
+                            entity.Field<int>("Tank");
+                    }
+                    else
+                    {
+                        DAT = DAT+"ChemicalCallOff=" + entity.Field<int>("Step") +",ChemicalState=201,ChemicalTank=" + 
+                            entity.Field<int>("Tank");
+                    }                        
+                    
+                    using (var connection = new SqlConnection(db))
+                    {
+                        await connection.OpenAsync();
+                        var command = connection.CreateCommand();
+                        command.CommandText = "UPDATE "+ name + " SET "+ DAT + " WHERE "+ where;
+                      //  command.Parameters.AddWithValue("@table", name);
+                      //  command.Parameters.AddWithValue("@Id", where);
+                      //  command.Parameters.AddWithValue("@data", DAT);
+                        rowsAffected = await command.ExecuteNonQueryAsync();                        
+
+                        LogGing.ExchangeDATA( command.CommandText.ToString());
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogGing.ERRDATA(ex);
+                }
+                return rowsAffected;
+            }
+
+            public async Task<DataTable> SELECT(string name, string where)//dbc数据库
+            {
+                DataTable rowsAffected = new DataTable();
+                try
+                {                   
+                    using (var connection = new SqlConnection(db))
+                    {
+                        await connection.OpenAsync();
+                        var command = connection.CreateCommand();
+                        command.CommandText = "SELECT * FROM " + name + " WHERE " + where;
+                        var dat = await command.ExecuteReaderAsync();
+                        rowsAffected.Load(dat);          
+
+                        LogGing.ExchangeDATA(command.CommandText.ToString());                       
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogGing.ERRDATA(ex);
+                }
+                return rowsAffected;
+            }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        }     
+    }
+}

EX/ManualDyelot.xaml.cs

@@ -34,9 +34,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.EX
     public partial class ManualDyelot : Window
     {
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        DataTable dyelotdat = new DataTable();
+          DataTable dyelotdat = new DataTable();
         public static string Machines;
         DataTable mach = new DataTable();
         DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT缓存
@@ -125,8 +123,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.EX
             if (string.IsNullOrEmpty(comboBoxMachine.Text)) return;//未输入机台时返回
             try
             {
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
                 Dictionary<string, object> Dyelot_DAT = new Dictionary<string, object>();//缓存函数
                 for (int x = 0; x < RRODUCTdataTable.Rows.Count; x++)
                 {
@@ -144,10 +140,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.EX
                     Dyelot_DAT.Add("DispenseStartTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     Dyelot_DAT.Add("Grams", RRODUCTdataTable.Rows[x]["TARGET_WT"]);
                     Dyelot_DAT.Add("Amount", RRODUCTdataTable.Rows[x]["Amount"]);
-                    SQLiteHelpers.InsertData("Dyelot", Dyelot_DAT);//行插入                                                                             
+                    MainWindowViewModel.SQLiteHelpers.InsertData("Dyelot", Dyelot_DAT);//行插入                                                                             
                     Dyelot_DAT.Clear();
                 }
-                SQLiteHelpers.Close();  //关闭连接
 
                 LogGing.ExchangeDATA("Dyelot=" + dyelot.Text + ";Machine=" + comboBoxMachine.Text +
                     ";Program=------;User=" + MainWindowViewModel.USER_data + ";");

KEY/TouchKeyboard.xaml

@@ -0,0 +1,132 @@
+<Window x:Class="SunlightCentralizedControlManagement_SCCM_.KEY.TouchKeyboard"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
+        mc:Ignorable="d" WindowStyle="None" ResizeMode="NoResize" Topmost="True"        
+        WindowStartupLocation="CenterScreen"
+        Title="TouchKeyboard" Height="500" Width="750">
+    <Window.Resources>
+        <Style x:Key="KeyButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="#FFF0F0F0"/>
+            <Setter Property="BorderBrush" Value="#FFCCCCCC"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+            <Setter Property="Margin" Value="2"/>
+            <Setter Property="MinWidth" Value="60"/>
+            <Setter Property="MinHeight" Value="40"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="border" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="4">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="#FFDDDDDD"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="SpecialKeyButtonStyle" BasedOn="{StaticResource KeyButtonStyle}" TargetType="Button">
+            <Setter Property="Background" Value="#FFE0E0E0"/>
+            <Setter Property="FontSize" Value="16"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 预览区域 -->
+        <TextBox x:Name="PreviewTextBox" Grid.Row="0" Height="60" Margin="10" 
+                 FontSize="24" VerticalContentAlignment="Center" IsReadOnly="False"/>
+
+        <!-- 键盘主体区域 -->
+        <Grid Grid.Row="1" Margin="10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+
+            <!-- 数字行 -->
+            <StackPanel Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Center">
+                <Button Content="1" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="2" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="3" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="4" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="5" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="6" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="7" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="8" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="9" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="0" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="DEL" Style="{StaticResource SpecialKeyButtonStyle}" Click="Backspace_Click" Width="60"/>
+            </StackPanel>
+
+            <!-- 第一行字母 -->
+            <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center">
+                <Button Content="Q" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="W" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="E" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="R" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="T" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="Y" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="U" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="I" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="O" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="P" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+            </StackPanel>
+
+            <!-- 第二行字母 -->
+            <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Center">
+                <Button Content="A" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="S" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="D" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="F" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="G" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="H" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="J" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="K" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="L" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="/" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="HIDE" Style="{StaticResource SpecialKeyButtonStyle}" Click="Hide_Click" Width="60"/>
+            </StackPanel>
+
+            <!-- 第三行字母 -->
+            <StackPanel Orientation="Horizontal" Grid.Row="3" HorizontalAlignment="Center">
+                <Button x:Name="ShiftButton" Content="⇧" Style="{StaticResource SpecialKeyButtonStyle}" Click="Shift_Click" Width="60"/>
+                <Button Content="Z" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="X" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="C" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="V" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="B" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="N" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="M" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="." Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="ENTER" Style="{StaticResource SpecialKeyButtonStyle}" Click="Enter_Click" Width="120"/>
+            </StackPanel>
+        </Grid>
+
+        <!-- 状态栏 -->
+        <StatusBar Grid.Row="2">
+            <StatusBarItem>
+                <TextBlock x:Name="StatusTextBlock" Text="就绪"/>
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
+</Window>

KEY/TouchKeyboard.xaml.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using static SunlightCentralizedControlManagement_SCCM_.KEY.TouchKeyboardNumeral;
+
+namespace SunlightCentralizedControlManagement_SCCM_.KEY
+{
+    /// <summary>
+    /// TouchKeyboard.xaml 的交互逻辑
+    /// </summary>
+    public partial class TouchKeyboard : Window
+    {
+        private bool isShiftActive = false;
+        public string KeyValue;
+        public event EventHandler<KeyPressedEventArgs> KeyPressed;
+
+        public TouchKeyboard()
+        {
+            InitializeComponent();
+        }
+
+        private void KeyButton_Click(object sender, RoutedEventArgs e)
+        {
+            Button button = sender as Button;
+            if (button != null)
+            {
+                string key = button.Content.ToString();
+
+                if (key.Length == 1 && char.IsLetter(key[0]))
+                {
+                    key = isShiftActive ? key.ToUpper() : key.ToLower();
+                }
+
+                PreviewTextBox.Text += key;
+
+                // 输入后关闭Shift状态
+                if (isShiftActive)
+                {
+                    isShiftActive = false;
+                    UpdateButtonAppearance();
+                }
+            }
+        }
+
+        private void Shift_Click(object sender, RoutedEventArgs e)
+        {
+            isShiftActive = !isShiftActive;
+            UpdateButtonAppearance();
+        }      
+
+        private void Backspace_Click(object sender, RoutedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(PreviewTextBox.Text))
+            {
+                PreviewTextBox.Text = PreviewTextBox.Text.Substring(0, PreviewTextBox.Text.Length - 1);
+            }
+        }
+
+        private void Enter_Click(object sender, RoutedEventArgs e)
+        {
+            // 触发回车事件
+            KeyPressed?.Invoke(this, new KeyPressedEventArgs(KeyType.Enter, PreviewTextBox.Text));
+
+            this.Close();
+           // PreviewTextBox.Text += Environment.NewLine;
+        }
+
+        private void Hide_Click(object sender, RoutedEventArgs e)
+        {
+            KeyPressed?.Invoke(this, new KeyPressedEventArgs(KeyType.Hide, ""));
+            this.Close();
+        }
+
+        private void UpdateButtonAppearance()
+        {
+            // 更新Shift按钮的外观以反映当前状态
+            if (isShiftActive)
+            {
+                ShiftButton.Background = new SolidColorBrush(Colors.LightBlue);
+            }
+            else
+            {
+                ShiftButton.Background = new SolidColorBrush(Color.FromRgb(224, 224, 224));
+            }
+        }
+
+        public class KeyPressedEventArgs : EventArgs
+        {
+            public KeyType KeyType { get; }
+            public string KeyValue { get; }
+
+            public KeyPressedEventArgs(KeyType keyType, string keyValue)
+            {
+                KeyType = keyType;
+                KeyValue = keyValue;
+            }
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            // 初始化为默认模式
+            //   SetKeyboardMode(KeyboardMode.Default);
+            PreviewTextBox.Text = null;
+        }
+    }
+   
+}

KEY/TouchKeyboardNumeral.xaml

@@ -0,0 +1,100 @@
+<Window x:Class="SunlightCentralizedControlManagement_SCCM_.KEY.TouchKeyboardNumeral"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
+        mc:Ignorable="d" 
+        WindowStyle="None" 
+        ResizeMode="NoResize" 
+        Topmost="True"        
+        WindowStartupLocation="CenterScreen"
+        Title="TouchKeyboardNumeral" 
+        Loaded="Window_Loaded"
+        Height="500" Width="550">
+    <Window.Resources>
+        <Style x:Key="KeyButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="#FFF0F0F0"/>
+            <Setter Property="BorderBrush" Value="#FFCCCCCC"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+            <Setter Property="Margin" Value="2"/>
+            <Setter Property="MinWidth" Value="100"/>
+            <Setter Property="MinHeight" Value="40"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="border" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="4">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="#FFDDDDDD"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Foreground" Value="#FFBBBBBB"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="SpecialKeyButtonStyle" BasedOn="{StaticResource KeyButtonStyle}" TargetType="Button">
+            <Setter Property="Background" Value="#FFE0E0E0"/>
+            <Setter Property="FontSize" Value="16"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 预览区域 -->
+        <TextBox x:Name="PreviewTextBox" Grid.Row="0" Height="60" Margin="10" 
+                 FontSize="24" VerticalContentAlignment="Center" IsReadOnly="False"/>
+
+        <!-- 键盘主体区域 -->
+        <Grid Grid.Row="1" Margin="10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+
+            <!-- 数字行 -->
+            <StackPanel x:Name="FirstRow" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Center">
+                <Button Content="7" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="8" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="9" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="0" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="DEL" Style="{StaticResource SpecialKeyButtonStyle}" Click="Backspace_Click" Width="60"/>
+            </StackPanel>
+
+            <!-- 数字行 -->
+            <StackPanel x:Name="SecondRow" Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center">
+                <Button Content="4" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="5" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="6" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="." Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="HIDE" Style="{StaticResource SpecialKeyButtonStyle}" Click="Hide_Click" Width="60"/>
+            </StackPanel>
+
+            <!-- 数字行 -->
+            <StackPanel x:Name="ThirdRow" Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Center">
+                <Button Content="1" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="2" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="3" Style="{StaticResource KeyButtonStyle}" Click="KeyButton_Click"/>
+                <Button Content="ENTER" Style="{StaticResource SpecialKeyButtonStyle}" Click="Enter_Click" Width="200"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Window>

KEY/TouchKeyboardNumeral.xaml.cs

@@ -0,0 +1,215 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace SunlightCentralizedControlManagement_SCCM_.KEY
+{
+    /// <summary>
+    /// TouchKeyboard.xaml 的交互逻辑
+    /// </summary>
+    public partial class TouchKeyboardNumeral : Window
+    {
+        private bool mode = false;
+        public string KeyValue;
+        public event EventHandler<KeyPressedEventArgs> KeyPressed;
+        private KeyboardMode currentMode = KeyboardMode.Default;
+        private int minValue = 0;
+        private int maxValue = 9;
+        private TextBox targetTextBox;
+        // 定义键盘模式枚举
+        public enum KeyboardMode
+        {
+            Default,        // 默认模式，所有键可用
+            NumericOnly,    // 只允许数字
+            DecimalOnly,    // 允许数字和小数点
+            LimitedRange    // 限制数字范围
+        }
+
+        public TouchKeyboardNumeral()
+        {
+            InitializeComponent();
+        }
+        public void SetKeyboardMode(KeyboardMode mode, TextBox target = null, int min = 0, int max = 9)
+        {
+            currentMode = mode;
+            targetTextBox = target;
+            minValue = min;
+            maxValue = max;
+
+            UpdateKeyboardLayout();
+        }
+        private void UpdateKeyboardLayout()
+        {
+            switch (currentMode)
+            {
+                case KeyboardMode.NumericOnly:
+                    // 只允许数字，禁用小数点
+                    SetButtonEnabled(".", false);
+                    break;
+
+                case KeyboardMode.DecimalOnly:
+                    // 允许数字和小数点
+                    SetButtonEnabled(".", true);
+                    break;
+
+                case KeyboardMode.LimitedRange:
+                    // 根据范围启用/禁用数字键
+                    for (int i = 0; i <= 9; i++)
+                    {
+                        SetButtonEnabled(i.ToString(), i >= minValue && i <= maxValue);
+                    }
+                    mode = true;
+                    break;
+
+                case KeyboardMode.Default:
+                default:
+                    // 启用所有键
+                    foreach (var element in FirstRow.Children)
+                    {
+                        if (element is Button button && char.IsDigit(button.Content.ToString()[0]))
+                            button.IsEnabled = true;
+                    }
+                    foreach (var element in SecondRow.Children)
+                    {
+                        if (element is Button button && (char.IsDigit(button.Content.ToString()[0]) || button.Content.ToString() == "."))
+                            button.IsEnabled = true;
+                    }
+                    foreach (var element in ThirdRow.Children)
+                    {
+                        if (element is Button button && char.IsDigit(button.Content.ToString()[0]))
+                            button.IsEnabled = true;
+                    }
+                    break;
+            }
+        }
+
+        // 设置按钮启用状态
+        private void SetButtonEnabled(string content, bool enabled)
+        {
+            // 在第一行查找
+            foreach (var element in FirstRow.Children)
+            {
+                if (element is Button button && button.Content.ToString() == content)
+                {
+                    button.IsEnabled = enabled;
+                    return;
+                }
+            }
+
+            // 在第二行查找
+            foreach (var element in SecondRow.Children)
+            {
+                if (element is Button button && button.Content.ToString() == content)
+                {
+                    button.IsEnabled = enabled;
+                    return;
+                }
+            }
+
+            // 在第三行查找
+            foreach (var element in ThirdRow.Children)
+            {
+                if (element is Button button && button.Content.ToString() == content)
+                {
+                    button.IsEnabled = enabled;
+                    return;
+                }
+            }
+        }
+
+        // 数字键点击事件
+        private void KeyButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (mode && PreviewTextBox.Text.Length > 0) return;
+            Button button = sender as Button;
+            if (button != null && button.IsEnabled)
+            {
+                string keyValue = button.Content.ToString();
+                PreviewTextBox.Text += keyValue;
+
+                // 触发按键事件
+                //   KeyPressed?.Invoke(this, new KeyPressedEventArgs(KeyType.Character, keyValue));
+            }
+        }
+
+        // 退格键点击事件
+        private void Backspace_Click(object sender, RoutedEventArgs e)
+        {               
+            if (PreviewTextBox.Text.Length > 0)
+            {
+                PreviewTextBox.Text = PreviewTextBox.Text.Substring(0, PreviewTextBox.Text.Length - 1);
+
+                // 触发退格事件
+              //  KeyPressed?.Invoke(this, new KeyPressedEventArgs(KeyType.Backspace, ""));
+            }
+        }
+
+        // 回车键点击事件
+        private void Enter_Click(object sender, RoutedEventArgs e)
+        {            
+            // 触发回车事件
+            KeyPressed?.Invoke(this, new KeyPressedEventArgs(KeyType.Enter, PreviewTextBox.Text));
+
+            // 隐藏键盘
+            this.Hide();
+        }
+
+        // 隐藏键点击事件
+        private void Hide_Click(object sender, RoutedEventArgs e)
+        {
+            KeyPressed?.Invoke(this, new KeyPressedEventArgs(KeyType.Hide, ""));
+            // 隐藏键盘
+            this.Hide();
+        }
+
+        public class KeyPressedEventArgs : EventArgs
+        {
+            public KeyType KeyType { get; }
+            public string KeyValue { get; }
+
+            public KeyPressedEventArgs(KeyType keyType, string keyValue)
+            {
+                KeyType = keyType;
+                KeyValue = keyValue;
+            }
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            // 初始化为默认模式
+         //   SetKeyboardMode(KeyboardMode.Default);
+            PreviewTextBox.Text = null;
+            mode = false;
+        }       
+    }
+    // 按键类型枚举
+    public enum KeyType
+    {
+        Character,
+        Backspace,
+        Enter,
+        Hide
+    }
+
+    // 按键事件参数
+    public class KeyPressedEventArgs : EventArgs
+    {
+        public KeyType KeyType { get; }
+        public string KeyValue { get; }
+
+        public KeyPressedEventArgs(KeyType keyType, string keyValue)
+        {
+            KeyType = keyType;
+            KeyValue = keyValue;
+        }
+    }
+}

Login.xaml.cs

@@ -1,4 +1,5 @@
-using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
 using System;
 using System.Data;
 using System.Data.SqlClient;
@@ -82,9 +83,10 @@ namespace SunlightCentralizedControlManagement_SCCM_
                     }
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                System.Windows.MessageBox.Show(Properties.Resources.NPERR, "SCCM", MessageBoxButton.OK, MessageBoxImage.Error);
+                LogGing.ERRDATA(ex);
+                System.Windows.MessageBox.Show("Unable to start. Check the log for details.", "SCCM", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 

MainWindow.xaml

@@ -13,7 +13,7 @@
         Loaded="Window_Loaded"
 		Title="SUNLIGHT SCCM b0.0.1 (2024/08/10)"      
 		Height="1080" Width="1920" Background="#FF003640"
-        WindowState ="Maximized" WindowStyle="None">
+        WindowStyle="None" ResizeMode="NoResize">
     <Window.Resources>
         <Storyboard x:Key="MenuOpen">
             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(FrameworkElement.Width)" Storyboard.TargetName="GridMenu">

MainWindow.xaml.cs

@@ -14,6 +14,7 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
@@ -31,10 +32,13 @@ namespace SunlightCentralizedControlManagement_SCCM_
     {
         public static string user_;
         public static DataTable InfData = new DataTable();
+     //   public static string[] Inf_string ;
         public UserInformation userInformation;
+       // public UserInf userInf;
 
         public MainWindow()
         {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
             DataContext = new MainWindowViewModel();
             InitializeComponent();                      
             CountDown();
@@ -72,6 +76,22 @@ namespace SunlightCentralizedControlManagement_SCCM_
                 if (userInformation.WindowState == WindowState.Minimized) userInformation.WindowState = WindowState.Normal;
             }
         }
+   /*     private void UserInfTable(string dat)//触发行改变事件
+        {
+            userInf.Inf_DAT = dat;
+            if (userInf == null || !userInf.IsLoaded)//窗口不存在及创建
+            {
+                userInf = new UserInf();
+                userInf.Topmost = true;
+                userInf.Show();
+                userInf.Activate();
+            }
+            else
+            {//窗口纯在及置顶
+                userInf.Activate();
+                if (userInf.WindowState == WindowState.Minimized) userInf.WindowState = WindowState.Normal;
+            }
+        }*/
 
         private void ButtonPopUpLogout_Click(object sender, RoutedEventArgs e)
         {
@@ -144,7 +164,6 @@ namespace SunlightCentralizedControlManagement_SCCM_
         {
             Picture.Content = new View.DispenseView();
         }
-
         private void Buttonhelp_Click(object sender, RoutedEventArgs e)
         {
             WindowsView.Help help_page = new WindowsView.Help();
@@ -242,7 +261,15 @@ namespace SunlightCentralizedControlManagement_SCCM_
 
         private void Window_Loaded(object sender, RoutedEventArgs e)//打开页面
         {
+            var windowHandle = new WindowInteropHelper(this).Handle;
+            var currentScreen = Screen.FromHandle(windowHandle);
 
+            System.Drawing.Rectangle rectangle = currentScreen.WorkingArea;
+
+            this.Left = rectangle.Left;
+            this.Top=rectangle.Top;
+            this.Width = rectangle.Width;
+            this.Height = rectangle.Height;
         }   
 
     }

Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -60,6 +60,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Manual/Automatic 的本地化字符串。
+        /// </summary>
+        public static string _Auto {
+            get {
+                return ResourceManager.GetString("_Auto", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 continue 的本地化字符串。
         /// </summary>
@@ -699,6 +708,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DispenseException 的本地化字符串。
+        /// </summary>
+        public static string DispenseException {
+            get {
+                return ResourceManager.GetString("DispenseException", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 DispenseGrams 的本地化字符串。
         /// </summary>
@@ -1266,6 +1284,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Machines 的本地化字符串。
+        /// </summary>
+        public static string Machines {
+            get {
+                return ResourceManager.GetString("Machines", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Malfunction 的本地化字符串。
         /// </summary>
@@ -1986,6 +2013,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ProgramName 的本地化字符串。
+        /// </summary>
+        public static string ProgramName {
+            get {
+                return ResourceManager.GetString("ProgramName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 ProportionalValves 的本地化字符串。
         /// </summary>
@@ -2382,6 +2418,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Start 的本地化字符串。
+        /// </summary>
+        public static string Start {
+            get {
+                return ResourceManager.GetString("Start", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 StartDate 的本地化字符串。
         /// </summary>
@@ -2481,6 +2526,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Swing 的本地化字符串。
+        /// </summary>
+        public static string Swing {
+            get {
+                return ResourceManager.GetString("Swing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SystemDataLoss 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -1074,4 +1074,22 @@
   <data name="Subroutine" xml:space="preserve">
     <value>Subroutine</value>
   </data>
+  <data name="DispenseException" xml:space="preserve">
+    <value>Dispense Exception</value>
+  </data>
+  <data name="_Auto" xml:space="preserve">
+    <value>Manual/Automatic</value>
+  </data>
+  <data name="Swing" xml:space="preserve">
+    <value>Swing</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="ProgramName" xml:space="preserve">
+    <value>Program Name</value>
+  </data>
+  <data name="Machines" xml:space="preserve">
+    <value>Machines</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -1074,4 +1074,22 @@
   <data name="Subroutine" xml:space="preserve">
     <value>Subroutine</value>
   </data>
+  <data name="DispenseException" xml:space="preserve">
+    <value>DispenseException</value>
+  </data>
+  <data name="_Auto" xml:space="preserve">
+    <value>Manual/Automatic</value>
+  </data>
+  <data name="Swing" xml:space="preserve">
+    <value>Swing</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="ProgramName" xml:space="preserve">
+    <value>ProgramName</value>
+  </data>
+  <data name="Machines" xml:space="preserve">
+    <value>Machines</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -1074,4 +1074,22 @@
   <data name="Subroutine" xml:space="preserve">
     <value>副功能</value>
   </data>
+  <data name="DispenseException" xml:space="preserve">
+    <value>输送异常</value>
+  </data>
+  <data name="_Auto" xml:space="preserve">
+    <value>手/自动</value>
+  </data>
+  <data name="Swing" xml:space="preserve">
+    <value>摆布</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>开始</value>
+  </data>
+  <data name="ProgramName" xml:space="preserve">
+    <value>工艺名</value>
+  </data>
+  <data name="Machines" xml:space="preserve">
+    <value>机台</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -1069,9 +1069,27 @@
     <value>音量</value>
   </data>
   <data name="Pequest" xml:space="preserve">
-    <value />
+    <value>請求</value>
   </data>
   <data name="Subroutine" xml:space="preserve">
-    <value />
+    <value>副功能</value>
+  </data>
+  <data name="DispenseException" xml:space="preserve">
+    <value>輸送異常</value>
+  </data>
+  <data name="_Auto" xml:space="preserve">
+    <value>手/自動</value>
+  </data>
+  <data name="Swing" xml:space="preserve">
+    <value>擺佈</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>開始</value>
+  </data>
+  <data name="ProgramName" xml:space="preserve">
+    <value>工藝名</value>
+  </data>
+  <data name="Machines" xml:space="preserve">
+    <value>機器</value>
   </data>
 </root>

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -77,6 +77,9 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="SkiaSharp">
+      <HintPath>bin\Debug\SkiaSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -109,6 +112,13 @@
     <Compile Include="EX\DispenseState.xaml.cs">
       <DependentUpon>DispenseState.xaml</DependentUpon>
     </Compile>
+    <Compile Include="EX\Exchange\BDC_SQL.cs" />
+    <Compile Include="KEY\TouchKeyboard.xaml.cs">
+      <DependentUpon>TouchKeyboard.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="KEY\TouchKeyboardNumeral.xaml.cs">
+      <DependentUpon>TouchKeyboardNumeral.xaml</DependentUpon>
+    </Compile>
     <Compile Include="EX\ManualDyelot.xaml.cs">
       <DependentUpon>ManualDyelot.xaml</DependentUpon>
     </Compile>
@@ -118,12 +128,14 @@
     <Compile Include="Login.xaml.cs">
       <DependentUpon>Login.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserClass\AsyncSerialPortClient.cs" />
     <Compile Include="UserClass\AsyncTcpClient.cs" />
     <Compile Include="UserClass\ClsLock.cs" />
     <Compile Include="UserClass\CRCcheck16.cs" />
     <Compile Include="UserClass\CSV.cs" />
     <Compile Include="UserClass\DataGridHelper.cs" />
     <Compile Include="UserClass\DataTableForToObservableCollection.cs" />
+    <Compile Include="UserClass\DataTableManager .cs" />
     <Compile Include="UserClass\get_local_ip_address.cs" />
     <Compile Include="UserClass\HardwareSN.cs" />
     <Compile Include="UserClass\IniFile.cs" />
@@ -132,6 +144,7 @@
     <Compile Include="UserClass\NetFwManger.cs" />
     <Compile Include="UserClass\NumericTextColumn .cs" />
     <Compile Include="UserClass\PID.cs" />
+    <Compile Include="UserClass\RS485MasterStation.cs" />
     <Compile Include="UserClass\SYSInfo.cs" />
     <Compile Include="UserClass\PressKey.cs" />
     <Compile Include="UserClass\SqliteHelper.cs" />
@@ -141,6 +154,12 @@
     <Compile Include="UserControls\DispenseMacInfo.xaml.cs">
       <DependentUpon>DispenseMacInfo.xaml</DependentUpon>
     </Compile>
+    <Compile Include="WindowsView\UserWorkOrder.xaml.cs">
+      <DependentUpon>UserWorkOrder.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WindowsView\UserInf.xaml.cs">
+      <DependentUpon>UserInf.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WindowsView\UserInformation.xaml.cs">
       <DependentUpon>UserInformation.xaml</DependentUpon>
     </Compile>
@@ -238,6 +257,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="KEY\TouchKeyboard.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="KEY\TouchKeyboardNumeral.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="EX\ManualDyelot.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -272,6 +299,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="WindowsView\UserWorkOrder.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="WindowsView\UserInf.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="WindowsView\UserInformation.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -475,28 +510,28 @@
       <Version>2.0.0-rc4.5</Version>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes">
-      <Version>5.1.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Web.WebView2">
-      <Version>1.0.2903.40</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
     <PackageReference Include="NModbus">
       <Version>3.0.81</Version>
     </PackageReference>
     <PackageReference Include="ScottPlot">
-      <Version>5.0.47</Version>
+      <Version>5.0.56</Version>
     </PackageReference>
     <PackageReference Include="System.Data.SQLite">
       <Version>1.0.119</Version>
     </PackageReference>
     <PackageReference Include="System.Management">
-      <Version>9.0.0</Version>
+      <Version>9.0.8</Version>
     </PackageReference>
     <PackageReference Include="System.ObjectModel">
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="TouchSocket">
-      <Version>3.0.9</Version>
+      <Version>3.1.16</Version>
+    </PackageReference>
+    <PackageReference Include="TouchSocket.SerialPorts">
+      <Version>3.1.16</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -508,6 +543,11 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="lmage\IconParkExtend.png" />
+    <Resource Include="lmage\IconParkExtendR.png" />
+    <Resource Include="lmage\IconParkExtendY.png" />
+    <Resource Include="lmage\IconParkInfo.png" />
+    <Resource Include="lmage\IconParkUsbOne.png" />
     <Resource Include="lmage\00.png" />
     <Resource Include="lmage\1000-1.png" />
     <Resource Include="lmage\1000-2.png" />

UserClass/AsyncSerialPortClient.cs

@@ -0,0 +1,522 @@
+using Newtonsoft.Json;
+using ScottPlot.Plottables;
+using SunlightCentralizedControlManagement_SCCM_.View;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using TouchSocket.Core;
+using TouchSocket.SerialPorts;
+using TouchSocket.Sockets;
+using static SkiaSharp.HarfBuzz.SKShaper;
+using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace SunlightCentralizedControlManagement_SCCM_.UserClass
+{
+    public class AsyncSerialPortClient
+    {
+        public static string ClipBetween(string source, char startChar, char endChar, bool includeBounds = false)
+        {
+            if (string.IsNullOrEmpty(source))
+                return string.Empty;
+
+            int startIndex = source.IndexOf(startChar);
+            if (startIndex == -1) return string.Empty;
+
+            int endIndex = source.IndexOf(endChar, startIndex + 1);
+            if (endIndex == -1) return string.Empty;
+
+            if (includeBounds)
+            {
+                return source.Substring(startIndex, endIndex - startIndex + 1);
+            }
+            else
+            {
+                int contentStart = startIndex + 1;
+                int contentLength = endIndex - startIndex - 1;
+                return contentLength > 0 ? source.Substring(contentStart, contentLength) : string.Empty;
+            }
+        }
+
+        public static string PortCOM1 { get; set; }
+        public static string PortCOM2 { get; set; }
+        public static string PortCOM3 { get; set; }
+        public static string PortCOM4 { get; set; }
+
+        public static async Task PortClient(SerialPortClient portclient, string com, int BAUD)
+        {
+            //var client = new SerialPortClient();
+            portclient.Connecting = (client, e) => { return EasyTask.CompletedTask; };//即将连接到端口
+            portclient.Connected = (client, e) => { return EasyTask.CompletedTask; };//成功连接到端口
+            portclient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从端口断开连接。此处仅主动断开才有效。
+            portclient.Closed = (client, e) => { return EasyTask.CompletedTask; };//从端口断开连接，当连接不成功时不会触发。
+            portclient.Received = (client, e) =>
+            {
+                //接受重置事件状态
+                _responseEvent.Set();
+                string[] sArray = Regex.Split(e.ByteBlock.Span.ToString(Encoding.UTF8),
+                    @"\n", RegexOptions.IgnoreCase);
+
+                for (int i = 0; i < sArray.Length; i++)
+                {
+                    if (sArray[i].Length > 5)
+                    {
+                        string SYSAPI = sArray[i].Substring(0, 5);
+                        string Station = ClipBetween(sArray[i], '[', ']');
+                        string DAT = sArray[i].Substring(sArray[i].IndexOf("]") + 1);
+
+                        if (SYSAPI == "SC800")
+                        {
+                            try
+                            {
+                                Dictionary<string, object> _new = new Dictionary<string, object>();//缓存函数                  
+                                _new = JsonConvert.DeserializeObject<Dictionary<string, object>>(DAT);//反序列化
+                                lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                                {
+                                    DataRow drEmployee = MainWindowViewModel.Machines.Select("Station='" + Station + "' AND Serial = 'PORT1'").First();
+                                    drEmployee.BeginEdit();
+                                    drEmployee["State"] = "802";
+                                    drEmployee.EndEdit();
+                                    drEmployee.AcceptChanges();
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                LogGing.ERRDATA(ex); MainWindowViewModel.ERR_c++;
+                            }
+                        }
+                        else if (SYSAPI == "SC810")
+                        {
+                            try
+                            {
+                                DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                                Dictionary<string, object> _dat;
+                                _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+                                MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
+                                    "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
+                            }
+                            catch (Exception ex)
+                            {
+                                LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++;
+                            }
+                        }//回复的工单记录状态后就位111
+                        else if (SYSAPI == "SC811")
+                        {
+                            try
+                            {
+                                DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                                Dictionary<string, object> _dat;
+                                _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+                                MainWindowViewModel.SQLiteHelpers.Update("WorkorderSteps", new Dictionary<string, object> { { "Mode", 1 } },
+                                    "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "' AND Step ='" +
+                                    _dat.GetValue("Step") + "'", null);
+
+                                int x = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='" +
+                                     _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "' AND Mode <> '1'", null).Tables[0].Rows.Count;
+                                if (x == 0)
+                                {
+                                    MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 113 } },
+                                          "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
+                                }
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//回复的工单明细状态后就位113
+                        else if (SYSAPI == "SC812")
+                        {
+                            try
+                            {
+                                DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                                Dictionary<string, object> _dat;
+                                _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+                                MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 101 } },
+                                          "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//回复的工单设置状态后就位101
+                        else if (SYSAPI == "SC827")
+                        {
+                            try
+                            {
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//获取呼叫领料单
+                        else if (SYSAPI == "SC830")
+                        {
+                            try
+                            {
+                                Dictionary<string, object> _new = new Dictionary<string, object>();//缓存函数                  
+                                _new = JsonConvert.DeserializeObject<Dictionary<string, object>>(DAT);//反序列化
+                                string mac;
+                                lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                                {
+                                    DataRow drEmployee = MainWindowViewModel.Machines.Select("Station='" + Station + "' AND Serial = 'PORT1'").First();
+                                    mac = drEmployee["Name"].ToString();
+                                    drEmployee.BeginEdit();
+                                    drEmployee["ERR"] = _new.GetValue("ERR");
+                                    drEmployee["LOCK"] = _new.GetValue("LOCK");
+                                    drEmployee["Message"] = _new.GetValue("Status");
+                                    drEmployee["WorkOrder"] = _new.GetValue("Work");
+                                    drEmployee["Temperature"] = _new.GetValue("MTT");
+                                    drEmployee["WaterLevel"] = _new.GetValue("MTL");
+                                    drEmployee["Process"] = _new.GetValue("Process");
+                                    drEmployee["Step"] = _new.GetValue("Step");
+                                    drEmployee["UserButton"] = _new.GetValue("UserB");
+                                    if (_new.GetValue("InfoS").ToString() != "900")
+                                    { drEmployee["UserInfoStart"] = _new.GetValue("InfoS"); }
+                                    drEmployee["UserInfo"] = _new.GetValue("Info");
+                                    drEmployee["WORK_RUN"] = _new.GetValue("RUN");
+                                    drEmployee["RUN_STEPID"] = _new.GetValue("STEPID");
+                                    drEmployee["CALL"] = _new.GetValue("CALL");
+                                    drEmployee.EndEdit();
+                                    drEmployee.AcceptChanges();
+                                }
+
+                                if (_new.GetValue("Status").ToString() != "----------")
+                                {
+                                    Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数                                               
+                                    Chart_new.Add("WorkOrder", _new.GetValue("Work"));
+                                    //Chart_new.Add("Machine", mac);
+                                    //Chart_new.Add("Time", _new.GetValue("Time"));
+                                    Chart_new.Add("MST", _new.GetValue("MST"));
+                                    Chart_new.Add("MTT", _new.GetValue("MTT"));
+                                    Chart_new.Add("MTL", _new.GetValue("MTL"));
+                                    Chart_new.Add("MTH", _new.GetValue("MTH"));
+                                    Chart_new.Add("MUT", _new.GetValue("MUT"));
+                                    Chart_new.Add("STTA", _new.GetValue("STTA"));
+                                    Chart_new.Add("STLA", _new.GetValue("STLA"));
+                                    Chart_new.Add("STTB", _new.GetValue("STTB"));
+                                    Chart_new.Add("STLB", _new.GetValue("STLB"));
+                                    Chart_new.Add("STTC", _new.GetValue("STTC"));
+                                    Chart_new.Add("STLC", _new.GetValue("STLC"));
+
+                                    MainWindowViewModel.SQLiteChartAdress.InsertData("Chart", Chart_new);// 执行插入     
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++;
+                            }
+                        }//当前信息
+                        else if (SYSAPI == "SC831")
+                        {
+                            try
+                            {
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }
+                        else if (SYSAPI == "SC832")
+                        {
+                            try
+                            {
+                                MainWindowViewModel.MachineLOG = DAT;
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//当前细节信息
+                        else if (SYSAPI == "SC833")
+                        {
+                            try
+                            {
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//当前领料单信息
+                        else if (SYSAPI == "SC851")
+                        {
+                            try
+                            {
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//数字开关表
+                        else if (SYSAPI == "SC852")
+                        {
+                            try
+                            {
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//寄存器表
+                        else if (SYSAPI == "SC853")
+                        {
+                            try
+                            {
+
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//缓存表
+                        else if (SYSAPI == "SC854")
+                        {
+                            try
+                            {
+
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//程序设置表
+                        else if (SYSAPI == "SC855")
+                        {
+                            try
+                            {
+
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//系统设置表
+                        else if (SYSAPI == "SC859")
+                        {
+                            try
+                            {
+
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//信息
+                        else if (SYSAPI == "SC910")
+                        {
+                            try
+                            {
+
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//发布失败
+                        else if (SYSAPI == "SC911")
+                        {
+                            try
+                            {
+
+                            }
+                            catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                        }//细节错误
+                        else if (SYSAPI == "SC980")
+                        {
+
+                        }
+                    }
+                }
+
+                return EasyTask.CompletedTask; ;
+            };
+            await portclient.SetupAsync(new TouchSocketConfig()
+                .SetMaxBufferSize(1024 * 1024 * 10)
+                 .SetSerialPortOption(new SerialPortOption()
+                 {
+                     BaudRate = BAUD,//波特率
+                     DataBits = 8,//数据位
+                     Parity = System.IO.Ports.Parity.None,//校验位
+                     PortName = com,//COM
+                     StopBits = System.IO.Ports.StopBits.One,//停止位
+                 })
+                 .SetSerialDataHandlingAdapter(() => new PeriodPackageAdapter() { CacheTimeout = TimeSpan.FromMilliseconds(100) })
+                 .ConfigurePlugins(a =>
+                 {
+                     //a.Add<MyPlugin>();
+                 }
+                 ));
+            try
+            {
+                await portclient.ConnectAsync();
+            }
+            catch (Exception ex) { LogGing.ERRDATA(ex); }
+        }
+        public static async Task PortClient2(SerialPortClient portclient, string com, int BAUD)
+        {
+            //var client = new SerialPortClient();
+            portclient.Connecting = (client, e) => { return EasyTask.CompletedTask; };//即将连接到端口
+            portclient.Connected = (client, e) => { return EasyTask.CompletedTask; };//成功连接到端口
+            portclient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从端口断开连接。此处仅主动断开才有效。
+            portclient.Closed = (client, e) => { return EasyTask.CompletedTask; };//从端口断开连接，当连接不成功时不会触发。
+            portclient.Received = (client, e) =>
+            {
+                _responseEvent2.Set();
+                string[] sArray = Regex.Split(e.ByteBlock.Span.ToString(Encoding.UTF8),
+                    @"\n", RegexOptions.IgnoreCase);
+
+
+
+                return EasyTask.CompletedTask; ;
+            };
+            await portclient.SetupAsync(new TouchSocketConfig()
+                 .SetSerialPortOption(new SerialPortOption()
+                 {
+                     BaudRate = BAUD,//波特率
+                     DataBits = 8,//数据位
+                     Parity = System.IO.Ports.Parity.None,//校验位
+                     PortName = com,//COM
+                     StopBits = System.IO.Ports.StopBits.One,//停止位
+                 })
+                 .SetSerialDataHandlingAdapter(() => new PeriodPackageAdapter() { CacheTimeout = TimeSpan.FromMilliseconds(100) })
+                 .ConfigurePlugins(a =>
+                 {
+                     //a.Add<MyPlugin>();
+                 }));
+            try
+            {
+                await portclient.ConnectAsync();
+            }
+            catch (Exception ex) { LogGing.ERRDATA(ex); }
+        }
+        public static async Task PortClient3(SerialPortClient portclient, string com, int BAUD)
+        {
+            //var client = new SerialPortClient();
+            portclient.Connecting = (client, e) => { return EasyTask.CompletedTask; };//即将连接到端口
+            portclient.Connected = (client, e) => { return EasyTask.CompletedTask; };//成功连接到端口
+            portclient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从端口断开连接。此处仅主动断开才有效。
+            portclient.Closed = (client, e) => { return EasyTask.CompletedTask; };//从端口断开连接，当连接不成功时不会触发。
+            portclient.Received = (client, e) =>
+            {
+                _responseEvent3.Set();
+                string[] sArray = Regex.Split(e.ByteBlock.Span.ToString(Encoding.UTF8),
+                    @"\n", RegexOptions.IgnoreCase);
+
+
+
+                return EasyTask.CompletedTask; ;
+            };
+            await portclient.SetupAsync(new TouchSocketConfig()
+                 .SetSerialPortOption(new SerialPortOption()
+                 {
+                     BaudRate = BAUD,//波特率
+                     DataBits = 8,//数据位
+                     Parity = System.IO.Ports.Parity.None,//校验位
+                     PortName = com,//COM
+                     StopBits = System.IO.Ports.StopBits.One,//停止位
+                 })
+                 .SetSerialDataHandlingAdapter(() => new PeriodPackageAdapter() { CacheTimeout = TimeSpan.FromMilliseconds(100) })
+                 .ConfigurePlugins(a =>
+                 {
+                     //a.Add<MyPlugin>();
+                 }));
+            try
+            {
+                await portclient.ConnectAsync();
+            }
+            catch (Exception ex) { LogGing.ERRDATA(ex); }
+        }
+        public static async Task PortClient4(SerialPortClient portclient, string com, int BAUD)
+        {
+            //var client = new SerialPortClient();
+            portclient.Connecting = (client, e) => { return EasyTask.CompletedTask; };//即将连接到端口
+            portclient.Connected = (client, e) => { return EasyTask.CompletedTask; };//成功连接到端口
+            portclient.Closing = (client, e) => { return EasyTask.CompletedTask; };//即将从端口断开连接。此处仅主动断开才有效。
+            portclient.Closed = (client, e) => { return EasyTask.CompletedTask; };//从端口断开连接，当连接不成功时不会触发。
+            portclient.Received = (client, e) =>
+            {
+                _responseEvent4.Set();
+                string[] sArray = Regex.Split(e.ByteBlock.Span.ToString(Encoding.UTF8),
+                    @"\n", RegexOptions.IgnoreCase);
+
+                return EasyTask.CompletedTask; ;
+            };
+            await portclient.SetupAsync(new TouchSocketConfig()
+                 .SetSerialPortOption(new SerialPortOption()
+                 {
+                     BaudRate = BAUD,//波特率
+                     DataBits = 8,//数据位
+                     Parity = System.IO.Ports.Parity.None,//校验位
+                     PortName = com,//COM
+                     StopBits = System.IO.Ports.StopBits.One,//停止位
+                 })
+                 .SetSerialDataHandlingAdapter(() => new PeriodPackageAdapter() { CacheTimeout = TimeSpan.FromMilliseconds(500) })
+                 .ConfigurePlugins(a =>
+                 {
+                     //a.Add<MyPlugin>();
+                 }));
+            try
+            {
+                await portclient.ConnectAsync();
+            }
+            catch (Exception ex) { LogGing.ERRDATA(ex); }
+        }
+
+        public static readonly ManualResetEventSlim _responseEvent = new ManualResetEventSlim(false);
+        public static readonly ManualResetEventSlim _responseEvent2 = new ManualResetEventSlim(false);
+        public static readonly ManualResetEventSlim _responseEvent3 = new ManualResetEventSlim(false);
+        public static readonly ManualResetEventSlim _responseEvent4 = new ManualResetEventSlim(false);
+        /// <summary>
+        /// 发送指令并等待响应，超时时间为500ms
+        /// </summary>
+        /// <param name="command">要发送的指令字节数组</param>
+        /// <returns>从机的响应数据，超时则为null</returns>
+        public static void SendCommandAndWait(SerialPortClient serialPortClients, string command)
+        {
+            try
+            {
+                var t = CRCcheck16.ToCRC16(command);
+                _responseEvent.Reset();
+                serialPortClients.Send(command); // 发送指令
+
+                // 等待500毫秒或直到收到响应
+                if (!_responseEvent.Wait(TimeSpan.FromMilliseconds(1000)))
+                {
+                    _responseEvent.Set();
+                    //清楚了解状态
+                    string Station = ClipBetween(command, '[', ']');
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                    {
+                        DataRow drEmployee = MainWindowViewModel.Machines.Select("Station='" +
+                        Station + "' AND Serial = 'PORT1'").First();
+                        if (drEmployee.Field<int>("State") != 800)
+                        {
+                            drEmployee.BeginEdit();
+                            drEmployee["State"] = "800";
+                            drEmployee["WorkOrder"] = "------";
+                            drEmployee["Dyelot"] = "";
+                            drEmployee["Temperature"] = 0.0;
+                            drEmployee["WaterLevel"] = 0.0;
+                            drEmployee["Process"] = "";
+                            drEmployee["Step"] = "";
+                            drEmployee["Message"] = "";
+                            drEmployee["SYSKEY"] = "";
+                            drEmployee["WORK_RUN"] = "-1";
+                            drEmployee["ERR"] = false;
+                            drEmployee.EndEdit();
+                            drEmployee.AcceptChanges();
+                        }
+                    }
+                }
+            }
+            catch (Exception) { }
+        }
+        public static void SendCommandAndWait2(SerialPortClient serialPortClients, string command)
+        {
+            try
+            {
+                _responseEvent2.Reset();
+                serialPortClients.Send(command); // 发送指令
+                                                 // 等待500毫秒或直到收到响应
+                _responseEvent2.Wait(TimeSpan.FromMilliseconds(1000));
+                // 重置事件状态
+                _responseEvent2.Set();
+            }
+            catch (Exception) { }
+        }
+        public static void SendCommandAndWait3(SerialPortClient serialPortClients, string command)
+        {
+            try
+            {
+                _responseEvent3.Reset();
+                serialPortClients.Send(command); // 发送指令
+                                                 // 等待500毫秒或直到收到响应
+                _responseEvent3.Wait(TimeSpan.FromMilliseconds(1000));
+                // 重置事件状态                
+                _responseEvent3.Set();
+            }
+            catch (Exception) { }
+        }
+        public static void SendCommandAndWait4(SerialPortClient serialPortClients, string command)
+        {
+            try
+            {
+                _responseEvent4.Reset();
+                serialPortClients.Send(command); // 发送指令
+                                                 // 等待500毫秒或直到收到响应
+                _responseEvent4.Wait(TimeSpan.FromMilliseconds(1000));
+                // 重置事件状态           
+                _responseEvent4.Set();
+            }
+            catch (Exception) { }
+        }
+    }
+}

UserClass/AsyncTcpClient.cs

@@ -6,10 +6,12 @@ using ScottPlot.Colormaps;
 using SkiaSharp;
 using SunlightCentralizedControlManagement_SCCM_.View;
 using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using SunlightCentralizedControlManagement_SCCM_.WindowsView;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
 using System.Diagnostics;
 using System.Linq;
 using System.Net;
@@ -21,10 +23,13 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Documents;
 using System.Xml.Linq;
 using TouchSocket.Core;
+using TouchSocket.SerialPorts;
 using TouchSocket.Sockets;
 using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+using static SunlightCentralizedControlManagement_SCCM_.View.MachinesView;
 using static System.Windows.Forms.AxHost;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
@@ -36,9 +41,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
  /// </summary>
     public class AsyncTcpClient
     {       
-        private static SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        private static readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db";  //数据库路径
         public static async Task TcpClient(TcpClient tcpClient, string ip, string port)
         {
             //TcpClient tcpClient = new TcpClient();       
@@ -47,11 +49,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
             {
                 try
                 {
-                    DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
-                    drEmployee.BeginEdit();
-                    drEmployee["State"] = "801";
-                    drEmployee.EndEdit();
-                    drEmployee.AcceptChanges();
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                    {
+                        DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
+                        drEmployee.BeginEdit();
+                        drEmployee["State"] = "801";
+                        drEmployee.EndEdit();
+                        drEmployee.AcceptChanges();
+                    }
                     LogGing.LogGingDATA("[IP='" + client.IP + "' AND port='" + client.Port + "']=Link_OK");
                 }
                 catch (Exception ex)
@@ -65,20 +70,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
             {
                 try
                 {
-                    DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
-                    drEmployee.BeginEdit();
-                    drEmployee["State"] = "800";
-                    drEmployee["WorkOrder"] = "------";
-                    drEmployee["Dyelot"] = "";
-                    drEmployee["Temperature"] = "---.-";
-                    drEmployee["WaterLevel"] = "----";
-                    drEmployee["Process"] = "";
-                    drEmployee["Step"] = "";
-                    drEmployee["Message"] = "";
-                    drEmployee["SYSKEY"] = "";
-                    drEmployee["WORK_RUN"] = "-1";
-                    drEmployee.EndEdit();
-                    drEmployee.AcceptChanges();
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                    {
+                        DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
+                        drEmployee.BeginEdit();
+                        drEmployee["State"] = "800";
+                        drEmployee["WorkOrder"] = "------";
+                        drEmployee["Dyelot"] = "";
+                        drEmployee["Temperature"] = 0.0;
+                        drEmployee["WaterLevel"] = 0.0;
+                        drEmployee["Process"] = "";
+                        drEmployee["Step"] = "";
+                        drEmployee["Message"] = "";
+                        drEmployee["SYSKEY"] = "";
+                        drEmployee["WORK_RUN"] = "-1";
+                        drEmployee["ERR"] = false;
+                        drEmployee.EndEdit();
+                        drEmployee.AcceptChanges();
+                    }
                     LogGing.LogGingDATA("[IP='" + client.IP + "' AND port='" + client.Port + "']=Link_STOP");
                 }
                 catch (Exception ex)
@@ -91,20 +100,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
             {
                 try
                 {
-                    DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
-                    drEmployee.BeginEdit();
-                    drEmployee["State"] = "800";
-                    drEmployee["WorkOrder"] = "------";
-                    drEmployee["Dyelot"] = "";
-                    drEmployee["Temperature"] = "---.-";
-                    drEmployee["WaterLevel"] = "----";
-                    drEmployee["Process"] = "";
-                    drEmployee["Step"] = "";
-                    drEmployee["Message"] = "";
-                    drEmployee["SYSKEY"] = "";
-                    drEmployee["WORK_RUN"] = "-1";
-                    drEmployee.EndEdit();
-                    drEmployee.AcceptChanges();
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                    {
+                        DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
+                        drEmployee.BeginEdit();
+                        drEmployee["State"] = "800";
+                        drEmployee["WorkOrder"] = "------";
+                        drEmployee["Dyelot"] = "";
+                        drEmployee["Temperature"] = 0.0;
+                        drEmployee["WaterLevel"] = 0.0;
+                        drEmployee["Process"] = "";
+                        drEmployee["Step"] = "";
+                        drEmployee["Message"] = "";
+                        drEmployee["SYSKEY"] = "";
+                        drEmployee["WORK_RUN"] = "-1";
+                        drEmployee["ERR"] = false;
+                        drEmployee.EndEdit();
+                        drEmployee.AcceptChanges();
+                    }
                     LogGing.LogGingDATA("[IP='" + client.IP + "' AND port='" + client.Port + "']=Link_INTERRUPT");
                 }
                 catch (Exception ex)
@@ -125,14 +138,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
                         Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数                  
                         Chart_new = JsonConvert.DeserializeObject<Dictionary<string, object>>(DAT);//反序列化
-                        DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
-                        drEmployee.BeginEdit();
-                        drEmployee["SYSKEY"] = Chart_new.GetValue("SYSKEY").ToString();
-                      //  drEmployee["NAME"] = Chart_new.GetValue("MACHINE").ToString();
-                        drEmployee["Groups"] = Chart_new.GetValue("GROUP").ToString();
-                        drEmployee["State"] = "802";
-                        drEmployee.EndEdit();
-                        drEmployee.AcceptChanges();
+                        lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                        {
+                            DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
+                            drEmployee.BeginEdit();
+                            drEmployee["SYSKEY"] = Chart_new.GetValue("SYSKEY").ToString();
+                            //  drEmployee["NAME"] = Chart_new.GetValue("MACHINE").ToString();
+                            drEmployee["Groups"] = Chart_new.GetValue("GROUP").ToString();
+                            drEmployee["State"] = "802";
+                            drEmployee.EndEdit();
+                            drEmployee.AcceptChanges();
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -144,11 +160,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     try
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
-                        SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                        SQLiteHelpers.Open();  //打开数据库                                                    
-                        SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
+
+                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
                             "WorkOrder ='" + DAT + "'", null);
-                        SQLiteHelpers.Close();
+                   //     Dictionary<string, object> _dat;
+                //        _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+                //        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
+                //            "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null);
                     }
                     catch (Exception ex)
                     {
@@ -160,48 +178,139 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     try
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
-                        SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                        SQLiteHelpers.Open();  //打开数据库                                                    
-                        SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 101 } },
+
+                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 111 } },
                             "WorkOrder ='" + DAT + "'", null);
-                        SQLiteHelpers.Close();
+               //         Dictionary<string, object> _dat;
+              //          _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
+             //           MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 113 } },
+             //               "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='"+ _dat.GetValue("ReDye") + "'", null);
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }
+                else if (SYSAPI == "SC812")
+                {
+                    try
+                    {
+                        DAT = DAT.Substring(DAT.IndexOf("]") + 1);                                               
+                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 101 } },
+                            "WorkOrder ='" + DAT + "'", null);
+                    }
+                    catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                }
+                else if (SYSAPI == "SC822")
+                {
+                    try
+                    {
+                        DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                        DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(DAT).Copy();//反序列化
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            UserWorkOrder userWorkOrder = new UserWorkOrder();
+                            userWorkOrder.WorkOrderTable = dataTable;
+                            userWorkOrder.Show();
+                        });
+                    }
+                    catch (Exception)
+                    {
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            UserInf userInf = new UserInf();
+                            userInf.Inf_DAT = "没有等待中的工艺";
+                            userInf.Show();
+                            userInf.Activate();
+                        });
+
+                        // LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); 
+                        MainWindowViewModel.ERR_c++;
+                    }
+                }
+                else if (SYSAPI == "SC827")
+                {
+                    try
+                    {
+                        DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                        DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
+
+                        foreach (DataRow sourceRow in dataTable.Rows)
+                        {
+                            lock (MainWindowViewModel.Dyelot_CALL.Rows.SyncRoot)
+                            {
+                                // 创建新行（基于目标表结构）
+                                DataRow newRow = MainWindowViewModel.Dyelot_CALL.NewRow();
+                                // 复制源表中存在的列数据
+                                foreach (DataColumn column in dataTable.Columns)
+                                {
+                                    if (MainWindowViewModel.Dyelot_CALL.Columns.Contains(column.ColumnName))
+                                    {
+                                        newRow[column.ColumnName] = sourceRow[column.ColumnName];
+                                    }
+                                }
+                                MainWindowViewModel.Dyelot_CALL.Rows.Add(newRow);
+
+                                Dictionary<string, object> Product_ = new Dictionary<string, object>();//缓存函数
+                                Product_.Add("State", 202);
+                                Product_.Add("Dyelot", newRow.Field<string>("Dyelot"));
+                                Product_.Add("Step", newRow.Field<int>("Step"));
+                                Product_.Add("ProductCode", newRow.Field<string>("ProductCode"));
+                                Product_.Add("Amount", newRow.Field<object>("Amount"));
+                                Product_.Add("DispenseEndTime", newRow.Field<object>("DispenseEndTime"));
+
+                                newRow.BeginEdit();
+                                newRow["State"] = 202;
+                                newRow.EndEdit();
+
+                                MainWindowViewModel.SQLiteHelpers.InsertData("DyelotHistory", MainWindowViewModel.SQLiteHelpers.ToDictionary(newRow));// 执行插入                                                       
+                                MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                                {
+                                    ID = Convert.ToInt16(MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines,
+                                    "ID", "Name='" + newRow.Field<string>("Machine") + "'")),
+                                    DAT = "SC828" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines,
+                                    "SYSKEY", "Name='" + newRow.Field<string>("Machine") + "'") + Product_.ToJsonString()
+                                });
+                            }
+                        }
+                    }
+                   catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                }//获取呼叫领料单
                 else if (SYSAPI == "SC830")
                 {
                     try
                     {
-
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
                         Dictionary<string, object> _new = new Dictionary<string, object>();//缓存函数                  
                         _new = JsonConvert.DeserializeObject<Dictionary<string, object>>(DAT);//反序列化
-                        DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
-                        drEmployee.BeginEdit();
-                        drEmployee["ERR"] = _new.GetValue("ERR");
-                        drEmployee["LOCK"] = _new.GetValue("LOCK");
-                        drEmployee["Message"] = _new.GetValue("Status");
-                        drEmployee["WorkOrder"] = _new.GetValue("WorkNumder");
-                        drEmployee["Temperature"] = _new.GetValue("MTT");
-                        drEmployee["WaterLevel"] = _new.GetValue("MTL");
-                        drEmployee["Process"] = _new.GetValue("Process");
-                        drEmployee["Step"] = _new.GetValue("Step");
-                        drEmployee["UserButton"] = _new.GetValue("UserButton");
-                        if (_new.GetValue("UserInfoStart").ToString() != "900")
-                        { drEmployee["UserInfoStart"] = _new.GetValue("UserInfoStart"); }
-                        drEmployee["UserInfo"] = _new.GetValue("UserInfo");
-                        drEmployee["WORK_RUN"] = _new.GetValue("WORK_RUN");
-                        drEmployee["RUN_STEPID"] = _new.GetValue("RUN_STEPID");
-                        drEmployee["CALL"] = _new.GetValue("CALL");
-                        drEmployee.EndEdit();
-                        drEmployee.AcceptChanges();
-
+                        string mac;
+                        // 首先确保 DataTable 使用线程安全的访问方式
+                        lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                        {
+                            DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
+                            mac = drEmployee["Name"].ToString();
+                            drEmployee.BeginEdit();
+                            drEmployee["ERR"] = _new.GetValue("ERR");
+                            drEmployee["LOCK"] = _new.GetValue("LOCK");
+                            drEmployee["Message"] = _new.GetValue("Status");
+                            drEmployee["WorkOrder"] = _new.GetValue("WorkNumder");
+                            drEmployee["Temperature"] = _new.GetValue("MTT");
+                            drEmployee["WaterLevel"] = _new.GetValue("MTL");
+                            drEmployee["Process"] = _new.GetValue("Process");
+                            drEmployee["Step"] = _new.GetValue("Step");
+                            drEmployee["UserButton"] = _new.GetValue("UserButton");
+                            if (_new.GetValue("UserInfoStart").ToString() != "900")
+                            { drEmployee["UserInfoStart"] = _new.GetValue("UserInfoStart"); }
+                            drEmployee["UserInfo"] = _new.GetValue("UserInfo");
+                            drEmployee["WORK_RUN"] = _new.GetValue("WORK_RUN");
+                            drEmployee["RUN_STEPID"] = _new.GetValue("RUN_STEPID");
+                            drEmployee["CALL"] = _new.GetValue("CALL");
+                            drEmployee.EndEdit();
+                            drEmployee.AcceptChanges();
+                        }
                         if (_new.GetValue("Status").ToString() != "----------")
                         {
                             Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数                                               
                             Chart_new.Add("WorkOrder", _new.GetValue("WorkNumder"));
-                            Chart_new.Add("Machine", _new.GetValue("Machine"));
-                            Chart_new.Add("Time", _new.GetValue("Time"));
+                            Chart_new.Add("Machine", mac);
+                            Chart_new.Add("Time", DateTime.Now.ToString("yyyy/MM/dd  HH:mm:ss"));
                             Chart_new.Add("MST", _new.GetValue("MST"));
                             Chart_new.Add("MTT", _new.GetValue("MTT"));
                             Chart_new.Add("MTL", _new.GetValue("MTL"));
@@ -214,10 +323,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                             Chart_new.Add("STTC", _new.GetValue("STTC"));
                             Chart_new.Add("STLC", _new.GetValue("STLC"));
 
-                            SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
-                            SQLiteHelpers.Open();  //打开数据库
-                            SQLiteHelpers.InsertData("Chart", Chart_new);// 执行插入                                                     
-                            SQLiteHelpers.Close();
+                            MainWindowViewModel.SQLiteChartAdress.InsertData("Chart", Chart_new);// 执行插入     
                         }
 
                     }
@@ -231,7 +337,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                         MainWindowViewModel.dt_TP = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
-                }
+                }//步骤信息
                 else if (SYSAPI == "SC832")
                 {
                     try
@@ -246,7 +352,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
                         MonitorView.Product_DAT = JsonConvert.DeserializeObject<DataTable>(DAT).Copy();//反序列化
-                       MonitorView.Product_bool=true;
+                        MonitorView.Product_bool = true;
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }//当前领料单信息
@@ -295,15 +401,22 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }//系统设置表
+                else if (SYSAPI == "SC859")
+                {
+                    try
+                    {
+                        DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                        MachinesView.LOG_dataTable = JsonConvert.DeserializeObject<DataTable>(DAT);//反序列化
+                    }
+                    catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                }//信息
                 else if (SYSAPI == "SC910")
                 {
                     try
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
-                        SQLiteHelpers.Open();  //打开数据库                                                    
-                        SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 109 } },
+                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 109 } },
                             "WorkOrder ='" + DAT + "'", null);
-                        SQLiteHelpers.Close();
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }//发布失败
@@ -312,13 +425,19 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     try
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
-                        SQLiteHelpers.Open();  //打开数据库                                                    
-                        SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 119 } },
+                        MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 119 } },
                             "WorkOrder ='" + DAT + "'", null);
-                        SQLiteHelpers.Close();
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }//细节错误
+                else if (SYSAPI == "SC921")
+                {
+                    try
+                    {
+                        DAT = DAT.Substring(DAT.IndexOf("]") + 1);                        
+                    }
+                    catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                }//错误
                 else if (SYSAPI == "SC980")
                 {
                     DAT = DAT.Substring(DAT.IndexOf("]") + 1);
@@ -330,41 +449,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
 
             //载入配置
             await tcpClient.SetupAsync(new TouchSocketConfig()
-                .SetMaxBufferSize(1024*1024)
-                .SetMinBufferSize(1024*64)
+                .SetMaxBufferSize(1024* 1024*100)
+                .SetMinBufferSize(1024*1024)
                   .SetRemoteIPHost(ip + ":" + port)
                   .ConfigurePlugins(a =>
                   {
-                      a.UseCheckClear()
-                      .SetCheckClearType(CheckClearType.All)
-                      .SetTick(TimeSpan.FromSeconds(60))                      
-                      .SetOnClose((c, t) =>
-                      {
-                          c.TryShutdown();
-                      });
-                      a.UseTcpReconnection();//触发型重连
+                      //使用Polling轮询连接插件
+                      a.UseTcpReconnection()  
+                      .UsePolling(TimeSpan.FromSeconds(5));
                   })             
                   .ConfigureContainer(a =>
                   {
-                      // a.AddConsoleLogger();//添加一个日志注入
-                  }));
 
-            // Result result = await 
-            _ = tcpClient.TryConnectAsync();
-            //  return result.IsSuccess;
-            /*   try
-               {
-                   await tcpClient.ConnectAsync();//调用连接，当连接不成功时，会抛出异常。
-                   return true;
-               }
-               catch 
-               {
-                   return false;
-               }*/
+                  }
+                  ));
+
+            await tcpClient.TryConnectAsync();
+
         }
-
- 
-
     }
 
 }

UserClass/DataTableManager .cs

@@ -0,0 +1,360 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SunlightCentralizedControlManagement_SCCM_.UserClass
+{
+    /// <summary>
+    /// 线程安全的 DataTable 管理器
+    /// 提供对 DataTable 的安全并发访问
+    /// </summary>
+    public class DataTableManager : IDisposable
+    {
+        private DataTable _dataTable;
+        private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
+        private bool _disposed = false;
+
+        #region 构造函数
+        public DataTableManager()
+        {
+            _dataTable = new DataTable();
+        }
+
+        public DataTableManager(DataTable dataTable)
+        {
+            _dataTable = dataTable ?? throw new ArgumentNullException(nameof(dataTable));
+        }
+
+        public DataTableManager(string tableName)
+        {
+            _dataTable = new DataTable(tableName);
+        }
+        #endregion
+
+        #region 基本操作
+        /// <summary>
+        /// 安全地添加列
+        /// </summary>
+        public void AddColumn(string columnName, Type dataType)
+        {
+            ExecuteWriteOperation(table =>
+            {
+                table.Columns.Add(columnName, dataType);
+            });
+        }
+
+        /// <summary>
+        /// 安全地添加行
+        /// </summary>
+        public void AddRow(params object[] values)
+        {
+            ExecuteWriteOperation(table =>
+            {
+                DataRow newRow = table.NewRow();
+                for (int i = 0; i < Math.Min(values.Length, table.Columns.Count); i++)
+                {
+                    newRow[i] = values[i] ?? DBNull.Value;
+                }
+                table.Rows.Add(newRow);
+            });
+        }
+
+        /// <summary>
+        /// 安全地更新单元格值
+        /// </summary>
+        public bool UpdateCell(int rowIndex, string columnName, object value)
+        {
+            return ExecuteWriteOperation(table =>
+            {
+                if (IsValidRowIndex(table, rowIndex) && table.Columns.Contains(columnName))
+                {
+                    table.Rows[rowIndex][columnName] = value ?? DBNull.Value;
+                    return true;
+                }
+                return false;
+            });
+        }
+
+        /// <summary>
+        /// 安全地删除行
+        /// </summary>
+        public bool DeleteRow(int rowIndex)
+        {
+            return ExecuteWriteOperation(table =>
+            {
+                if (IsValidRowIndex(table, rowIndex))
+                {
+                    table.Rows[rowIndex].Delete();
+                    return true;
+                }
+                return false;
+            });
+        }
+        #endregion
+
+        #region 查询操作
+        /// <summary>
+        /// 安全地获取行
+        /// </summary>
+        public DataRow GetRow(int rowIndex)
+        {
+            return ExecuteReadOperation(table =>
+            {
+                return IsValidRowIndex(table, rowIndex) ? table.Rows[rowIndex] : null;
+            });
+        }
+
+        /// <summary>
+        /// 安全地查找行（使用筛选条件）
+        /// </summary>
+        public DataRow[] FindRows(string filterExpression)
+        {
+            return ExecuteReadOperation(table =>
+            {
+                try
+                {
+                    return string.IsNullOrEmpty(filterExpression)
+                        ? table.Select()
+                        : table.Select(filterExpression);
+                }
+                catch (EvaluateException)
+                {
+                    return new DataRow[0];
+                }
+            });
+        }
+
+        /// <summary>
+        /// 安全地获取行数
+        /// </summary>
+        public int GetRowCount()
+        {
+            return ExecuteReadOperation(table => table.Rows.Count);
+        }
+
+        /// <summary>
+        /// 安全地检查行是否存在
+        /// </summary>
+        public bool RowExists(int rowIndex)
+        {
+            return ExecuteReadOperation(table => IsValidRowIndex(table, rowIndex));
+        }
+        #endregion
+
+        #region 批量操作
+        /// <summary>
+        /// 安全地批量添加行
+        /// </summary>
+        public void BulkAddRows(IEnumerable<object[]> rowsData)
+        {
+            ExecuteWriteOperation(table =>
+            {
+                foreach (var rowData in rowsData)
+                {
+                    DataRow newRow = table.NewRow();
+                    for (int i = 0; i < Math.Min(rowData.Length, table.Columns.Count); i++)
+                    {
+                        newRow[i] = rowData[i] ?? DBNull.Value;
+                    }
+                    table.Rows.Add(newRow);
+                }
+            });
+        }
+
+        /// <summary>
+        /// 安全地清空所有数据
+        /// </summary>
+        public void Clear()
+        {
+            ExecuteWriteOperation(table =>
+            {
+                table.Clear();
+            });
+        }
+        #endregion
+
+        #region 数据导出
+        /// <summary>
+        /// 获取数据快照（线程安全的副本）
+        /// </summary>
+        public DataTable GetSnapshot()
+        {
+            return ExecuteReadOperation(table =>
+            {
+                return table.Copy(); // 创建数据的独立副本
+            });
+        }
+
+        /// <summary>
+        /// 获取只读视图
+        /// </summary>
+        public DataView GetReadOnlyView()
+        {
+            return ExecuteReadOperation(table =>
+            {
+                return new DataView(table) { AllowEdit = false };
+            });
+        }
+
+        /// <summary>
+        /// 导出到新 DataTable（包含结构）
+        /// </summary>
+        public DataTable ExportToDataTable()
+        {
+            return ExecuteReadOperation(table =>
+            {
+                DataTable exported = table.Clone();
+                exported.Merge(table, false, MissingSchemaAction.Add);
+                return exported;
+            });
+        }
+        #endregion
+
+        #region 锁操作核心
+        /// <summary>
+        /// 执行读取操作（共享锁）
+        /// </summary>
+        private T ExecuteReadOperation<T>(Func<DataTable, T> operation)
+        {
+            _lock.EnterReadLock();
+            try
+            {
+                return operation(_dataTable);
+            }
+            finally
+            {
+                _lock.ExitReadLock();
+            }
+        }
+
+        /// <summary>
+        /// 执行写入操作（独占锁）
+        /// </summary>
+        private void ExecuteWriteOperation(Action<DataTable> operation)
+        {
+            _lock.EnterWriteLock();
+            try
+            {
+                operation(_dataTable);
+                _dataTable.AcceptChanges();
+            }
+            finally
+            {
+                _lock.ExitWriteLock();
+            }
+        }
+
+        private T ExecuteWriteOperation<T>(Func<DataTable, T> operation)
+        {
+            _lock.EnterWriteLock();
+            try
+            {
+                var result = operation(_dataTable);
+                _dataTable.AcceptChanges();
+                return result;
+            }
+            finally
+            {
+                _lock.ExitWriteLock();
+            }
+        }
+
+        private bool IsValidRowIndex(DataTable table, int rowIndex)
+        {
+            return rowIndex >= 0 && rowIndex < table.Rows.Count;
+        }
+        #endregion
+
+        #region 高级功能
+        /// <summary>
+        /// 带超时的安全操作
+        /// </summary>
+        public bool TryUpdateCell(int rowIndex, string columnName, object value, int timeoutMs = 5000)
+        {
+            if (_lock.TryEnterWriteLock(timeoutMs))
+            {
+                try
+                {
+                    if (IsValidRowIndex(_dataTable, rowIndex) && _dataTable.Columns.Contains(columnName))
+                    {
+                        _dataTable.Rows[rowIndex][columnName] = value ?? DBNull.Value;
+                        _dataTable.AcceptChanges();
+                        return true;
+                    }
+                    return false;
+                }
+                finally
+                {
+                    _lock.ExitWriteLock();
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 执行事务性操作
+        /// </summary>
+        public void ExecuteTransaction(Action<DataTable> transaction)
+        {
+            _lock.EnterWriteLock();
+            try
+            {
+                // 开始事务
+                _dataTable.BeginLoadData();
+
+                try
+                {
+                    transaction(_dataTable);
+                    _dataTable.AcceptChanges();
+                }
+                catch
+                {
+                    _dataTable.RejectChanges();
+                    throw;
+                }
+                finally
+                {
+                    _dataTable.EndLoadData();
+                }
+            }
+            finally
+            {
+                _lock.ExitWriteLock();
+            }
+        }
+        #endregion
+
+        #region 属性和清理
+        public string TableName
+        {
+            get => ExecuteReadOperation(table => table.TableName);
+            set => ExecuteWriteOperation(table => table.TableName = value);
+        }
+
+        public DataColumnCollection Columns
+        {
+            get => ExecuteReadOperation(table => table.Columns);
+        }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _lock?.Dispose();
+                _dataTable?.Dispose();
+                _disposed = true;
+            }
+            GC.SuppressFinalize(this);
+        }
+
+        ~DataTableManager()
+        {
+            Dispose();
+        }
+        #endregion
+    }
+}

UserClass/RS485MasterStation.cs

@@ -0,0 +1,617 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using TouchSocket.Core;
+using TouchSocket.SerialPorts;
+using TouchSocket.Sockets;
+
+namespace SunlightCentralizedControlManagement_SCCM_.UserClass
+{
+    #region 基础数据结构
+    /// <summary>
+    /// 485 设备地址
+    /// </summary>
+    public struct DeviceAddress
+    {
+        public byte Value { get; }
+
+        public DeviceAddress(byte address)
+        {
+            if (address == 0) throw new ArgumentException("设备地址不能为0(广播地址)");
+            Value = address;
+        }
+
+        public static implicit operator byte(DeviceAddress address) => address.Value;
+        public static implicit operator DeviceAddress(byte address) => new DeviceAddress(address);
+
+        public override string ToString() => $"0x{Value:X2}";
+    }
+
+    /// <summary>
+    /// 485 命令帧
+    /// </summary>
+    public class CommandFrame
+    {
+        public DeviceAddress DeviceAddress { get; set; }
+        public byte FunctionCode { get; set; }
+        public byte[] Data { get; set; }
+        public ushort CRC { get; set; }
+
+        public byte[] ToBytes()
+        {
+            // 实现帧序列化逻辑，包括CRC计算
+            var dataLength = Data?.Length ?? 0;
+            var frame = new byte[3 + dataLength + 2]; // 地址+功能码+数据+CRC
+
+            frame[0] = DeviceAddress;
+            frame[1] = FunctionCode;
+
+            if (dataLength > 0)
+                Array.Copy(Data, 0, frame, 2, dataLength);
+
+            // 计算CRC (这里使用Modbus CRC算法示例)
+            CRC = CalculateCRC(frame, 0, frame.Length - 2);
+            frame[frame.Length - 2] = (byte)(CRC & 0xFF);
+            frame[frame.Length - 1] = (byte)(CRC >> 8);
+
+            return frame;
+        }
+
+        private ushort CalculateCRC(byte[] data, int offset, int length)
+        {
+            // 简化的CRC计算示例，实际应根据协议实现
+            ushort crc = 0xFFFF;
+            for (int i = offset; i < offset + length; i++)
+            {
+                crc ^= data[i];
+                for (int j = 0; j < 8; j++)
+                {
+                    if ((crc & 0x0001) != 0)
+                    {
+                        crc >>= 1;
+                        crc ^= 0xA001;
+                    }
+                    else
+                    {
+                        crc >>= 1;
+                    }
+                }
+            }
+            return crc;
+        }
+    }
+
+    /// <summary>
+    /// 响应帧
+    /// </summary>
+    public class ResponseFrame
+    {
+        public DeviceAddress DeviceAddress { get; set; }
+        public byte FunctionCode { get; set; }
+        public byte[] Data { get; set; }
+        public ushort CRC { get; set; }
+        public bool IsValid { get; set; }
+        public string Error { get; set; }
+
+        public static ResponseFrame FromBytes(byte[] data)
+        {
+            // 实现帧解析逻辑，包括CRC验证
+            var frame = new ResponseFrame();
+
+            if (data.Length < 4) // 最小帧长度
+            {
+                frame.IsValid = false;
+                frame.Error = "帧长度不足";
+                return frame;
+            }
+
+            frame.DeviceAddress = data[0];
+            frame.FunctionCode = data[1];
+
+            // 检查CRC
+            ushort receivedCRC = (ushort)(data[data.Length - 1] << 8 | data[data.Length - 2]);
+            ushort calculatedCRC = CalculateCRC(data, 0, data.Length - 2);
+
+            if (receivedCRC != calculatedCRC)
+            {
+                frame.IsValid = false;
+                frame.Error = "CRC校验失败";
+                return frame;
+            }
+
+            // 提取数据部分
+            if (data.Length > 4)
+            {
+                frame.Data = new byte[data.Length - 4];
+                Array.Copy(data, 2, frame.Data, 0, frame.Data.Length);
+            }
+
+            frame.IsValid = true;
+            return frame;
+        }
+
+        private static ushort CalculateCRC(byte[] data, int offset, int length)
+        {
+            // 与CommandFrame相同的CRC算法
+            ushort crc = 0xFFFF;
+            for (int i = offset; i < offset + length; i++)
+            {
+                crc ^= data[i];
+                for (int j = 0; j < 8; j++)
+                {
+                    if ((crc & 0x0001) != 0)
+                    {
+                        crc >>= 1;
+                        crc ^= 0xA001;
+                    }
+                    else
+                    {
+                        crc >>= 1;
+                    }
+                }
+            }
+            return crc;
+        }
+    }
+
+    /// <summary>
+    /// 通信任务
+    /// </summary>
+    public class CommunicationTask
+    {
+        public DeviceAddress DeviceAddress { get; set; }
+        public CommandFrame Command { get; set; }
+        public TaskCompletionSource<ResponseFrame> CompletionSource { get; set; }
+        public int TimeoutMs { get; set; } = 1000;
+        public int RetryCount { get; set; } = 3;
+    }
+#endregion
+
+    #region 异常类
+    public class RS485CommunicationException : Exception
+    {
+        public DeviceAddress DeviceAddress { get; }
+        public byte FunctionCode { get; }
+
+        public RS485CommunicationException(DeviceAddress address, byte functionCode, string message)
+            : base($"设备 {address} 功能码 0x{functionCode:X2} 通信失败: {message}")
+        {
+            DeviceAddress = address;
+            FunctionCode = functionCode;
+        }
+    }
+
+    public class RS485TimeoutException : RS485CommunicationException
+    {
+        public RS485TimeoutException(DeviceAddress address, byte functionCode)
+            : base(address, functionCode, "响应超时")
+        {
+        }
+    }
+
+    public class RS485CRCException : RS485CommunicationException
+    {
+        public RS485CRCException(DeviceAddress address, byte functionCode)
+            : base(address, functionCode, "CRC校验失败")
+        {
+        }
+    }
+    #endregion
+
+    #region 主站实现
+    /// <summary>
+    /// 485 主站实现
+    /// </summary>
+    public class RS485MasterStation : IDisposable
+    {
+        private readonly SerialPortClient _serialPortClient;
+        private readonly ConcurrentDictionary<DeviceAddress, DeviceState> _deviceStates;
+        private readonly ConcurrentQueue<CommunicationTask> _taskQueue;
+        private readonly CancellationTokenSource _cancellationTokenSource;
+        private Task _processingTask;
+        private bool _isDisposed = false;
+
+        // 响应超时时间（毫秒）
+        public int ResponseTimeout { get; set; } = 1000;
+
+        // 帧间延迟（毫秒）
+        public int InterFrameDelay { get; set; } = 10;
+
+        // 最大重试次数
+        public int MaxRetries { get; set; } = 3;
+
+        /// <summary>
+        /// 设备状态
+        /// </summary>
+        private class DeviceState
+        {
+            public DeviceAddress Address { get; set; }
+            public DateTime LastCommunication { get; set; }
+            public bool IsOnline { get; set; }
+            public int TimeoutCount { get; set; }
+        }
+
+        public RS485MasterStation(string portName, int baudRate = 9600)
+        {
+            _serialPortClient = new SerialPortClient();
+            _deviceStates = new ConcurrentDictionary<DeviceAddress, DeviceState>();
+            _taskQueue = new ConcurrentQueue<CommunicationTask>();
+            _cancellationTokenSource = new CancellationTokenSource();
+
+            // 配置串口
+            _serialPortClient.Setup(new TouchSocketConfig()
+                .SetSerialPortOption(new SerialPortOption()
+                {
+                    PortName = portName,
+                    BaudRate = baudRate,
+                    DataBits = 8,
+                    Parity = Parity.None,
+                    StopBits = StopBits.One
+                }));
+
+            // 注册数据接收事件
+            _serialPortClient.Received = OnDataReceived;
+        }
+
+        /// <summary>
+        /// 启动主站
+        /// </summary>
+        public void Start()
+        {
+            _serialPortClient.Connect();
+            _processingTask = Task.Run(ProcessQueue, _cancellationTokenSource.Token);
+            Console.WriteLine("485主站已启动");
+        }
+
+        /// <summary>
+        /// 停止主站
+        /// </summary>
+        public void Stop()
+        {
+            _cancellationTokenSource.Cancel();
+            _serialPortClient.Close();
+            Console.WriteLine("485主站已停止");
+        }
+
+        /// <summary>
+        /// 添加设备到监控列表
+        /// </summary>
+        public void AddDevice(DeviceAddress address)
+        {
+            _deviceStates[address] = new DeviceState
+            {
+                Address = address,
+                LastCommunication = DateTime.MinValue,
+                IsOnline = false,
+                TimeoutCount = 0
+            };
+            Console.WriteLine($"已添加设备: {address}");
+        }
+
+        /// <summary>
+        /// 从监控列表移除设备
+        /// </summary>
+        public void RemoveDevice(DeviceAddress address)
+        {
+            _deviceStates.TryRemove(address, out _);
+            Console.WriteLine($"已移除设备: {address}");
+        }
+
+        /// <summary>
+        /// 发送命令到设备
+        /// </summary>
+        public Task<ResponseFrame> SendCommandAsync(DeviceAddress address, byte functionCode, byte[] data = null, int timeoutMs = 1000, int retryCount = 3)
+        {
+            var command = new CommandFrame
+            {
+                DeviceAddress = address,
+                FunctionCode = functionCode,
+                Data = data ?? new byte[0]
+            };
+
+            var task = new CommunicationTask
+            {
+                DeviceAddress = address,
+                Command = command,
+                CompletionSource = new TaskCompletionSource<ResponseFrame>(),
+                TimeoutMs = timeoutMs,
+                RetryCount = retryCount
+            };
+
+            _taskQueue.Enqueue(task);
+            return task.CompletionSource.Task;
+        }
+
+        /// <summary>
+        /// 读取保持寄存器
+        /// </summary>
+        public async Task<byte[]> ReadHoldingRegistersAsync(DeviceAddress address, ushort startAddress, ushort numberOfRegisters)
+        {
+            var data = new byte[4];
+            data[0] = (byte)(startAddress >> 8);    // 起始地址高字节
+            data[1] = (byte)(startAddress & 0xFF);  // 起始地址低字节
+            data[2] = (byte)(numberOfRegisters >> 8); // 寄存器数量高字节
+            data[3] = (byte)(numberOfRegisters & 0xFF); // 寄存器数量低字节
+
+            var response = await SendCommandAsync(address, 0x03, data);
+
+            if (!response.IsValid)
+                throw new RS485CommunicationException(address, 0x03, response.Error);
+
+            return response.Data;
+        }
+
+        /// <summary>
+        /// 写入单个寄存器
+        /// </summary>
+        public async Task WriteSingleRegisterAsync(DeviceAddress address, ushort registerAddress, ushort value)
+        {
+            var data = new byte[4];
+            data[0] = (byte)(registerAddress >> 8);    // 寄存器地址高字节
+            data[1] = (byte)(registerAddress & 0xFF);  // 寄存器地址低字节
+            data[2] = (byte)(value >> 8);              // 值高字节
+            data[3] = (byte)(value & 0xFF);            // 值低字节
+
+            var response = await SendCommandAsync(address, 0x06, data);
+
+            if (!response.IsValid)
+                throw new RS485CommunicationException(address, 0x06, response.Error);
+        }
+
+        /// <summary>
+        /// 处理任务队列
+        /// </summary>
+        private async Task ProcessQueue()
+        {
+            while (!_cancellationTokenSource.Token.IsCancellationRequested)
+            {
+                if (_taskQueue.TryDequeue(out var task))
+                {
+                    await ProcessTask(task);
+                }
+                else
+                {
+                    // 队列为空，执行设备轮询
+                    await PollDevices();
+                    await Task.Delay(100, _cancellationTokenSource.Token); // 短暂休眠
+                }
+            }
+        }
+
+        /// <summary>
+        /// 处理单个通信任务
+        /// </summary>
+        private async Task ProcessTask(CommunicationTask task)
+        {
+            int retryCount = 0;
+            ResponseFrame response = null;
+
+            while (retryCount < task.RetryCount && !_cancellationTokenSource.Token.IsCancellationRequested)
+            {
+                try
+                {
+                    // 发送命令
+                    var commandData = task.Command.ToBytes();
+                    _serialPortClient.Send(commandData);
+
+                    // 等待响应
+                    var timeoutTask = Task.Delay(task.TimeoutMs, _cancellationTokenSource.Token);
+                    var responseTask = task.CompletionSource.Task;
+
+                    var completedTask = await Task.WhenAny(responseTask, timeoutTask);
+
+                    if (completedTask == responseTask)
+                    {
+                        response = await responseTask;
+                        if (response.IsValid)
+                        {
+                            UpdateDeviceState(task.DeviceAddress, true);
+                            task.CompletionSource.SetResult(response);
+                            return;
+                        }
+                        else
+                        {
+                            throw new RS485CRCException(task.DeviceAddress, task.Command.FunctionCode);
+                        }
+                    }
+                    else
+                    {
+                        throw new RS485TimeoutException(task.DeviceAddress, task.Command.FunctionCode);
+                    }
+                }
+                catch (RS485CommunicationException ex)
+                {
+                    retryCount++;
+                    UpdateDeviceState(task.DeviceAddress, false);
+
+                    if (retryCount >= task.RetryCount)
+                    {
+                        task.CompletionSource.SetException(ex);
+                        return;
+                    }
+
+                    // 等待一段时间后重试
+                    await Task.Delay(InterFrameDelay, _cancellationTokenSource.Token);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 轮询所有设备状态
+        /// </summary>
+        private async Task PollDevices()
+        {
+            foreach (var deviceState in _deviceStates.Values.ToList())
+            {
+                // 检查设备是否需要轮询（例如，超过一定时间未通信）
+                if ((DateTime.Now - deviceState.LastCommunication).TotalSeconds > 30)
+                {
+                    try
+                    {
+                        // 发送诊断命令（如读取设备状态）
+                        await ReadHoldingRegistersAsync(deviceState.Address, 0, 1);
+                        Console.WriteLine($"设备 {deviceState.Address} 轮询成功");
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"设备 {deviceState.Address} 轮询失败: {ex.Message}");
+                    }
+
+                    // 添加帧间延迟
+                    await Task.Delay(InterFrameDelay, _cancellationTokenSource.Token);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 数据接收处理
+        /// </summary>
+        private Task OnDataReceived(ISerialPortClient client, ReceivedDataEventArgs e)
+        {
+            try
+            {
+                // 解析响应帧
+                var response = ResponseFrame.FromBytes(e.ByteBlock.ReadBytesPackage());
+
+                if (response.IsValid)
+                {
+                    // 查找匹配的任务并设置结果
+                    foreach (var task in _taskQueue.Where(t => t.DeviceAddress.Value == response.DeviceAddress.Value))
+                    {
+                        task.CompletionSource.TrySetResult(response);
+                    }
+
+                    UpdateDeviceState(response.DeviceAddress, true);
+                }
+                else
+                {
+                    Console.WriteLine($"收到无效响应: {response.Error}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"处理接收数据时出错: {ex.Message}");
+            }
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// 更新设备状态
+        /// </summary>
+        private void UpdateDeviceState(DeviceAddress address, bool communicationSuccess)
+        {
+            if (_deviceStates.TryGetValue(address, out var state))
+            {
+                state.LastCommunication = DateTime.Now;
+
+                if (communicationSuccess)
+                {
+                    state.IsOnline = true;
+                    state.TimeoutCount = 0;
+                }
+                else
+                {
+                    state.TimeoutCount++;
+                    if (state.TimeoutCount > MaxRetries)
+                    {
+                        state.IsOnline = false;
+                        Console.WriteLine($"设备 {address} 已离线");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取所有设备状态
+        /// </summary>
+        public Dictionary<DeviceAddress, bool> GetDeviceStatuses()
+        {
+            return _deviceStates.ToDictionary(
+                kvp => kvp.Key,
+                kvp => kvp.Value.IsOnline);
+        }
+
+        /// <summary>
+        /// 资源释放
+        /// </summary>
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                _isDisposed = true;
+                _cancellationTokenSource.Cancel();
+                _serialPortClient.SafeDispose();
+                _cancellationTokenSource.Dispose();
+            }
+        }
+    }
+    #endregion
+
+    #region 使用示例
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            // 创建485主站实例
+            using (var master = new RS485MasterStation("COM1", 9600))
+
+                try
+                {
+                    // 添加要监控的设备
+                    master.AddDevice(0x01);
+                    master.AddDevice(0x02);
+                    master.AddDevice(0x03);
+
+                    // 启动主站
+                    master.Start();
+
+                    // 等待一段时间让主站初始化
+                    await Task.Delay(1000);
+
+                    // 示例1: 读取设备1的保持寄存器
+                    try
+                    {
+                        var data = await master.ReadHoldingRegistersAsync(0x01, 0, 10);
+                        Console.WriteLine($"成功读取设备1的寄存器数据: {BitConverter.ToString(data)}");
+                    }
+                    catch (RS485CommunicationException ex)
+                    {
+                        Console.WriteLine(ex.Message);
+                    }
+
+                    // 示例2: 向设备2写入寄存器值
+                    try
+                    {
+                        await master.WriteSingleRegisterAsync(0x02, 0x1000, 0x1234);
+                        Console.WriteLine("成功向设备2写入寄存器值");
+                    }
+                    catch (RS485CommunicationException ex)
+                    {
+                        Console.WriteLine(ex.Message);
+                    }
+
+                    // 显示所有设备状态
+                    var statuses = master.GetDeviceStatuses();
+                    foreach (var status in statuses)
+                    {
+                        Console.WriteLine($"设备 {status.Key}: {(status.Value ? "在线" : "离线")}");
+                    }
+
+                    // 保持运行
+                    Console.WriteLine("按任意键退出...");
+                    Console.ReadKey();
+                }
+                finally
+                {
+                    master.Stop();
+                }
+        }
+    }
+    #endregion
+}

UserClass/SqliteHelper.cs

@@ -680,6 +680,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                 return result;
             }
 
+            /// <summary>
+            /// 将DataRow转换为Dictionary&lt;string, object&gt;
+            /// </summary>
+            /// <param name="row">DataRow实例</param>
+            /// <returns>键为列名、值为对应数据的字典</returns>
+            public Dictionary<string, object> ToDictionary(DataRow row)
+            {
+                var dictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+                if (row == null) return dictionary;
+
+                foreach (DataColumn column in row.Table.Columns)
+                {
+                    object value = row[column] == DBNull.Value ? null : row[column];
+                    dictionary[column.ColumnName] = value;
+                }
+                return dictionary;
+            }
+
         }
         #endregion
     }

UserControls/info.xaml

@@ -5,20 +5,25 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.UserControls"	              
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
+             xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
              mc:Ignorable="d"     
+             Loaded="UserControl_Loaded"
              d:DesignHeight="400" d:DesignWidth="300" Background="White">
-    <Grid>
-        <TextBlock x:Name="name" VerticalAlignment="Top" Height="50" Background="#FF646464" Text="-----" FontWeight="Bold" FontSize="36" />
-        <TextBlock x:Name="temp" VerticalAlignment="Top" Height="50" Text="---.-°C" FontWeight="Bold" FontSize="36" HorizontalAlignment="Right" Padding="5,0,5,0"/>
-        <TextBlock Text="{x:Static lang:Resources.process}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,50,5,0" VerticalAlignment="Top" Focusable="False"/>
-        <TextBlock Text="{x:Static lang:Resources.Step}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,100,5,0" VerticalAlignment="Top" Focusable="False"/>
-        <TextBlock Text="{x:Static lang:Resources.message}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,150,5,0" VerticalAlignment="Top" Focusable="False"/>
-        <TextBlock Text="{x:Static lang:Resources.orders}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,200,5,0" VerticalAlignment="Top" Focusable="False"/>           
-        <TextBlock x:Name="time" Text="----------------------------"  Height="30" FontWeight="Bold" FontSize="24" Margin="5,250,5,0" VerticalAlignment="Top" Focusable="False"/>
-        <local:RoilingTextBlock Foreground="Black" x:Name="Process" Text="NO Information" FontSize="21" Height="30" Margin="120,50,0,0" VerticalAlignment="Top"/>
-        <local:RoilingTextBlock Foreground="Black" x:Name="Step" Text="NO Information" FontSize="21" Height="30" Margin="120,100,0,0" VerticalAlignment="Top"/>
-        <local:RoilingTextBlock Foreground="Black" x:Name="Message" Text="NO Information" FontSize="21" Height="30" Margin="120,150,0,0" VerticalAlignment="Top"/>
-        <local:RoilingTextBlock Foreground="Black" x:Name="Orders" Text="NO Information" FontSize="21" Height="30" Margin="120,200,0,0" VerticalAlignment="Top"/>
-        <StackPanel x:Name="log" Margin="0,300,0,0"/>
+    <Grid Background="#FFBFBFBF">  
+            <TextBlock x:Name="name" VerticalAlignment="Top" Height="50" Background="#FF646464" Text="-----" FontWeight="Bold" FontSize="36" />
+            <TextBlock x:Name="temp" VerticalAlignment="Top" Height="50" Text="---.-°C" FontWeight="Bold" FontSize="36" HorizontalAlignment="Right" Padding="5,0,5,0"/>
+        <Grid Margin="2,50,2,2" Background="White">
+            <TextBlock Text="{x:Static lang:Resources.process}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,0,5,0" VerticalAlignment="Top" Focusable="False"/>
+            <TextBlock Text="{x:Static lang:Resources.Step}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,50,5,0" VerticalAlignment="Top" Focusable="False"/>
+            <TextBlock Text="{x:Static lang:Resources.message}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,100,5,0" VerticalAlignment="Top" Focusable="False"/>
+            <TextBlock Text="{x:Static lang:Resources.orders}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,150,5,0" VerticalAlignment="Top" Focusable="False"/>
+            <TextBlock x:Name="time" Text="----------------------------"  Height="30" FontWeight="Bold" FontSize="24" Margin="5,180,5,0" VerticalAlignment="Top" Focusable="False"/>
+            <local:RoilingTextBlock Foreground="Black" x:Name="Process" Text="NO Information" FontSize="21" Height="30" Margin="120,0,0,0" VerticalAlignment="Top"/>
+            <local:RoilingTextBlock Foreground="Black" x:Name="Step" Text="NO Information" FontSize="21" Height="30" Margin="120,50,0,0" VerticalAlignment="Top"/>
+            <local:RoilingTextBlock Foreground="Black" x:Name="Message" Text="NO Information" FontSize="21" Height="30" Margin="120,100,0,0" VerticalAlignment="Top"/>
+            <local:RoilingTextBlock Foreground="Black" x:Name="Orders" Text="NO Information" FontSize="21" Height="30" Margin="120,150,0,0" VerticalAlignment="Top"/>
+            <lvc:CartesianChart x:Name="OscChart" Margin="0,200,0,0" EasingFunction="{x:Null}" ZoomMode="PanX"            
+                                Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
+        </Grid>
     </Grid>
 </UserControl>

UserControls/info.xaml.cs

@@ -1,8 +1,22 @@
-using ScottPlot.Plottables;
+using LiveChartsCore;
+using LiveChartsCore.Defaults;
+using LiveChartsCore.Kernel.Sketches;
+using LiveChartsCore.SkiaSharpView;
+using LiveChartsCore.SkiaSharpView.Painting;
+using Newtonsoft.Json.Linq;
+using ScottPlot;
+using ScottPlot.Plottables;
+using ScottPlot.Statistics;
+using SkiaSharp;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Data;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -23,15 +37,128 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserControls
     /// <summary>
     /// info.xaml 的交互逻辑
     /// </summary>
-    public partial class info : UserControl
+    public partial class info : UserControl, INotifyPropertyChanged
     {
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
+        public void RaisePropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+            {
+                if (propertyName != null)
+                {
+                    PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
+                }
+            }
+        }
+        private ObservableCollection<DateTimePoint> MTH_values = new ObservableCollection<DateTimePoint>();
+
+        public ObservableCollection<ISeries> _series { get; set; }
+        public ObservableCollection<ISeries> Series
+        {
+            get => _series;
+            set
+            {
+                _series = value;
+                OnPropertyChanged(nameof(Series));
+            }
+        }
+        //x轴时间格式
+        public Axis[] XAxes { get; set; } =
+        {
+            new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("HH:mm"))
+            {
+                MinLimit = DateTime.Now.AddHours(-6).Ticks,
+                MaxLimit = DateTime.Now.AddHours(0.5).Ticks,
+                CrosshairLabelsBackground = SKColors.DarkGray.AsLvcColor(),
+                CrosshairLabelsPaint = new SolidColorPaint(SKColors.DarkSlateBlue, 1),
+                CrosshairPaint = new SolidColorPaint(SKColors.DarkSlateGray, 1),
+            },
+         };
+        //颜色
+        private static readonly SKColor s_blue = new SKColor(25, 118, 210);
+        private static readonly SKColor s_red = new SKColor(229, 57, 53);
+        public ICartesianAxis[] YAxes { get; set; } ={
+        new Axis //y在此轴上缩放
+        {
+            MinLimit =0,
+            MaxLimit =160,
+            NamePadding = new LiveChartsCore.Drawing.Padding(0, 20),
+            Padding =  new LiveChartsCore.Drawing.Padding(0, 0, 20, 0),
+            TextSize = 12,
+            LabelsPaint = new SolidColorPaint(s_blue),
+            TicksPaint = new SolidColorPaint(s_blue),
+            SubticksPaint = new SolidColorPaint(s_blue),
+            DrawTicksPath = true,
+            CrosshairSnapEnabled = true,
+             Position = LiveChartsCore.Measure.AxisPosition.Start
+        },//温度轴
+   
+        };
+
         public info()
         {
             InitializeComponent();
-            
+            DataContext = this; 
         }
 
+        public void DataAdd(DateTime dateTime, double dat)
+        {
+            Dispatcher.Invoke(() =>
+            {           
+                // 添加新数据点     
+                MTH_values.Add(new DateTimePoint(dateTime, dat));
+                // 更新X轴范围，始终保持最近6小时
+                XAxes[0].MinLimit = dateTime.AddHours(-6).Ticks;
+                XAxes[0].MaxLimit = dateTime.AddMinutes(1).Ticks;
+                // 移除6小时前的旧数据
+                while (MTH_values.Count > 0 &&
+                      MTH_values[0].DateTime < dateTime.AddHours(-6))
+                {
+                    MTH_values.RemoveAt(0);
+                }
+            });            
+        }
+
+        public void DataROW(DataRow[] dataRows)
+        {
+            DateTime dateTime = DateTime.Now;
+            foreach (DataRow row in dataRows)
+            {
+                // 添加新数据点     
+                MTH_values.Add(new DateTimePoint((DateTime)row["DateTime"], (double)row["DAT"]));
+            }
+            Dispatcher.Invoke(() =>
+            {                
+                // 更新X轴范围，始终保持最近6小时
+                XAxes[0].MinLimit = dateTime.AddHours(-6).Ticks;
+                XAxes[0].MaxLimit = dateTime.AddMinutes(1).Ticks;
+               
+            });
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            // 初始化系列
+            Series = new ObservableCollection<ISeries>           
+            {
+                 new LineSeries<DateTimePoint>
+                 {                      
+                     Name = Properties.Resources.Temperature,                      
+                     Values = MTH_values,
+                     Stroke = new SolidColorPaint(s_red, 2),                      
+                     GeometrySize = 0,                       
+                     GeometryStroke = new SolidColorPaint(s_red, 2),                     
+                     Fill = null,                      
+                     LineSmoothness = 0,                      
+                     ScalesYAt = 0,
+                 }
+            };
+        }
 
     }
-
 }

View/CurveView.xaml

@@ -15,6 +15,8 @@
     <UserControl.Resources>
         <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
         <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+        <ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
     </UserControl.Resources>
     <Grid>
         <DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" d:ItemsSource="{d:SampleData ItemCount=999}"                  
@@ -61,11 +63,14 @@
                                     <Grid>
                                         <StackPanel Width="100" Orientation="Horizontal">
                                             <materialDesign:PackIcon  Width="25" Height="30" 
-                                          Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"                                                      
-                                          Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
-                                            <materialDesign:PackIcon  Width="25" Height="30"                                                
-                                          Kind="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"                                                       
-                                          Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+                           Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"                                                      
+                           Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+                                            <materialDesign:PackIcon  Width="25" Height="30" Kind="Lock"                                              
+                           Visibility="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"                                                       
+                           Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+                                            <materialDesign:PackIcon  Width="25" Height="30" Kind="HandBackRight"                                                         
+                           Visibility="{Binding Path=AUTO,Converter={StaticResource StatexmlConvert}}"                                                                                 
+                           Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>

View/CurveView.xaml.cs

@@ -28,9 +28,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
     /// </summary>
     public partial class CurveView : UserControl
     {
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        public static DataTable WorkOrder = new DataTable();  //物料缓存
+       public static DataTable WorkOrder = new DataTable();  //物料缓存
         public static string CurveDiagram;
         private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
         private string SYS_machines =null;
@@ -81,24 +79,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
                 DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);
 
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
                DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +
                SYS_machines + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
                 GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
             }
             else
             {
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                       DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
                       DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
                 GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
             }
@@ -112,24 +104,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
                 DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);//刷新图表
 
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
                DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +
                SYS_machines + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
-                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
-            }
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;            }
             else
             {
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                       DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
                       DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
                 GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
             }
@@ -143,24 +128,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
                 DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);
 
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
                DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +
                SYS_machines + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
                 GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
             }
             else
             {
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                       DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
                       DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
                 GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
             }
@@ -174,13 +153,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 SYS_machines = (Griddata.Columns[1].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第1列，
                 mac.Text = SYS_machines;
 
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
                      DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +                    
                      DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +                    
                      SYS_machines + "'", null).Tables[0];  //读取表写入缓存
-                SQLiteHelpers.Close();
 
                 GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
                 Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
@@ -204,10 +180,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             string SysTime = DateTime.Parse(sender.ToString()).ToString("yyyy/MM/dd");
             string SysTimeDays = DateTime.Parse(sender.ToString()).AddDays(1).ToString("yyyy/MM/dd");
 
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where " + "StartTime>='" + SysTime + "'and StartTime<='" + SysTimeDays + "'", null).Tables[0];  //读取表写入缓存
-            SQLiteHelpers.Close();
+            WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where " + "StartTime>='" + SysTime + "'and StartTime<='" + SysTimeDays + "'", null).Tables[0];  //读取表写入缓存
 
             GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
         }

View/DispenseMachinesSet.xaml.cs

@@ -34,23 +34,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         public DispenseMachinesSet()
         {
             InitializeComponent();
-
             // 
             string[] Machine_ = { "252", "252RB", "252-2T", "252RDRM", "242W", "302", "303", "303PDW" };
             TextMachineGroup.ItemsSource = Machine_;            
-
         }
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
+          private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
         //private string SYS_machines = null;
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense Order by id", null).Tables[0];
-            SQLiteHelpers.Close();
+            DataTable dataTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense Order by id", null).Tables[0];
             Griddata.ItemsSource = dataTable.DefaultView;
         }
 
@@ -90,25 +83,20 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 dr_new.Add("LOCK", dLICK.IsChecked.ToString());
                 dr_new.Add("DATA",imageData);
 
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-
-                if (SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense where name ='" + comboBoxMachine.Text + "'", null).Tables[0].Rows.Count == 0)
+                if (MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense where name ='" + comboBoxMachine.Text + "'", null).Tables[0].Rows.Count == 0)
                 {
-                    SQLiteHelpers.InsertData("MachinesDispense", dr_new);
+                    MainWindowViewModel.SQLiteHelpers.InsertData("MachinesDispense", dr_new);
                 }
                 else
                 {
-                    SQLiteHelpers.Update("MachinesDispense", dr_new, "name='" + comboBoxMachine.Text + "'", null);
+                    MainWindowViewModel.SQLiteHelpers.Update("MachinesDispense", dr_new, "name='" + comboBoxMachine.Text + "'", null);
                 }
-                Griddata.ItemsSource = SQLiteHelpers.ExecuteDataSet("select Name,Groups,IP,PORT,DATA from MachinesDispense Order by id", null).Tables[0].DefaultView;
-                SQLiteHelpers.Close();
+                Griddata.ItemsSource = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select Name,Groups,IP,PORT,DATA from MachinesDispense Order by id", null).Tables[0].DefaultView;
                 MessageBox.Show(Properties.Resources.Save + comboBoxMachine.Text, "SCCM", MessageBoxButton.OK, MessageBoxImage.Information);
             }
             else
             {
                 MessageBox.Show(Properties.Resources.ERR , "SCCM", MessageBoxButton.OK, MessageBoxImage.Error);
-
             }
         }
         private void Delete_Click(object sender, RoutedEventArgs e)
@@ -118,11 +106,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 MessageBoxResult vr = System.Windows.MessageBox.Show(Properties.Resources.Delete + comboBoxMachine.Text, "SCCM", MessageBoxButton.OKCancel, MessageBoxImage.Question);
                 if (vr == MessageBoxResult.OK) // 如果是确定，就执行下面代码
                 {
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                    SQLiteHelpers.Open();  //打开数据库
-                    SQLiteHelpers.Delete("MachinesDispense", "Name='" + comboBoxMachine.Text + "'", null);
-                    Griddata.ItemsSource = SQLiteHelpers.ExecuteDataSet("select Name,Groups,IP,PORT,DATA from MachinesDispense Order by id", null).Tables[0].DefaultView;
-                    SQLiteHelpers.Close();
+                    MainWindowViewModel.SQLiteHelpers.Delete("MachinesDispense", "Name='" + comboBoxMachine.Text + "'", null);
+                    Griddata.ItemsSource = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select Name,Groups,IP,PORT,DATA from MachinesDispense Order by id", null).Tables[0].DefaultView;
                     comboBoxMachine.Text = null;
                 }
             }

View/DispenseView.xaml.cs

@@ -43,18 +43,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             InitializeComponent();
         }
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
         private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
         DataTable DispenseMac = new DataTable();
         UserControls.DispenseMacInfo[] dispenseMacInfo = new UserControls.DispenseMacInfo[99]; //定义总览信息卡
         //private string SYS_machines = null;
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            SQLiteHelpers = new SQLiteHelper(DBAddress);
-            SQLiteHelpers.Open();  //打开数据库
-            DispenseMac = SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense ", null).Tables[0];//缓存             
-            SQLiteHelpers.Close();
+            DispenseMac = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from MachinesDispense ", null).Tables[0];//缓存             
             /// <summary>
             /// 生成总览信息卡
             /// </summary>

View/DyeingPlanView.xaml

@@ -6,18 +6,24 @@
              xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"    
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"          
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
+             xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels" 
              mc:Ignorable="d" Loaded="UserControl_Loaded"
              d:DesignHeight="900" d:DesignWidth="1100">
+    <UserControl.Resources>
+        <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
+        <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
+    </UserControl.Resources>
     <Grid Background="White" Cursor="">
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="140,30,10,0" x:Name="comboBoxWorkOrder" VerticalAlignment="Top" Width="270" 
+        <ComboBox HorizontalAlignment="Left" Height="40" Margin="140,30,10,0" x:Name="comboBoxWorkOrder" VerticalAlignment="Top" Width="270" 
            FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxWorkOrder_KeyDown"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,30,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.orders}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="140,80,10,0" x:Name="comboBoxDyelot" VerticalAlignment="Top" Width="270" 
+        <ComboBox HorizontalAlignment="Left" Height="40" Margin="140,80,10,0" x:Name="comboBoxDyelot" VerticalAlignment="Top" Width="270" 
                   FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxDyelot_KeyDown"  />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,80,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Dyelot}" 
                    VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="140,130,10,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" 
+        <ComboBox HorizontalAlignment="Left" Height="40" Margin="140,130,10,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" 
                   FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxMachine_DropDownClosed" IsReadOnly="True" />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,130,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Machine}"
                    VerticalAlignment="Top" Width="120" FontSize="25"/>
@@ -25,38 +31,59 @@
             VerticalAlignment="Top" Width="120" FontSize="25"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="360,180,280,0" x:Name="color" TextWrapping="Wrap"  
                    VerticalAlignment="Top" Width="50" Background="#FF336FA8" MouseDown="color_color_MouseDoubleClick"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,180,10,0" x:Name="TEXTColorNumber" VerticalAlignment="Top" Width="200"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,180,10,0" x:Name="TEXTColorNumber" VerticalAlignment="Top" Width="200"    
                  FontSize="15" BorderBrush="#FF673AB7"  />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,230,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ColorName}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,230,10,0" x:Name="TEXTColorName" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,230,10,0" x:Name="TEXTColorName" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7"  />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,280,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Client}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,280,10,0" x:Name="TEXTClient" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,280,10,0" x:Name="TEXTClient" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7"  />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,330,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothSpecies}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,330,10,0" x:Name="TEXTClothSpecies" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,330,10,0" x:Name="TEXTClothSpecies" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7"  />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,380,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothWeight}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,380,10,0" x:Name="TEXTClothWeight" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,380,10,0" x:Name="TEXTClothWeight" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTClothWeight" InputMethod.IsInputMethodEnabled="False"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,430,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.BathRatio}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,430,10,0" x:Name="TEXTBathRatio" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,430,10,0" x:Name="TEXTBathRatio" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTBathRatio" InputMethod.IsInputMethodEnabled="False"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,480,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Total}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,480,10,0" x:Name="TEXTTotal" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,480,10,0" x:Name="TEXTTotal" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTTotal" InputMethod.IsInputMethodEnabled="False"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,530,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.USER}"
             VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="140,530,10,0" x:Name="TEXTUSER" VerticalAlignment="Top" Width="270"    
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="140,530,10,0" x:Name="TEXTUSER" VerticalAlignment="Top" Width="270"    
                  FontSize="15" BorderBrush="#FF673AB7"  />
 
-        <ComboBox HorizontalAlignment="Right" Height="30" Margin="150,30,50,0" x:Name="comboBoxProgram" VerticalAlignment="Top" Width="470" 
+        <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,80,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Pump}"     
+                   VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Right" Height="40" Margin="140,80,380,0" x:Name="PumpSpeed" VerticalAlignment="Top" Width="100"    
+          FontSize="15" BorderBrush="#FF673AB7"  />
+        <TextBlock HorizontalAlignment="Right" Height="40" Margin="240,80,150,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Blower}"     
+             VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Right" Height="40" Margin="360,80,50,0" x:Name="Blower" VerticalAlignment="Top" Width="100"      
+                 FontSize="15" BorderBrush="#FF673AB7"  />
+        <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,130,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Swing}"     
+               VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Right" Height="40" Margin="140,130,380,0" x:Name="Swing" VerticalAlignment="Top" Width="100"      
+                 FontSize="15" BorderBrush="#FF673AB7"  />
+        <TextBlock HorizontalAlignment="Right" Height="40" Margin="240,130,150,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothWheel}"             
+                   VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Right" Height="40" Margin="360,130,50,0" x:Name="ClothWheel" VerticalAlignment="Top" Width="100"    
+                 FontSize="15" BorderBrush="#FF673AB7"  />
+        <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,180,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Nozzle}"     
+        VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Right" Height="40" Margin="140,180,380,0" x:Name="Nozzle" VerticalAlignment="Top" Width="100"      
+          FontSize="15" BorderBrush="#FF673AB7"  />
+
+        <ComboBox HorizontalAlignment="Right" Height="40" Margin="150,30,50,0" x:Name="comboBoxProgram" VerticalAlignment="Top" Width="470" 
                   FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxProgram_DropDownClosed" 
                   TextBoxBase.TextChanged="comboBoxProgram_TextChanged"/>
         <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,30,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.process}" 
@@ -66,10 +93,10 @@
            GridLinesVisibility="All" ColumnHeaderHeight="40" MouseDoubleClick="Grid_data_MouseDoubleClick"
            Grid.ColumnSpan="2" CanUserResizeRows="False" AutoGenerateColumns="False" MinColumnWidth="30" 
            CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility ="Column" SelectionMode="Single" 
-           Margin="0,100,10,60" Width="600" HorizontalAlignment="Right" BorderBrush="#FFC9C9C9" FontSize="16" BorderThickness="5,5,5,5" >
+           Margin="0,250,10,60" Width="600" HorizontalAlignment="Right" BorderBrush="#FFC9C9C9" FontSize="16" BorderThickness="5,5,5,5" >
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
-                    <Setter Property="Height" Value="25" />
+                    <Setter Property="Height" Value="100" />
                     <Setter Property="FontSize" Value="15" />
                     <Style.Triggers>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="0">
@@ -106,20 +133,76 @@
                 <!--列信息绑定-->
                 <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="40" IsReadOnly="True" />
-                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="150" Binding="{Binding StepName}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}"    
+                                 Width="60" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+                                    MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"  
+                                 MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+                                    MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="300"  IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <StackPanel>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0,0,0.5">
+                                    <TextBlock Height="50" >                         
+    <Run Text="{x:Static lang:Resources.Function}"/>        
+    <Run Text=":"/>                       
+    <Run Text="{Binding StepName}"/>
+                                    </TextBlock>
+                                </Border>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0.5,0,0">
+                                    <TextBlock Height="50" >                         
+    <Run Text="{x:Static lang:Resources.ParameterSet}"/>                           
+    <Run Text=":"/>                      
+    <Run Text="{Binding ParameterName}"/>
+                                    </TextBlock>
+                                </Border>
+                            </StackPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S3  ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
 
@@ -128,7 +211,7 @@
             <materialDesign:PackIcon Kind="ArrowRight" Foreground="#FF00204E" HorizontalAlignment="Center" VerticalAlignment="Center" Width="50" Height="35" />
         </Button>
         
-        <Grid Background="White"  Margin="10,500,300,60" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="250" Width="400">
+        <Grid Background="White"  Margin="10,500,300,45" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="250" Width="400">
             <ContentControl x:Name="Picture"/>
         </Grid>
     </Grid>

View/DyeingPlanView.xaml.cs

@@ -34,21 +34,19 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
     /// </summary>
     public partial class DyeingPlanView : UserControl
     {                  
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
         DataTable ProgramName = new DataTable();
         DataTable WorkOrder =new DataTable();
         DataTable dat = new DataTable();
         DataTable TEMPTable = new DataTable();
         DataTable DyelotsBulkedRecipe=new DataTable();
         public string WorkOrder_n;
+        string Numder = null;
+        string ID = null;
+        string P1, P2, P3, P4, P5;
         public DyeingPlanView()
         {
             InitializeComponent();
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            ProgramName = SQLiteHelpers.ExecuteDataSet("select * from ProgramName order by ProgramID desc", null).Tables[0];//缓存             
-            SQLiteHelpers.Close();  //关闭连接
+            ProgramName = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from ProgramName order by ProgramID desc", null).Tables[0];//缓存             
             comboBoxMachine.ItemsSource = MainWindowViewModel.Machines.AsEnumerable().Select(rowdata => rowdata.Field<string>("name")).ToList();//转换机台                                                                                                                            
             comboBoxProgram.ItemsSource = ProgramName.AsEnumerable().Select(rowdata => rowdata.Field<string>("ProgramName")).ToList();//转换工艺代码 
             TEXTUSER.Text = MainWindow.user_;
@@ -66,10 +64,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (sArray.Length <= 1)
             {
                 comboBoxDyelot.IsEnabled = true;
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                DataTable DatDyelot = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Machine='" + comboBoxMachine.Text + "' and State='101' order by Dyelot desc", null).Tables[0];  //读取计划表写入缓存                                                                                                                                                                       
-                SQLiteHelpers.Close();  //关闭连接
+                DataTable DatDyelot = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Machine='" + comboBoxMachine.Text + "' and State='101' order by Dyelot desc", null).Tables[0];  //读取计划表写入缓存                                                                                                                                                                       
                 comboBoxDyelot.ItemsSource = DatDyelot.AsEnumerable().Select(rowdata => rowdata.Field<string>("Dyelot")).ToList();//转换代码 
             }
         }
@@ -119,11 +114,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             string State_ = "100";
             string Dyelot_ = comboBoxDyelot.Text;
             string color_ = color.Background.ToString();
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
             try
             {
-                sTime = SQLiteHelpers.ExecuteDataSet(
+                sTime = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                     "select * from WorkOrder where Machines='" + comboBoxMachine.Text + "' order by EndTime desc", null).
                     Tables[0].Select().First().Field<object>("EndTime").ToString();  //读取计划表写入缓存                  
                 if (DateTime.Now < DateTime.Parse(sTime))
@@ -171,30 +164,25 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             WorkOrder_new.Add("Total", TEXTTotal.Text);
             WorkOrder_new.Add("USER", TEXTUSER.Text);
             WorkOrder_new.Add("ColorName", TEXTColorName.Text);
-            SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
+            MainWindowViewModel.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
+
+            //插入信息
+            Dictionary<string, object> WorkOrder_set = new Dictionary<string, object>();//缓存函数
+            WorkOrder_set.Add("WorkOrder", WorkOrder_);
+            WorkOrder_set.Add("PumpSpeed", PumpSpeed.Text);
+            WorkOrder_set.Add("Blower", Blower.Text);
+            WorkOrder_set.Add("Swing", Swing.Text);
+            WorkOrder_set.Add("ClothWheel", ClothWheel.Text);
+            WorkOrder_set.Add("Nozzle", Nozzle.Text);
+            MainWindowViewModel.SQLiteHelpers.InsertData("WorkOrderSet", WorkOrder_set);// 执行插入
 
             Dictionary<string, object> WorkOrder_DAT = new Dictionary<string, object>();//缓存函数
             for (int x = 0; x < dat.Rows.Count; x++)
             {
+                WorkOrder_DAT = MainWindowViewModel.SQLiteHelpers.ToDictionary(dat.Rows[x]);
                 WorkOrder_DAT.Add("WorkOrder", WorkOrder_);
                 WorkOrder_DAT.Add("Dyelot", Dyelot_);
-                WorkOrder_DAT.Add("ProgramID", dat.Rows[x]["ProgramID"]);
-                WorkOrder_DAT.Add("Program", dat.Rows[x]["Program"]);
-                WorkOrder_DAT.Add("Step", dat.Rows[x]["Step"]);
-                WorkOrder_DAT.Add("StepID", dat.Rows[x]["StepID"]);
-                WorkOrder_DAT.Add("StepName", dat.Rows[x]["StepName"]);
-                WorkOrder_DAT.Add("ParameterName", dat.Rows[x]["ParameterName"]);
-                WorkOrder_DAT.Add("Parameter1", dat.Rows[x]["Parameter1"]);
-                WorkOrder_DAT.Add("Parameter2", dat.Rows[x]["Parameter2"]);
-                WorkOrder_DAT.Add("Parameter3", dat.Rows[x]["Parameter3"]);
-                WorkOrder_DAT.Add("Parameter4", dat.Rows[x]["Parameter4"]);
-                WorkOrder_DAT.Add("Parameter5", dat.Rows[x]["Parameter5"]);
-                WorkOrder_DAT.Add("Parameter6", dat.Rows[x]["Parameter6"]);
-                WorkOrder_DAT.Add("Parameter7", dat.Rows[x]["Parameter7"]);
-                WorkOrder_DAT.Add("Parameter8", dat.Rows[x]["Parameter8"]);
-                WorkOrder_DAT.Add("Parameter9", dat.Rows[x]["Parameter9"]);
-                WorkOrder_DAT.Add("Parameter10", dat.Rows[x]["Parameter10"]);
-                SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
+                MainWindowViewModel.SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
                 WorkOrder_DAT.Clear();
             }
             if (!String.IsNullOrEmpty(comboBoxDyelot.Text))//料单信息
@@ -219,11 +207,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     WorkOrder_DAT.Add("DispenseGrams", DyelotsBulkedRecipe.Rows[x]["DispenseGrams"]);
                     WorkOrder_DAT.Add("Dispense", DyelotsBulkedRecipe.Rows[x]["Dispenser"]);
                     WorkOrder_DAT.Add("UserAccount", DyelotsBulkedRecipe.Rows[x]["UserAccount"]);
-                    SQLiteHelpers.InsertData("Dyelot", WorkOrder_DAT);//行插入                                                                             
+                    MainWindowViewModel.SQLiteHelpers.InsertData("Dyelot", WorkOrder_DAT);//行插入                                                                             
                     WorkOrder_DAT.Clear();
                 }
             }
-            SQLiteHelpers.Close();  //关闭连接
 
             LogGing.ExchangeDATA("Dyelot=" + comboBoxWorkOrder.Text + ";Machine=" + comboBoxMachine.Text +
                 ";Program=" + comboBoxProgram.Text + ";User=" + TEXTUSER.Text + ";");
@@ -251,11 +238,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (!string.IsNullOrEmpty(comboBoxProgram.Text))
             {
                 dat.Clear();
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                dat = SQLiteHelpers.ExecuteDataSet(
+                dat = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                     "select * from ProgramSteps where Program='" + comboBoxProgram.SelectedValue + "' order by Step asc", null).Tables[0];  //读取计划表写入缓存
-                SQLiteHelpers.Close();  //关闭连接
                 DatSteps(dat);
                 Grid_data.ItemsSource = dat.DefaultView;
             }
@@ -269,8 +253,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 try
                 { 
                     string[] sArray = Regex.Split(text, @"\+", RegexOptions.IgnoreCase);
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                    SQLiteHelpers.Open();  //打开数据库 
                   /*  if (!string.IsNullOrEmpty(WorkOrder_n))
                     {
                         dat = SQLiteHelpers.ExecuteDataSet(
@@ -278,7 +260,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     }//插入工单不为空时载入细节信息*/
                     for (int i = 0; i < sArray.Length; i++)
                     {
-                        DataTable temp = SQLiteHelpers.ExecuteDataSet(
+                        DataTable temp = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                             "select * from ProgramSteps where Program='" + sArray[i] + "' order by Step asc", null).Tables[0];  //读取计划表写入缓存
                         if (dat.Columns.Count == 0) dat = temp.Clone();
                         foreach (DataRow drT in temp.Rows)
@@ -287,7 +269,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         }
                     }//以工艺名组合工艺细节
                    
-                    SQLiteHelpers.Close();  //关闭连接
                     DatSteps(dat);
                     Grid_data.ItemsSource = dat.DefaultView;
 
@@ -297,11 +278,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             }
 
         }//工艺修改事件
-
-        string Numder = null;
-        string ID = null;
-        string P1, P2, P3, P4, P5;
-
         private void MenuItem_edit(object sender, RoutedEventArgs e)
         {
             int rownum = Grid_data.SelectedIndex;//获取鼠标选中行并定义变量
@@ -317,7 +293,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
                 if (ID == null) ID = dat.Rows.Count.ToString();
-                ViewStep viewstop = new ViewStep(Numder, P1, P2, P3, P4, P5);
+                ViewStep viewstop = new ViewStep(Numder, dat.Select("STEP = " + ID).First());
                 viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
                 viewstop.data = ID;
                 viewstop.ShowDialog();
@@ -342,8 +318,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 DatSteps(dat);
                 Grid_data.ItemsSource = dat.DefaultView;
 
+                if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
                 if (ID == null) ID = dat.Rows.Count.ToString();
-                ViewStep viewstop = new ViewStep(null, "0", "0", "0", "0", "0");
+                ViewStep viewstop = new ViewStep(Numder, dat.Select("STEP = " + ID).First());
                 viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
                 viewstop.data = ID;
                 viewstop.ShowDialog();
@@ -376,7 +353,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
                 if (ID == null) ID = dat.Rows.Count.ToString();
-                ViewStep viewstop = new ViewStep(Numder, P1, P2, P3, P4, P5);
+                ViewStep viewstop = new ViewStep(Numder, dat.Select("STEP = " + ID).First());
                 viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
                 viewstop.data = ID;
                 viewstop.ShowDialog();
@@ -384,26 +361,49 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         }
         private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
         {
-            int i = dat.Rows.Count;
-            int n = StrToInt.To16Convert10(ID);
-            if (e.Mode)
+            int n = Convert.ToInt16(ID);
+            ID = null;
+            if (e.PNAME != "")
             {
                 DataRow dr = dat.Rows[n - 1];
                 dr.BeginEdit();
                 dr["StepID"] = e.StepID;
                 dr["StepName"] = e.StepNAME;
                 dr["ParameterName"] = e.PNAME;
-                dr["Parameter1"] = e.P1;
-                dr["Parameter2"] = e.P2;
-                dr["Parameter3"] = e.P3;
-                dr["Parameter4"] = e.P4;
-                dr["Parameter5"] = e.P5;
+                dr["Parameter1"] = e.Row_DAT.Field<double>("Parameter1");
+                dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter1");
+                dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter1");
+                dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter1");
+                dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter1");
+                dr["Parameter1_S1"] = e.Row_DAT.Field<double>("Parameter1_S1");
+                dr["Parameter2_S1"] = e.Row_DAT.Field<double>("Parameter2_S1");
+                dr["Parameter3_S1"] = e.Row_DAT.Field<double>("Parameter3_S1");
+                dr["Parameter4_S1"] = e.Row_DAT.Field<double>("Parameter4_S1");
+                dr["Parameter5_S1"] = e.Row_DAT.Field<double>("Parameter5_S1");
+                dr["Parameter1_S2"] = e.Row_DAT.Field<double>("Parameter1_S2");
+                dr["Parameter2_S2"] = e.Row_DAT.Field<double>("Parameter2_S2");
+                dr["Parameter3_S2"] = e.Row_DAT.Field<double>("Parameter3_S2");
+                dr["Parameter4_S2"] = e.Row_DAT.Field<double>("Parameter4_S2");
+                dr["Parameter5_S2"] = e.Row_DAT.Field<double>("Parameter5_S2");
+                dr["Parameter1_S3"] = e.Row_DAT.Field<double>("Parameter1_S3");
+                dr["Parameter2_S3"] = e.Row_DAT.Field<double>("Parameter2_S3");
+                dr["Parameter3_S3"] = e.Row_DAT.Field<double>("Parameter3_S3");
+                dr["Parameter4_S3"] = e.Row_DAT.Field<double>("Parameter4_S3");
+                dr["Parameter5_S3"] = e.Row_DAT.Field<double>("Parameter5_S3");
+                dr["StepName_S1"] = e.Row_DAT.Field<string>("StepName_S1");
+                dr["StepName_S2"] = e.Row_DAT.Field<string>("StepName_S2");
+                dr["StepName_S3"] = e.Row_DAT.Field<string>("StepName_S3");
+                dr["StepID_S1"] = e.Row_DAT.Field<string>("StepID_S1");
+                dr["StepID_S2"] = e.Row_DAT.Field<string>("StepID_S2");
+                dr["StepID_S3"] = e.Row_DAT.Field<string>("StepID_S3");
                 dr.EndEdit();
+                Grid_data.SelectedIndex = -1;
             }
             else
             {
-                dat.Rows.RemoveAt(Convert.ToInt32(ID) - 1);
+                MainWindowViewModel.dt_TP.Rows.RemoveAt(n - 1);
                 DatSteps(dat);
+                Grid_data.SelectedIndex = -1;
             }
             Grid_data.ItemsSource = dat.DefaultView;
         }
@@ -419,17 +419,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
             for (int i = 0; i < dat.Rows.Count; i++)
             {
-                switch (dat.Rows[i][3].ToString())//步骤用时计算
+                switch (dat.Rows[i].Field<string>("StepID"))//步骤用时计算
                 {
                     case "001":
                         TT = MSTT;
-                        TC = (Double)dat.Rows[i][7];
+                        TC = dat.Rows[i].Field<double>("Parameter2");
                         if (TC > 9.9 || TC < 0.1) TC = 9.9;//计算限制
-                        MSTT = (Double)dat.Rows[i][6];
+                        MSTT = dat.Rows[i].Field<double>("Parameter1");
                         TT = Math.Abs(MSTT - TT) / TC * 60;
                         TIMET = Convert.ToDateTime(TIMET).AddSeconds(TT).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "007":
@@ -441,15 +441,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "013":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]* (Double)dat.Rows[i][9]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3") * dat.Rows[i].Field<double>("Parameter4")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "015":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "017":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "020":
@@ -461,11 +461,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "031":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][6]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter1")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "065":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][8]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "091":
@@ -478,7 +478,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     case "093":
-                        TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][6]).ToString("HH:mm:ss");
+                        TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter1")).ToString("HH:mm:ss");
                         TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
                         break;
                     default:
@@ -491,10 +491,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             if (e.Key == Key.Enter && MainWindowViewModel.DyelotsDispenser)
             {
-                SQLiteHelpers = new SQLiteHelper(DBAddress);
-                SQLiteHelpers.Open();  //打开数据库
-                int dat_c = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where WorkOrder = '" + comboBoxWorkOrder.Text + "'", null).Tables[0].Rows.Count;//缓存             
-                SQLiteHelpers.Close();
+                int dat_c = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where WorkOrder = '" + comboBoxWorkOrder.Text + "'", null).Tables[0].Rows.Count;//缓存             
 
                 if (dat_c > 0)//查询料单是否可用
                 {
@@ -568,10 +565,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 string DYELOTS_sql = "SELECT * FROM [dbo].[DYELOTS] WHERE Dyelot = '" + comboBoxDyelot.Text + "'";//单号查询语句                                                                                                                             
                 try
                 {
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); 
-                    SQLiteHelpers.Open();  //打开数据库
-                    int dat_c = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot = '" + comboBoxDyelot.Text + "'", null).Tables[0].Rows.Count;//缓存             
-                    SQLiteHelpers.Close();
+                    int dat_c = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot = '" + comboBoxDyelot.Text + "'", null).Tables[0].Rows.Count;//缓存             
 
                     if (dat_c > 0)//查询料单是否可用
                     {

View/DyelotView.xaml.cs

@@ -27,9 +27,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
     /// </summary>
     public partial class DyelotView : UserControl
     {       
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-
         public DyelotView()
         {
             InitializeComponent();
@@ -41,10 +38,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         public void Dyelot(object dat) 
         {
-            SQLiteHelpers = new SQLiteHelper(DBAddress);
-            SQLiteHelpers.Open();  //打开数据库
-            DataTable dat_c = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + dat + "'", null).Tables[0];//缓存             
-            SQLiteHelpers.Close();
+            DataTable dat_c = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + dat + "'", null).Tables[0];//缓存             
 
             Grid_data.ItemsSource = dat_c.DefaultView;
         }

View/EngineerSetView.xaml

@@ -8,10 +8,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
     <Grid>
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,10,0,0" x:Name="comboBoxCOM0" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged" FontSize="16" />
+        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,10,0,0" x:Name="comboBoxCOM0" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged0" FontSize="16" />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,10,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Port}" VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,50,0,0" x:Name="comboBoxCOM1" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged" FontSize="16"/>
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,90,0,0" x:Name="comboBoxCOM2" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged" FontSize="16"/>
+        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,50,0,0" x:Name="comboBoxCOM1" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged1" FontSize="16"/>
+        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,90,0,0" x:Name="comboBoxCOM2" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged2" FontSize="16"/>
         <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,130,0,0" x:Name="comboBoxLanguage" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxLanguage_SelectionChanged"  FontSize="16"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,130,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Language}" VerticalAlignment="Top" Width="120" FontSize="25"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,170,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.SERVER}" VerticalAlignment="Top" Width="120" FontSize="25"/>

View/EngineerSetView.xaml.cs

@@ -30,14 +30,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             InitializeComponent();
             // 获取所有可用串口端口，并添加到comboBoxCOM
             string[] ports = System.IO.Ports.SerialPort.GetPortNames();
+            ports.Append("COM");
             comboBoxCOM0.ItemsSource = ports;
-            comboBoxCOM0.Text = Configini.IniReadvalue("SYS", "COM");
+            comboBoxCOM0.Text = Configini.IniReadvalue("SYS", "COMP1");
 
             comboBoxCOM1.ItemsSource = ports;
-            comboBoxCOM1.Text = Configini.IniReadvalue("SYS", "COM");
+            comboBoxCOM1.Text = Configini.IniReadvalue("SYS", "COMP2");
 
             comboBoxCOM2.ItemsSource = ports;
-            comboBoxCOM2.Text = Configini.IniReadvalue("SYS", "COM");
+            comboBoxCOM2.Text = Configini.IniReadvalue("SYS", "COMP3");
 
             string[] Language = {"en-US","zh-CN","zh-TW" };
             string[] SQMOD = { "Windows Authentication", "SQL SERVER"};
@@ -61,13 +62,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
         private SpeechSynthesizer synth = new SpeechSynthesizer();//语音
 
-        private void comboBoxCOM_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void comboBoxCOM_SelectionChanged0(object sender, SelectionChangedEventArgs e)
         {
-            Configini.IniWritevalue("SYS", "COM0", comboBoxCOM0.SelectedValue.ToString());
-            Configini.IniWritevalue("SYS", "COM1", comboBoxCOM1.SelectedValue.ToString());
-            Configini.IniWritevalue("SYS", "COM2", comboBoxCOM2.SelectedValue.ToString());
+            Configini.IniWritevalue("SYS", "COMP1", comboBoxCOM0.SelectedValue.ToString());
+          //  Configini.IniWritevalue("SYS", "COMP1", comboBoxCOM1.SelectedValue.ToString());
+          //  Configini.IniWritevalue("SYS", "COMP2", comboBoxCOM2.SelectedValue.ToString());
+        }
+        private void comboBoxCOM_SelectionChanged1(object sender, SelectionChangedEventArgs e)
+        {
+            //Configini.IniWritevalue("SYS", "COMP0", comboBoxCOM0.SelectedValue.ToString());
+              Configini.IniWritevalue("SYS", "COMP2", comboBoxCOM1.SelectedValue.ToString());
+            //  Configini.IniWritevalue("SYS", "COMP2", comboBoxCOM2.SelectedValue.ToString());
+        }
+        private void comboBoxCOM_SelectionChanged2(object sender, SelectionChangedEventArgs e)
+        {
+            //Configini.IniWritevalue("SYS", "COMP0", comboBoxCOM0.SelectedValue.ToString());
+            //  Configini.IniWritevalue("SYS", "COMP1", comboBoxCOM1.SelectedValue.ToString());
+              Configini.IniWritevalue("SYS", "COMP3", comboBoxCOM2.SelectedValue.ToString());
         }
-
         private void comboBoxLanguage_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             Configini.IniWritevalue("SYS", "Language", comboBoxLanguage.SelectedValue.ToString());
@@ -114,7 +126,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 MainWindowViewModel.SQMOD = TEXT_SQMOD.Text;
                 MainWindowViewModel.SQLUSER = TEXT_SQLUSER.Text;
                 MainWindowViewModel.SQLPASWORD = TEXT_SQLPASWORD.Text;
-                MainWindowViewModel.SQL_LINK();//更新设定
             }
         }
 

View/MachinesSet.xaml

@@ -63,27 +63,31 @@
                 <DataGridTextColumn Binding="{Binding IP}" Width="0" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding PORT}" Width="0" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Serial}" Width="0" IsReadOnly="True"/>
-                <DataGridTextColumn Binding="{Binding Baud}" Width="0" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding Station}" Width="0" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding ID}" Width="0" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding Model}" Width="0" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding Type}" Width="0" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
 
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,10,0,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" FontSize="20" IsEditable="True" />
+        <ComboBox HorizontalAlignment="Left" Height="40" Margin="150,10,0,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" FontSize="20" IsEditable="True" />
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,10,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Machine}" VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="150,50,0,0" x:Name="TextMachineGroup" VerticalAlignment="Top" Width="270" FontSize="20" MaxLines="1"/>
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="150,50,0,0" x:Name="TextMachineGroup" VerticalAlignment="Top" Width="270" FontSize="20" MaxLines="1"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,50,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.MachineGroup}" VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="150,100,0,0" x:Name="IP" VerticalAlignment="Top" Width="200" FontSize="20" MaxLines="1"/>
-        <TextBlock HorizontalAlignment="Left" Height="40" Margin="350,100,0,0" TextWrapping="Wrap" Text=":" VerticalAlignment="Top" Width="20" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="360,100,0,0" x:Name="PORT" VerticalAlignment="Top" Width="60" FontSize="20" MaxLines="1" Text="7789"/>
-        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,100,0,0" TextWrapping="Wrap" Text="IP/PORT" VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,150,0,0" x:Name="comboBoxCOM0" VerticalAlignment="Top" Width="200" FontSize="20" />
-        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,150,0,0" TextWrapping="Wrap" Text="COM" VerticalAlignment="Top" Width="120" FontSize="25"/>
-        <TextBox HorizontalAlignment="Left" Height="30" Margin="360,150,0,0" x:Name="BAUD" VerticalAlignment="Top" Width="60" FontSize="20" MaxLines="1" Text="57600"/>
+        <ComboBox HorizontalAlignment="Left" Height="40" Margin="150,100,0,0" x:Name="comboBoxtype" VerticalAlignment="Top" Width="270" FontSize="20" IsEditable="True" />
+        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,100,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Type}" VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="150,150,0,0" x:Name="IP" VerticalAlignment="Top" Width="200" FontSize="20" MaxLines="1"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="350,150,0,0" TextWrapping="Wrap" Text=":" VerticalAlignment="Top" Width="20" FontSize="25"/>
-        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,200,0,0" x:Name="textlog" TextWrapping="Wrap" Text="------------" VerticalAlignment="Top" Width="140" FontSize="20"/>
-        <Button Content="{x:Static lang:Resources.Save}" HorizontalAlignment="Left" Height="35" Margin="250,200,0,5" VerticalAlignment="Top" Width="80" Click="Save_Click"/>
-        <Button Content="{x:Static lang:Resources.Delete}" HorizontalAlignment="Left" Height="35" Margin="340,200,0,5" VerticalAlignment="Top" Width="80" Click="Delete_Click"/>
-        <Button Content="{x:Static lang:Resources.Test}" HorizontalAlignment="Left" Height="35" Margin="160,200,50,5" VerticalAlignment="Top" Width="80" Click="Test_Click"/>
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="360,150,0,0" x:Name="PORT" VerticalAlignment="Top" Width="60" FontSize="20" MaxLines="1" Text="7789"/>
+        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,150,0,0" TextWrapping="Wrap" Text="IP/PORT" VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <ComboBox HorizontalAlignment="Left" Height="40" Margin="150,200,0,0" x:Name="comboBoxCOM0" VerticalAlignment="Top" Width="200" FontSize="20" />
+        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,200,0,0" TextWrapping="Wrap" Text="COM" VerticalAlignment="Top" Width="120" FontSize="25"/>
+        <TextBox HorizontalAlignment="Left" Height="40" Margin="360,200,0,0" x:Name="Station" VerticalAlignment="Top" Width="60" FontSize="20" MaxLines="1" Text="00"/>
+        <TextBlock HorizontalAlignment="Left" Height="40" Margin="350,200,0,0" TextWrapping="Wrap" Text=":" VerticalAlignment="Top" Width="20" FontSize="25"/>
+        <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,250,0,0" x:Name="textlog" TextWrapping="Wrap" Text="------------" VerticalAlignment="Top" Width="140" FontSize="20"/>
+        <Button Content="{x:Static lang:Resources.Save}" HorizontalAlignment="Left" Height="35" Margin="250,250,0,5" VerticalAlignment="Top" Width="80" Click="Save_Click"/>
+        <Button Content="{x:Static lang:Resources.Delete}" HorizontalAlignment="Left" Height="35" Margin="340,250,0,5" VerticalAlignment="Top" Width="80" Click="Delete_Click"/>
+        <Button Content="{x:Static lang:Resources.Test}" HorizontalAlignment="Left" Height="35" Margin="160,250,50,5" VerticalAlignment="Top" Width="80" Click="Test_Click"/>
 
 
 

View/MachinesSet.xaml.cs

@@ -35,15 +35,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             InitializeComponent();
 
             // 获取所有可用串口端口，并添加到comboBoxCOM
-            string[] ports = System.IO.Ports.SerialPort.GetPortNames();
+            // string[] ports = System.IO.Ports.SerialPort.GetPortNames();
             comboBoxCOM0.ItemsSource = ports;
             comboBoxCOM0.Text = Configini.IniReadvalue("SYS", "COM");
             comboBoxMachine.ItemsSource = MainWindowViewModel.Machines.AsEnumerable().Select(rowdata => rowdata.Field<string>("name")).ToList();//转换机台                                                                                                                            
-
+            comboBoxtype.ItemsSource = type_;
         }
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
+        string[] ports = { "PORT1", "PORT2", "PORT3", "PORT4" };
+        string[] type_ = { "828", "838" };
+        string link_model = "838" ;
         private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
         //private string SYS_machines = null;
         int ID_;
@@ -63,82 +64,123 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 IP.Text = (Griddata.Columns[3].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
                 PORT.Text = (Griddata.Columns[4].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
                 comboBoxCOM0.Text = (Griddata.Columns[5].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
-                BAUD.Text = (Griddata.Columns[6].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
+                Station.Text = (Griddata.Columns[6].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
+                comboBoxtype.Text = (Griddata.Columns[8].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;
             }
         }
 
         private void Save_Click(object sender, RoutedEventArgs e)
         {
+            if (string.IsNullOrEmpty(Station.Text)) Station.Text = "255";
             if (!string.IsNullOrEmpty(comboBoxMachine.Text))
             {
-
                 Dictionary<string, object> Machines_DAT = new Dictionary<string, object>();//缓存函数
-                Dictionary<string, object> dr_new = new Dictionary<string, object>();//缓存函数
-                dr_new.Add("Name", comboBoxMachine.Text);
-                dr_new.Add("Groups", TextMachineGroup.Text);
-                dr_new.Add("IP", IP.Text);
-                dr_new.Add("PORT", PORT.Text); 
-                dr_new.Add("Serial", comboBoxCOM0.Text);
-                dr_new.Add("Baud", BAUD.Text);
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                if (SQLiteHelpers.ExecuteDataSet("select * from Machines where name ='" + comboBoxMachine.Text + "'", null).Tables[0].Rows.Count == 0)
+                if (MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Machines where name ='" + comboBoxMachine.Text + "'", null).Tables[0].Rows.Count == 0)
                 {
-                    MainWindowViewModel.Machines.Rows.Add(dr_new);
-                    DatSteps(MainWindowViewModel.Machines);               
-                    SQLiteHelpers.Delete("Machines", null, null);// 
-                    for (int x = 0; x < MainWindowViewModel.Machines.Rows.Count; x++)
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
                     {
-                        Machines_DAT.Add("ID", MainWindowViewModel.Machines.Rows[x]["ID"]);
-                        Machines_DAT.Add("Name", MainWindowViewModel.Machines.Rows[x]["Name"]);
-                        Machines_DAT.Add("IP", MainWindowViewModel.Machines.Rows[x]["IP"]);
-                        Machines_DAT.Add("PORT", MainWindowViewModel.Machines.Rows[x]["PORT"]);
-                        Machines_DAT.Add("Serial", MainWindowViewModel.Machines.Rows[x]["Serial"]);
-                        Machines_DAT.Add("Baud", MainWindowViewModel.Machines.Rows[x]["Baud"]);
-                        Machines_DAT.Add("Groups", MainWindowViewModel.Machines.Rows[x]["Groups"]);
-                        Machines_DAT.Add("Desktop", MainWindowViewModel.Machines.Rows[x]["Desktop"]);
-                        Machines_DAT.Add("Dispense", MainWindowViewModel.Machines.Rows[x]["Dispense"]);
-                        Machines_DAT.Add("LOCK", "FALSE");
-                        SQLiteHelpers.InsertData("Machines", Machines_DAT);//行插入                                                                             
-                        Machines_DAT.Clear();
+                        DataRow dat_ = MainWindowViewModel.Machines.NewRow();
+                        dat_.BeginEdit();
+                        dat_["Name"] = comboBoxMachine.Text;
+                        dat_["Groups"] = TextMachineGroup.Text;
+                        dat_["IP"] = IP.Text;
+                        dat_["PORT"] = PORT.Text;
+                        dat_["Serial"] = comboBoxCOM0.Text;
+                        dat_["Model"] = comboBoxtype.Text;
+                        dat_["Station"] = Station.Text;
+                        dat_["ID"] = 999;
+                        dat_["ERR"] = false;
+                        dat_["AUTO"] = false;
+                        dat_["CALL"] = false;
+                        dat_["LOCK"] = false;
+                        dat_["State"] = 800;
+                        dat_["Temperature"] = 0;
+                        dat_["WaterLevel"] = 0;
+                        dat_["WORK_RUN"] = -1;
+                        dat_["UserInfoStart"] = 900;
+                        if (comboBoxtype.Text.Contains(link_model))
+                        {
+                            dat_["Desktop"] = true;
+                            dat_["Type"] = true;
+                        }
+                        else
+                        {
+                            dat_["Desktop"] = false;
+                            dat_["Type"] = false;
+                        }
+                        dat_.EndEdit();
+                        MainWindowViewModel.Machines.Rows.Add(dat_);
+                        DatSteps(MainWindowViewModel.Machines);
+                        MainWindowViewModel.SQLiteHelpers.Delete("Machines", null, null);// 
+                        for (int x = 0; x < MainWindowViewModel.Machines.Rows.Count; x++)
+                        {
+                            Machines_DAT.Add("ID", MainWindowViewModel.Machines.Rows[x]["ID"]);
+                            Machines_DAT.Add("Name", MainWindowViewModel.Machines.Rows[x]["Name"]);
+                            Machines_DAT.Add("IP", MainWindowViewModel.Machines.Rows[x]["IP"]);
+                            Machines_DAT.Add("PORT", MainWindowViewModel.Machines.Rows[x]["PORT"]);
+                            Machines_DAT.Add("Serial", MainWindowViewModel.Machines.Rows[x]["Serial"]);
+                            Machines_DAT.Add("Station", MainWindowViewModel.Machines.Rows[x]["Station"]);
+                            Machines_DAT.Add("Groups", MainWindowViewModel.Machines.Rows[x]["Groups"]);
+                            Machines_DAT.Add("Desktop", MainWindowViewModel.Machines.Rows[x]["Desktop"]);
+                            Machines_DAT.Add("Dispense", MainWindowViewModel.Machines.Rows[x]["Dispense"]);
+                            Machines_DAT.Add("Type", MainWindowViewModel.Machines.Rows[x]["Type"]);
+                            Machines_DAT.Add("Model", MainWindowViewModel.Machines.Rows[x]["Model"]);
+                            MainWindowViewModel.SQLiteHelpers.InsertData("Machines", Machines_DAT);//行插入                                                                             
+                            Machines_DAT.Clear();
+                        }
                     }
                 }
                 else
                 {
-                    DataRow dr = MainWindowViewModel.Machines.Rows[ID_-1];
-                    dr.BeginEdit();
-                    dr["Name"] = comboBoxMachine.Text;
-                    dr["Groups"] = TextMachineGroup.Text;
-                    dr["IP"] = IP.Text;
-                    dr["PORT"] = PORT.Text;
-                    dr["Serial"] = comboBoxCOM0.Text;
-                    dr["Baud"] = BAUD.Text;
-                    dr.EndEdit();
-                    SQLiteHelpers.Delete("Machines", null, null);// 
-                    for (int x = 0; x < MainWindowViewModel.Machines.Rows.Count; x++)
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
                     {
-                        Machines_DAT.Add("ID", MainWindowViewModel.Machines.Rows[x]["ID"]);
-                        Machines_DAT.Add("Name", MainWindowViewModel.Machines.Rows[x]["Name"]);
-                        Machines_DAT.Add("IP", MainWindowViewModel.Machines.Rows[x]["IP"]);
-                        Machines_DAT.Add("PORT", MainWindowViewModel.Machines.Rows[x]["PORT"]);
-                        Machines_DAT.Add("Serial", MainWindowViewModel.Machines.Rows[x]["Serial"]);
-                        Machines_DAT.Add("Baud", MainWindowViewModel.Machines.Rows[x]["Baud"]);
-                        Machines_DAT.Add("Groups", MainWindowViewModel.Machines.Rows[x]["Groups"]);
-                        Machines_DAT.Add("Desktop", MainWindowViewModel.Machines.Rows[x]["Desktop"]);
-                        Machines_DAT.Add("Dispense", MainWindowViewModel.Machines.Rows[x]["Dispense"]);
-                        Machines_DAT.Add("LOCK", "FALSE");
-                        SQLiteHelpers.InsertData("Machines", Machines_DAT);//行插入                                                                             
-                        Machines_DAT.Clear();
+                        DataRow dr = MainWindowViewModel.Machines.Rows[ID_];
+                        dr.BeginEdit();
+                        dr["Name"] = comboBoxMachine.Text;
+                        dr["Groups"] = TextMachineGroup.Text;
+                        dr["IP"] = IP.Text;
+                        dr["PORT"] = PORT.Text;
+                        dr["Serial"] = comboBoxCOM0.Text;
+                        dr["Model"] = comboBoxtype.Text;
+                        dr["Station"] = Station.Text;
+                        if (comboBoxtype.Text.Contains(link_model))
+                        {
+                            dr["Desktop"] = true;
+                            dr["Type"] = true;
+                        }
+                        else
+                        {
+                            dr["Desktop"] = false;
+                            dr["Type"] = false;
+                        }
+                        dr.EndEdit();
+                        MainWindowViewModel.SQLiteHelpers.Delete("Machines", null, null);// 
+                        for (int x = 0; x < MainWindowViewModel.Machines.Rows.Count; x++)
+                        {
+                            Machines_DAT.Add("ID", MainWindowViewModel.Machines.Rows[x]["ID"]);
+                            Machines_DAT.Add("Name", MainWindowViewModel.Machines.Rows[x]["Name"]);
+                            Machines_DAT.Add("IP", MainWindowViewModel.Machines.Rows[x]["IP"]);
+                            Machines_DAT.Add("PORT", MainWindowViewModel.Machines.Rows[x]["PORT"]);
+                            Machines_DAT.Add("Serial", MainWindowViewModel.Machines.Rows[x]["Serial"]);
+                            Machines_DAT.Add("Station", MainWindowViewModel.Machines.Rows[x]["Station"]);
+                            Machines_DAT.Add("Groups", MainWindowViewModel.Machines.Rows[x]["Groups"]);
+                            Machines_DAT.Add("Desktop", MainWindowViewModel.Machines.Rows[x]["Desktop"]);
+                            Machines_DAT.Add("Dispense", MainWindowViewModel.Machines.Rows[x]["Dispense"]);
+                            Machines_DAT.Add("Type", MainWindowViewModel.Machines.Rows[x]["Type"]);
+                            Machines_DAT.Add("Model", MainWindowViewModel.Machines.Rows[x]["Model"]);
+                            Machines_DAT.Add("LOCK", "FALSE");
+                            MainWindowViewModel.SQLiteHelpers.InsertData("Machines", Machines_DAT);//行插入                                                                             
+                            Machines_DAT.Clear();
+                        }
                     }
                 }
-                SQLiteHelpers.Close();
                 Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
                 comboBoxMachine.Text = null;
                 TextMachineGroup.Text = null;
                 IP.Text = null;
                 PORT.Text = "7789";
                 comboBoxCOM0.Text = null;
-                BAUD.Text = "57600";
+                Station.Text = "00";
             }
             else
             {
@@ -153,14 +195,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 MessageBoxResult vr = System.Windows.MessageBox.Show(Properties.Resources.Delete + comboBoxMachine.Text, "SCCM", MessageBoxButton.OKCancel, MessageBoxImage.Question);
                 if (vr == MessageBoxResult.OK) // 如果是确定，就执行下面代码
                 {
-                    MainWindowViewModel.Machines.Rows.RemoveAt(ID_-1);
-                    DatSteps(MainWindowViewModel.Machines);
-                  
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                    SQLiteHelpers.Open();  //打开数据库
+                    lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+                    {
+                        MainWindowViewModel.Machines.Rows.RemoveAt(ID_ - 1);
+                        DatSteps(MainWindowViewModel.Machines);
+                    }                 
                     Dictionary<string, object> Machines_DAT = new Dictionary<string, object>();//缓存函数
 
-                    SQLiteHelpers.Delete("Machines",null, null);// 
+                    MainWindowViewModel.SQLiteHelpers.Delete("Machines", null, null);// 
                     for (int x = 0; x < MainWindowViewModel.Machines.Rows.Count; x++)
                     {
                         Machines_DAT.Add("ID", MainWindowViewModel.Machines.Rows[x]["ID"]);
@@ -168,15 +210,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         Machines_DAT.Add("IP", MainWindowViewModel.Machines.Rows[x]["IP"]);
                         Machines_DAT.Add("PORT", MainWindowViewModel.Machines.Rows[x]["PORT"]);
                         Machines_DAT.Add("Serial", MainWindowViewModel.Machines.Rows[x]["Serial"]);
-                        Machines_DAT.Add("Baud", MainWindowViewModel.Machines.Rows[x]["Baud"]);
+                        Machines_DAT.Add("Station", MainWindowViewModel.Machines.Rows[x]["Station"]);
                         Machines_DAT.Add("Groups", MainWindowViewModel.Machines.Rows[x]["Groups"]);
                         Machines_DAT.Add("Desktop", MainWindowViewModel.Machines.Rows[x]["Desktop"]);
                         Machines_DAT.Add("Dispense", MainWindowViewModel.Machines.Rows[x]["Dispense"]);
                         Machines_DAT.Add("LOCK", "FALSE");
-                        SQLiteHelpers.InsertData("Machines", Machines_DAT);//行插入                                                                             
+                        MainWindowViewModel.SQLiteHelpers.InsertData("Machines", Machines_DAT);//行插入                                                                             
                         Machines_DAT.Clear();
                     }
-                    SQLiteHelpers.Close();  //关闭连接
 
                     Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
                     comboBoxMachine.Text = null;
@@ -196,60 +237,109 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             {
                 DataRow dr = db.Rows[i];
                 dr.BeginEdit();
-                dr["ID"] = i ;
+                dr["ID"] = i;
                 dr.EndEdit();
             }
         }
         private void Test_Click(object sender, RoutedEventArgs e)//测试按钮
         {
-            if (!string.IsNullOrEmpty(IP.Text) && !string.IsNullOrEmpty(PORT.Text))
-            {
-                textlog.Text = "TEST";
-                textlog.Foreground = new SolidColorBrush(Color.FromRgb(0, 0, 255));
-                //------------使用ping类------
-                string host = IP.Text;
-                Ping p1 = new Ping();
-                PingReply reply = p1.Send(host); //发送主机名或Ip地址
-                                                 //StringBuilder sbuilder;
-                if (reply.Status == IPStatus.Success)
+           
+            if (comboBoxtype.Text.Contains(link_model))
+            {//网络
+                if (!string.IsNullOrEmpty(IP.Text) && !string.IsNullOrEmpty(PORT.Text))
                 {
-                    Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-                    //连接服务器,绑定IP 与 端口
-                    IPEndPoint iPEndPoint = new IPEndPoint(IPAddress.Parse(IP.Text), int.Parse(PORT.Text));
+                    textlog.Text = "TEST";
+                    textlog.Foreground = new SolidColorBrush(Color.FromRgb(0, 0, 255));
+                    //------------使用ping类------
+                    string host = IP.Text;
                     try
                     {
-                        socket.Connect(iPEndPoint);
-                        socket.Close();//离线
-                        textlog.Text = "Link succeed";
-                        textlog.Foreground = new SolidColorBrush(Color.FromRgb(0, 255, 0));
+                        Ping p1 = new Ping();
+                        PingReply reply = p1.Send(host); //发送主机名或Ip地址
+                                                         //StringBuilder sbuilder;
+                        if (reply.Status == IPStatus.Success)
+                        {
+                            Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                            //连接服务器,绑定IP 与 端口
+                            IPEndPoint iPEndPoint = new IPEndPoint(IPAddress.Parse(IP.Text), int.Parse(PORT.Text));
+                            try
+                            {
+                                socket.Connect(iPEndPoint);
+                                socket.Close();//离线
+                                textlog.Text = "Link succeed";
+                                textlog.Foreground = new SolidColorBrush(Color.FromRgb(0, 255, 0));
+                            }
+                            catch (Exception)
+                            {
+                                textlog.Text = "Link failed";
+                                textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 0));
+                            }
+                        }
+                        else if (reply.Status == IPStatus.TimedOut)
+                        {
+                            textlog.Text = "Link timeout";
+                            textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+                        }
+                        else
+                        {
+                            textlog.Text = "No links";
+                            textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+                        }
                     }
                     catch (Exception) 
                     {
-                        textlog.Text = "Link failed";
-                        textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 0));
+                        textlog.Text = "No links";
+                        textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
                     }
                 }
-                else if (reply.Status == IPStatus.TimedOut)
+                else if (!string.IsNullOrEmpty(comboBoxCOM0.Text))
                 {
-                    textlog.Text = "Link timeout";
-                    textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+
                 }
                 else
                 {
-                    textlog.Text = "No links";
+                    textlog.Text = "Invalid";
                     textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
                 }
-            }
-            else if (!string.IsNullOrEmpty(comboBoxCOM0.Text))
-            {
 
             }
             else 
-            {
-                textlog.Text = "Invalid";
-                textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
-            }
+            {//串口
+                if (!string.IsNullOrEmpty(comboBoxCOM0.Text) && !string.IsNullOrEmpty(Station.Text))
+                {
+                    textlog.Text = "TEST";
+                    textlog.Foreground = new SolidColorBrush(Color.FromRgb(0, 0, 255));
+                    //------------使用ping类------
+                    string host = IP.Text;
+                    Ping p1 = new Ping();
+                    PingReply reply = p1.Send(host); //发送主机名或Ip地址
+                                                     //StringBuilder sbuilder;
+                    if (reply.Status == IPStatus.Success)
+                    {
+                        try
+                        {
+                            textlog.Text = "Link succeed";
+                            textlog.Foreground = new SolidColorBrush(Color.FromRgb(0, 255, 0));
+                        }
+                        catch (Exception)
+                        {
+                            textlog.Text = "Link failed";
+                            textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 0));
+                        }
+                    }
+                    else
+                    {
+                        textlog.Text = "No links";
+                        textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+                    }
+                }
+                else
+                {
+                    textlog.Text = "Invalid";
+                    textlog.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+                }
 
+            }
         }
     }
 }

View/MachinesView.xaml

@@ -16,6 +16,8 @@
     <UserControl.Resources>
         <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
         <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+        <ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
         <ConvertMoels:BoolRBConvert x:Key="BoolRBConvert"/>
         <ConvertMoels:IORBConvert x:Key="IORBConvert"/>
     </UserControl.Resources>
@@ -30,7 +32,7 @@
  CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"   
  CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" 
                   AutoGenerateColumns="False" MinColumnWidth="30"                             
-                  HorizontalAlignment="Left" Width="310" MouseDoubleClick="Griddata_MouseDoubleClick">
+                  HorizontalAlignment="Left" Width="250" MouseDoubleClick="Griddata_MouseDoubleClick">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Setter Property="Height" Value="30" />
@@ -77,11 +79,11 @@
                                     <Grid>
                                         <StackPanel Width="100" Orientation="Horizontal">
                                             <materialDesign:PackIcon  Width="25" Height="30" 
-                                                        Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"                                                      
-                                                        Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
-                                            <materialDesign:PackIcon  Width="25" Height="30"                                                
-                                                        Kind="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"                                                       
-                                                        Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+                           Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"                                                      
+                           Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+                                            <materialDesign:PackIcon  Width="25" Height="30" Kind="Lock"                                              
+                           Visibility="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"                                                       
+                           Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>
@@ -89,17 +91,52 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Machine}" Binding="{Binding Name}" Width="210" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Machine}" Binding="{Binding Name}" Width="150" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        <Grid Grid.Row="0" Margin="310,0,0,0">
+        <Grid Grid.Row="0" Margin="250,0,0,0">
             <Grid.RowDefinitions>
-                <RowDefinition/>
+                <RowDefinition Height="0"/>
                 <RowDefinition Height="5"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <ContentControl Grid.Row="0" x:Name="machineView"/>
             <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" Background="#FF00204E"/>
+            <Grid Grid.Row="2" x:Name="LOG_GRID" Visibility="Collapsed">
+                <DataGrid x:Name="LOG_Grid" AlternationCount="2" Margin="0,0,0,0"                
+           HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"         
+           BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"          
+            Background="White" SelectionMode="Single" FontSize="15"  >
+                    <DataGrid.RowStyle >
+                        <Style TargetType="{x:Type DataGridRow}">
+                            <Setter Property="Height" Value="30" />
+                            <Setter Property="FontSize" Value="25" />
+                            <Style.Triggers>
+                                <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                                    <Setter Property="Background" Value="#FFFFFFFF" />
+                                </Trigger>
+                                <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                                    <Setter Property="Background" Value="#FFF0F0F0" />
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="False"/>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.RowStyle>
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="MinWidth" Value="20"/>
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Background" Value="#FFC0C0C0"/>
+                                    <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                                    <Setter Property="Foreground" Value="Black"/>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.CellStyle>
+                </DataGrid>
+            </Grid>
             <Grid Grid.Row="2" x:Name="SET_GRID" Visibility="Collapsed">
                 <DataGrid x:Name="SET_Grid" AlternationCount="2" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False"
                           ItemsSource="{Binding Path=Paramete_Set,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
@@ -389,6 +426,14 @@
                     </StackPanel>
                 </ListViewItem>
             </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_LOG">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="MathLog" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.log}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
         </StackPanel>
         <StackPanel Grid.Row="2" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="400" HorizontalAlignment="Right">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">

View/MachinesView.xaml.cs

@@ -58,15 +58,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             CountDown();
         }
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
-        //private string SYS_machines = null;
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
            
         }
         string machine;
+        int LOG_ = 0;
+        public static DataTable LOG_dataTable = new DataTable();    
         private void Griddata_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量
@@ -85,6 +83,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void ListViewItem_ArrowLeftRight(object sender, MouseButtonEventArgs e)
         {
+            LOG_GRID.Visibility = Visibility.Collapsed;
             IO_GRID.Visibility = Visibility.Visible;
             SYS_GRID.Visibility = Visibility.Collapsed;
             SET_GRID.Visibility = Visibility.Collapsed;
@@ -92,13 +91,81 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         }
         private void ListViewItem_VideoHomeSystem(object sender, MouseButtonEventArgs e)
         {
+            LOG_GRID.Visibility = Visibility.Collapsed;
             IO_GRID.Visibility = Visibility.Collapsed;
             SYS_GRID.Visibility = Visibility.Visible;
             SET_GRID.Visibility = Visibility.Collapsed;
             view = 2;
         }
+        private void ListViewItem_LOG(object sender, MouseButtonEventArgs e)
+        {
+            if (LOG_ >= 3) { LOG_ = 0; }
+            else
+            { LOG_++; }
+
+            LOG_GRID.Visibility = Visibility.Visible;
+            IO_GRID.Visibility = Visibility.Collapsed;
+            SYS_GRID.Visibility = Visibility.Collapsed;
+            SET_GRID.Visibility = Visibility.Collapsed;
+            view = 3;
+            LOG_dataTable.Clear();
+            Dictionary<string, object> dat_859 =new Dictionary<string, object>();
+         
+            if (LOG_ == 0)
+            {
+                MAC_name.Text = machine+ "(SERVER)";
+                dat_859.Add("INSTRUCTION", "SERVER");
+                dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
+                dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+            }
+            else if (LOG_ == 1)
+            {
+                MAC_name.Text = machine + "(OperationLog)";
+                dat_859.Add("INSTRUCTION", "OperationLog");
+                dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
+                dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+            }
+            else if (LOG_ == 2)
+            {
+                MAC_name.Text = machine + "(IOLog)";
+                dat_859.Add("INSTRUCTION", "IOLog");
+                dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
+                dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+            }
+            else
+            {
+                MAC_name.Text = machine + "(ERRLog)";
+                dat_859.Add("INSTRUCTION", "ERRLog");
+                dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"));
+                dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+            }           
+
+            if (!string.IsNullOrEmpty(machine))
+            {
+                DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+                int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
+                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
+                {
+                    if (drEmployee.Field<bool>("Type"))//
+                    {//网络
+                        MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                        {
+                            ID = index,
+                            DAT = "SC859" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
+                        + dat_859.ToJsonString()
+                        });
+                    }
+                    else 
+                    {//串口
+
+                    }
+                }
+            }
+        }
         private void ListViewItem_Dharmachakra(object sender, MouseButtonEventArgs e)
         {
+            LOG_GRID.Visibility = Visibility.Collapsed;
             IO_GRID.Visibility = Visibility.Collapsed;
             SYS_GRID.Visibility = Visibility.Collapsed;
             SET_GRID.Visibility = Visibility.Visible;
@@ -131,10 +198,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 Dictionary<string, object> datagrid_v = new Dictionary<string, object>();//缓存函数
                 datagrid_v.Add("PLC", newValue);
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新
-                SQLiteHelpers.Close();//关闭数据库
+                MainWindowViewModel.SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新             
             }
             IO_data();//重新获得io表
             D_view = true;
@@ -157,10 +221,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 Dictionary<string, object> datagrid_v = new Dictionary<string, object>();//缓存函数
                 datagrid_v.Add("PLC", newValue);
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新
-                SQLiteHelpers.Close();//关闭数据库
+                MainWindowViewModel.SQLiteHelpers.Update("IOName", datagrid_v, "ID ='" + ID + "'", null);//更新
             }
             A_view = true;
         }
@@ -184,11 +245,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
                 int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
-                MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
-                {
-                    ID = index,
-                    DAT = "SC862" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
-                });//发送862指令修改系统设置
+                if (drEmployee.Field<bool>("Type"))//
+                {//网络
+                    MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                    {
+                        ID = index,
+                        DAT = "SC862" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
+                    });//发送862指令修改系统设置
+                }
+                else
+                {//串口 
+
+                }
             }
             SysSet_view = true;
         }
@@ -207,11 +275,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
                 int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
-                MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
-                {
-                    ID = index,
-                    DAT = "SC861" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") +datagrid_v.ToJsonString()
-                });//发送861指令修改程序设置
+                if (drEmployee.Field<bool>("Type"))//
+                {//网络
+                    MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                    {
+                        ID = index,
+                        DAT = "SC861" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
+                    });//发送861指令修改程序设置
+                }
+                else 
+                {//串口
+
+                }
             }
             ParameterSet_view = true;
         }
@@ -232,42 +307,67 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (!string.IsNullOrEmpty(machine))
             {
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
-                int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
-                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
-                if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
-                {
-                    if (view == 0)
+
+                if (drEmployee.Field<bool>("Type"))//
+                {//网络
+                    int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
+                    int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                    if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                     {
-                        MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                        if (view == 0)
                         {
-                            ID = index,
-                            DAT = "SC851" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
-                        });
-                        MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            {
+                                ID = index,
+                                DAT = "SC851" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
+                            });
+                            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            {
+                                ID = index,
+                                DAT = "SC852" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
+                            });
+                            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            {
+                                ID = index,
+                                DAT = "SC853" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
+                            });
+                        }
+                        else if (view == 1)
                         {
-                            ID = index,
-                            DAT = "SC852" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
-                        });
-                        MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            {
+                                ID = index,
+                                DAT = "SC854" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
+                            });
+                        }
+                        else if (view == 2)
                         {
-                            ID = index,
-                            DAT = "SC853" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
-                        });
-                    } else if (view==1) 
-                    {
-                        MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
-                        {
-                            ID = index,
-                            DAT = "SC854" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
-                        });
+                            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                            {
+                                ID = index,
+                                DAT = "SC855" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
+                            });
+                        }
                     }
-                    else if (view == 2)
+                }
+                else
+                {//串口
+                    int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
+                    int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                    if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                     {
-                        MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                        if (view == 0)
                         {
-                            ID = index,
-                            DAT = "SC855" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
-                        });
+                           
+                        }
+                        else if (view == 1)
+                        {
+                           
+                        }
+                        else if (view == 2)
+                        {
+                            
+                        }
                     }
                 }
             }
@@ -286,6 +386,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             IO_data();
             DATA_view();
+            if (LOG_dataTable.Rows.Count > 0) {
+                LOG_Grid.ItemsSource = LOG_dataTable.DefaultView;
+            //    LOG_dataTable.Clear();
+            }
         }
         private async void DATA_view()//IO显示
         {

View/MonitorView.xaml

@@ -17,6 +17,17 @@
         <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
         <ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
         <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
+        <ContextMenu x:Key="PersoncontextMenu">
+            <MenuItem Header="{x:Static lang:Resources._lock}" Click="MenuItem_LOCK_XML"/>
+            <MenuItem Header="{x:Static lang:Resources._Auto}" Click="MenuItem_AUTO_XML"/>
+            <MenuItem Header="{x:Static lang:Resources.Stop}" Click="MenuItem_Stop_XML"/>
+            <MenuItem Header="{x:Static lang:Resources.Start}" Click="MenuItem_Start_XML"/>
+        </ContextMenu>
+        <ContextMenu x:Key="PersoncontextMenuStep">
+            <MenuItem Header="{x:Static lang:Resources.edit}" Click="MenuItem_edit"/>
+            <MenuItem Header="{x:Static lang:Resources.Insert}" Click="MenuItem_Insert"/>
+            <MenuItem Header="{x:Static lang:Resources.Delete}" Click="MenuItem_Delete"/>
+        </ContextMenu>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -26,11 +37,12 @@
             <RowDefinition Height="60"/>
         </Grid.RowDefinitions>
         <DataGrid Grid.Row="0" Grid.Column="0" x:Name="Griddata" AlternationCount="2" IsReadOnly="True" 
-                  SelectionChanged="Griddata_SelectionChanged"     
+                  SelectionChanged="Griddata_SelectionChanged"      EnableRowVirtualization="True"  EnableColumnVirtualization="True"
+                  VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
                   d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30"                             
                   ItemsSource="{Binding Path=TechnologicalMachine_View,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"               
                   Background="White" GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" 
-                  CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"   
+                  CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="True"   
                   CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" >
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
@@ -51,6 +63,21 @@
                         <DataTrigger Binding="{Binding State}" Value="308">
                             <Setter Property="Background" Value="Yellow"/>
                         </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="800">
+                            <Setter Property="IsHitTestVisible" Value="False"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="101">
+                            <Setter Property="ContextMenu" Value="{StaticResource PersoncontextMenu}"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="201">
+                            <Setter Property="ContextMenu" Value="{StaticResource PersoncontextMenu}"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="202">
+                            <Setter Property="ContextMenu" Value="{StaticResource PersoncontextMenu}"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="309">
+                            <Setter Property="ContextMenu" Value="{StaticResource PersoncontextMenu}"/>
+                        </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </DataGrid.RowStyle>
@@ -89,8 +116,11 @@
                                             <materialDesign:PackIcon  Width="25" Height="30" 
                                                                       Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"                                                      
                                                                       Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
-                                            <materialDesign:PackIcon  Width="25" Height="30"                                                
-                                                                      Kind="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"                                                       
+                                            <materialDesign:PackIcon  Width="25" Height="30" Kind="Lock"                                              
+                                                                      Visibility="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"                                                       
+                                                                      Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
+                                            <materialDesign:PackIcon  Width="25" Height="30" Kind="HandBackRight"                                                         
+                                                                      Visibility="{Binding Path=AUTO,Converter={StaticResource StatexmlConvert}}"                                                                                 
                                                                       Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>                                 
                                         </StackPanel>
                                     </Grid>
@@ -99,19 +129,40 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Machine}" Binding="{Binding Name}" Width="150" IsReadOnly="True">
+                <DataGridTextColumn Header="{x:Static lang:Resources.Machine}" Binding="{Binding Name}" Width="80" IsReadOnly="True">
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="{x:Type TextBlock}">
                             <Setter Property="Foreground" Value="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
                         </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrder}" Binding="{Binding WorkOrder}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrder}" Binding="{Binding WorkOrder}" Width="200" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                            <Setter Property="ToolTip" Value="{Binding WorkOrder}"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
                 <DataGridTextColumn Header="{x:Static lang:Resources.Dyelot}" Binding="{Binding Dyelot}" Width="0" MaxWidth="0" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.Temperature}" Binding="{Binding Temperature}" Width="100" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.WaterLevel}" Binding="{Binding WaterLevel}" Width="100" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.process}" Binding="{Binding Process}" Width="300" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="300" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.process}" Binding="{Binding Process}" Width="300" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                            <Setter Property="ToolTip" Value="{Binding Process}"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="300" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                            <Setter Property="ToolTip" Value="{Binding Step}"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
                 <DataGridTextColumn Header="{x:Static lang:Resources.message}" Binding="{Binding Message}" Width="*" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
@@ -120,16 +171,17 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="5"/>
-                <ColumnDefinition/>
+                <ColumnDefinition MinWidth="1200"/>
             </Grid.ColumnDefinitions>
             <DataGrid Grid.Column="2" x:Name="Gridstep" AlternationCount="2" SelectionChanged="Gridstep_SelectionChanged"
+                       EnableRowVirtualization="True"  EnableColumnVirtualization="True"
+                  VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
                       d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"                         
                       ItemsSource="{Binding Path=TechnologicalProcess_View,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                       HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" Background="White"
                       GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" BorderBrush="{x:Null}"  
                       CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"    
-                      CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" AllowDrop="False" 
-            HeadersVisibility ="Column" >
+                      CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" CanUserAddRows="False">
                 <DataGrid.RowStyle >
                     <Style TargetType="{x:Type DataGridRow}">
                         <Setter Property="IsHitTestVisible" Value="{Binding DataContext.IsInteractive,
@@ -153,6 +205,10 @@
                             <DataTrigger Binding="{Binding RUN}" Value="9">
                                 <Setter Property="Background" Value="Red"/>
                             </DataTrigger>
+                            <DataTrigger Binding="{Binding DataContext.IsInteractive,                         
+                                RelativeSource={RelativeSource AncestorType=DataGrid}}" Value="true">
+                                <Setter Property="ContextMenu" Value="{StaticResource PersoncontextMenuStep}"/>
+                            </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </DataGrid.RowStyle>
@@ -168,13 +224,6 @@
                         </Style.Triggers>
                     </Style>
                 </DataGrid.CellStyle>
-                <DataGrid.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static lang:Resources.edit}" Click="MenuItem_edit"/>
-                        <MenuItem Header="{x:Static lang:Resources.Insert}" Click="MenuItem_Insert"/>
-                        <MenuItem Header="{x:Static lang:Resources.Delete}" Click="MenuItem_Delete"/>                            
-                    </ContextMenu>
-                </DataGrid.ContextMenu>
                 <DataGrid.Columns>
                     <!--列信息绑定-->
                     <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
@@ -265,14 +314,16 @@
             <TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>
             <Grid Margin="0,40,0,0" Grid.ColumnSpan="2" Grid.Column="0" >
                 <rdp:RemoteDesktopWpf x:Name="rdp" Visibility="Collapsed" />
+                <ScrollViewer VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly">
+                    <TextBlock x:Name="log" Text="{Binding Sys_machine}" TextWrapping="Wrap" FontSize="25" Background="White"/>
+                </ScrollViewer>
                 <ContentControl x:Name="Picture" Background="White"/>
-                <TextBlock x:Name="log" Text="{Binding Sys_machine}" TextWrapping="Wrap" FontSize="25" Background="White"/>
             </Grid>
             <GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/>        
         </Grid>        
         <StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Width="800" HorizontalAlignment="Left">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_DyeingMachine" IsEnabled="False" x:Name="DyeingMachine">
+                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_DyeingMachine" IsHitTestVisible="False" x:Name="DyeingMachine">
                     <StackPanel Orientation="Horizontal" >
                         <materialDesign:PackIcon Kind="CoffeeMachine" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.DyeingMachine}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -280,7 +331,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_Curve" IsEnabled="False" x:Name="Curve">
+                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_Curve" IsHitTestVisible="False" x:Name="Curve">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="ChartBellCurve" Width="40" Height="30" Margin="10" VerticalAlignment="Center"/>
                         <TextBlock Text="{x:Static lang:Resources.Curve}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -288,7 +339,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_Screen" IsEnabled="False" x:Name="Screen">
+                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_Screen" IsHitTestVisible="False" x:Name="Screen">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Monitor" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Screen}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -296,25 +347,17 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_Receipt" IsEnabled="False" x:Name="Receipt">
+                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_Receipt" IsHitTestVisible="False" x:Name="Receipt">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="ReceiptText" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Receipt}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                     </StackPanel>
                 </ListViewItem>
             </ListView>           
-            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem MinWidth="150" MouseLeftButtonUp="ListViewItem_LOCK_XML" IsEnabled="False" x:Name="LOCK_XML">
-                    <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Kind="LinkLock" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
-                        <TextBlock Text="{x:Static lang:Resources._lock}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                    </StackPanel>
-                </ListViewItem>
-            </ListView>
         </StackPanel>
         <StackPanel Grid.Row="3" x:Name="scr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="800,0,0,0">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Resume" IsEnabled="False" x:Name="Resume">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Resume" IsHitTestVisible="False" x:Name="Resume">
                     <StackPanel Orientation="Horizontal" >
                         <materialDesign:PackIcon Kind="Resume" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Resume}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -322,7 +365,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Paused" IsEnabled="False" x:Name="Paused">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Paused" IsHitTestVisible="False" x:Name="Paused">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Pause" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Paused}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -330,7 +373,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Stop" IsEnabled="False" x:Name="Stop">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Stop" IsHitTestVisible="False" x:Name="Stop">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Stop" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Stop}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -338,7 +381,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsHitTestVisible="False" x:Name="edit">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Edit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -346,7 +389,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Jump"  IsEnabled="False" x:Name="Jump">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Jump"  IsHitTestVisible="False" x:Name="Jump">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Jump" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Jump}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -354,7 +397,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsHitTestVisible="False" x:Name="Insert">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="InsertInvitation" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Insert}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -362,7 +405,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsHitTestVisible="False" x:Name="Delete">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Delete" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Delete}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>

View/ProductionPlanningEdit.xaml

@@ -6,8 +6,14 @@
              xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"    
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"          
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
+             xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels" 
              mc:Ignorable="d" Loaded="UserControl_Loaded"
              d:DesignHeight="900" d:DesignWidth="550">
+    <UserControl.Resources>
+        <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
+        <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
+    </UserControl.Resources>
     <Grid Background="White" Cursor="">
         <ComboBox HorizontalAlignment="Left" Height="30" Margin="150,30,0,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" 
                   FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxMachine_DropDownClosed" IsReadOnly="True" />
@@ -34,7 +40,7 @@
            Margin="0,200,0,60" >
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
-                    <Setter Property="Height" Value="25" />
+                    <Setter Property="Height" Value="100" />
                     <Setter Property="FontSize" Value="15" />
                     <Style.Triggers>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="0">
@@ -64,20 +70,76 @@
                 <!--列信息绑定-->
                 <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="40" IsReadOnly="True" />
-                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="200" Binding="{Binding StepName}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}"    
+                                    Width="60" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+   MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"  
+                                    MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+   MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="300"  IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <StackPanel>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0,0,0.5">
+                                    <TextBlock Height="50" >                         
+       <Run Text="{x:Static lang:Resources.Function}"/>        
+       <Run Text=":"/>                       
+       <Run Text="{Binding StepName}"/>
+                                    </TextBlock>
+                                </Border>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0.5,0,0">
+                                    <TextBlock Height="50" >                         
+       <Run Text="{x:Static lang:Resources.ParameterSet}"/>                           
+       <Run Text=":"/>                      
+       <Run Text="{Binding ParameterName}"/>
+                                    </TextBlock>
+                                </Border>
+                            </StackPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S3  ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
 

View/ProductionPlanningEdit.xaml.cs

@@ -32,8 +32,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
     /// </summary>
     public partial class ProductionPlanningEdit : UserControl
     {      
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
         DataTable ProgramName = new DataTable();
         DataTable WorkOrder =new DataTable();
         DataTable dat = new DataTable();
@@ -41,15 +39,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         public ProductionPlanningEdit(string workOrder, bool save)
         {
             InitializeComponent();
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            ProgramName = SQLiteHelpers.ExecuteDataSet("select * from ProgramName order by ProgramID desc", null).Tables[0];  //读取计划表写入缓存             
+            ProgramName = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from ProgramName order by ProgramID desc", null).Tables[0];  //读取计划表写入缓存             
             if (!string.IsNullOrEmpty(workOrder))
             {
-                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from Workorder where Workorder='" + workOrder + "' order by EndTime desc", null).Tables[0];
+                WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Workorder where Workorder='" + workOrder + "' order by EndTime desc", null).Tables[0];
                // dat = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps order by Step asc", null).Tables[0];
             }
-            SQLiteHelpers.Close();  //关闭连接
 
             if (!string.IsNullOrEmpty(workOrder))
             {
@@ -83,10 +78,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (sArray.Length <= 1)
             {
                 comboBoxDyelot.IsEnabled = true;
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                DataTable DatDyelot = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Machine='" + comboBoxMachine.Text + "' and State='101' order by Dyelot desc", null).Tables[0];  //读取计划表写入缓存                                                                                                                                                                       
-                SQLiteHelpers.Close();  //关闭连接
+                DataTable DatDyelot = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Machine='" + comboBoxMachine.Text + "' and State='101' order by Dyelot desc", null).Tables[0];  //读取计划表写入缓存                                                                                                                                                                       
                 comboBoxDyelot.ItemsSource = DatDyelot.AsEnumerable().Select(rowdata => rowdata.Field<string>("Dyelot")).ToList();//转换代码 
             }
         }
@@ -153,11 +145,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 string State_ = "100";
                 string Dyelot_ = comboBoxDyelot.Text;
                 string color_ = color_color.Background.ToString();
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
                 try
                 {
-                    sTime = SQLiteHelpers.ExecuteDataSet(
+                    sTime = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                         "select * from WorkOrder where Machines='" + comboBoxMachine.Text + "' order by EndTime desc", null).
                         Tables[0].Select().First().Field<object>("EndTime").ToString();  //读取计划表写入缓存                  
                     if (DateTime.Now < DateTime.Parse(sTime))
@@ -197,7 +187,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 WorkOrder_new.Add("Remark", null);
                 WorkOrder_new.Add("lock", 0);
                 WorkOrder_new.Add("color", color_);
-                SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
+                MainWindowViewModel.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
 
                 Dictionary<string, object> WorkOrder_DAT = new Dictionary<string, object>();//缓存函数
                 for (int x = 0; x < dat.Rows.Count; x++)
@@ -220,10 +210,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     WorkOrder_DAT.Add("Parameter8", dat.Rows[x]["Parameter8"]);
                     WorkOrder_DAT.Add("Parameter9", dat.Rows[x]["Parameter9"]);
                     WorkOrder_DAT.Add("Parameter10", dat.Rows[x]["Parameter10"]);
-                    SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
+                    MainWindowViewModel.SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
                     WorkOrder_DAT.Clear();
                 }
-                SQLiteHelpers.Close();  //关闭连接
             }
             else 
             {//多机器载入
@@ -260,11 +249,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     string State_ = "100";
                     string Dyelot_ = comboBoxDyelot.Text;
                     string color_ = color_color.Background.ToString();
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                    SQLiteHelpers.Open();  //打开数据库
                     try
                     {
-                        sTime = SQLiteHelpers.ExecuteDataSet(
+                        sTime = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                             "select * from WorkOrder where Machines='" + sArray[i] + "' order by EndTime desc", null).
                             Tables[0].Select().First().Field<object>("EndTime").ToString();  //读取计划表写入缓存                  
                         if (DateTime.Now < DateTime.Parse(sTime))
@@ -306,7 +293,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     WorkOrder_new.Add("color", color_);
                     //SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
                     //SQLiteHelpers.Open();  //打开数据库
-                    SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
+                    MainWindowViewModel.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);// 执行插入
 
                     Dictionary<string, object> WorkOrder_DAT = new Dictionary<string, object>();//缓存函数
                     for (int x = 0; x < dat.Rows.Count; x++)
@@ -329,10 +316,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         WorkOrder_DAT.Add("Parameter8", dat.Rows[x]["Parameter8"]);
                         WorkOrder_DAT.Add("Parameter9", dat.Rows[x]["Parameter9"]);
                         WorkOrder_DAT.Add("Parameter10", dat.Rows[x]["Parameter10"]);
-                        SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
+                        MainWindowViewModel.SQLiteHelpers.InsertData("WorkorderSteps", WorkOrder_DAT);//行插入                                                                             
                         WorkOrder_DAT.Clear();
                     }
-                    SQLiteHelpers.Close();  //关闭连接
                 }
             }
             this.Visibility = Visibility.Collapsed;
@@ -359,11 +345,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (!string.IsNullOrEmpty(comboBoxProgram.Text))
             {
                 dat.Clear();
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                dat = SQLiteHelpers.ExecuteDataSet(
+                dat = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                     "select * from ProgramSteps where Program='" + comboBoxProgram.SelectedValue + "' order by Step asc", null).Tables[0];  //读取计划表写入缓存
-                SQLiteHelpers.Close();  //关闭连接
                 DatSteps(dat);
                 Grid_data.ItemsSource = dat.DefaultView;
             }
@@ -378,11 +361,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 try
                 {
                     string[] sArray = Regex.Split(text, @"\+", RegexOptions.IgnoreCase);
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                    SQLiteHelpers.Open();  //打开数据库 
                     for (int i = 0; i < sArray.Length; i++)
                     {
-                        DataTable temp = SQLiteHelpers.ExecuteDataSet(
+                        DataTable temp = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                             "select * from ProgramSteps where Program='" + sArray[i] + "' order by Step asc", null).Tables[0];  //读取计划表写入缓存
                         if (dat.Columns.Count == 0) dat = temp.Clone();
                         foreach (DataRow drT in temp.Rows)
@@ -392,10 +373,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     }//以工艺名组合工艺细节
                     if (!string.IsNullOrEmpty(WorkOrder_n))
                     {
-                        dat = SQLiteHelpers.ExecuteDataSet(
+                        dat = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                             "select * from WorkorderSteps where WorkOrder='" + WorkOrder_n + "' order by Step asc", null).Tables[0];  //读取计划表写入缓存
                     }//插入工单不为空时载入细节信息
-                    SQLiteHelpers.Close();  //关闭连接
                     DatSteps(dat);
                     Grid_data.ItemsSource = dat.DefaultView;//显示
                 }
@@ -442,7 +422,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
                 if (ID == null) ID = dat.Rows.Count.ToString();
-                ViewStep viewstop = new ViewStep(Numder, P1, P2, P3, P4, P5);
+                ViewStep viewstop = new ViewStep(Numder, dat.Select("STEP = " + ID).First());
                 viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
                 viewstop.data = ID;
                 viewstop.ShowDialog();
@@ -458,11 +438,32 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             dr["StepID"] = e.StepID;
             dr["StepName"] = e.StepNAME;
             dr["ParameterName"] = e.PNAME;
-            dr["Parameter1"] = e.P1;
-            dr["Parameter2"] = e.P2;
-            dr["Parameter3"] = e.P3;
-            dr["Parameter4"] = e.P4;
-            dr["Parameter5"] = e.P5;
+            dr["Parameter1"] = e.Row_DAT.Field<double>("Parameter1");
+            dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter1");
+            dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter1");
+            dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter1");
+            dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter1");
+            dr["Parameter1_S1"] = e.Row_DAT.Field<double>("Parameter1_S1");
+            dr["Parameter2_S1"] = e.Row_DAT.Field<double>("Parameter2_S1");
+            dr["Parameter3_S1"] = e.Row_DAT.Field<double>("Parameter3_S1");
+            dr["Parameter4_S1"] = e.Row_DAT.Field<double>("Parameter4_S1");
+            dr["Parameter5_S1"] = e.Row_DAT.Field<double>("Parameter5_S1");
+            dr["Parameter1_S2"] = e.Row_DAT.Field<double>("Parameter1_S2");
+            dr["Parameter2_S2"] = e.Row_DAT.Field<double>("Parameter2_S2");
+            dr["Parameter3_S2"] = e.Row_DAT.Field<double>("Parameter3_S2");
+            dr["Parameter4_S2"] = e.Row_DAT.Field<double>("Parameter4_S2");
+            dr["Parameter5_S2"] = e.Row_DAT.Field<double>("Parameter5_S2");
+            dr["Parameter1_S3"] = e.Row_DAT.Field<double>("Parameter1_S3");
+            dr["Parameter2_S3"] = e.Row_DAT.Field<double>("Parameter2_S3");
+            dr["Parameter3_S3"] = e.Row_DAT.Field<double>("Parameter3_S3");
+            dr["Parameter4_S3"] = e.Row_DAT.Field<double>("Parameter4_S3");
+            dr["Parameter5_S3"] = e.Row_DAT.Field<double>("Parameter5_S3");
+            dr["StepName_S1"] = e.Row_DAT.Field<string>("StepName_S1");
+            dr["StepName_S2"] = e.Row_DAT.Field<string>("StepName_S2");
+            dr["StepName_S3"] = e.Row_DAT.Field<string>("StepName_S3");
+            dr["StepID_S1"] = e.Row_DAT.Field<string>("StepID_S1");
+            dr["StepID_S2"] = e.Row_DAT.Field<string>("StepID_S2");
+            dr["StepID_S3"] = e.Row_DAT.Field<string>("StepID_S3");
             dr.EndEdit();
 
             Grid_data.ItemsSource = dat.DefaultView;

View/ProductionPlanningView.xaml.cs

@@ -60,8 +60,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         }
 
         private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
         DataTable WorkOrder;
         private DateTime minDate;
         private DateTime maxDate;
@@ -84,12 +82,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private ObservableCollection<ContextMenuItem> ganttTaskContextMenuItems = new ObservableCollection<ContextMenuItem>();
         public void GanttChartNEW()
         {                                   
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库                       
-            WorkOrder = SQLiteHelpers.ExecuteDataSet(
+            WorkOrder = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                 "select * from WorkOrder where StartTime>'" + DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd  HH:mm:ss")
                  + "'or EndTime>'" + DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd  HH:mm:ss") + "'Order by StartTime", null).Tables[0];  //读取表写入缓存           
-            SQLiteHelpers.Close();
 
             //生成表
             GanttChart.ClearGantt();
@@ -163,11 +158,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             if (MainWindowViewModel.USER_Capacity[6])
             {                   
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库                       
-                DataTable WorkOrder_dt = SQLiteHelpers.ExecuteDataSet(
+                DataTable WorkOrder_dt = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                     "select * from WorkOrder where WorkOrder='" + ganttTask.WorkOrder + "'Order by StartTime", null).Tables[0];  //读取表写入缓存           
-                SQLiteHelpers.Close();
 
                 if (DateTime.Now > DateTime.Parse(WorkOrder_dt.Select().First().Field<object>("EndTime").ToString()))
                 {
@@ -197,11 +189,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                    System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
                 {
                     ///执行删除                     
-                    SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                    SQLiteHelpers.Open();  //打开数据库                       
-                    SQLiteHelpers.Delete("WorkOrder", "WorkOrder='" + ganttTask.WorkOrder + "'", null);
-                    SQLiteHelpers.Delete("WorkOrderSteps", "WorkOrder='" + ganttTask.WorkOrder + "'", null);
-                    SQLiteHelpers.Close();
+                    MainWindowViewModel.SQLiteHelpers.Delete("WorkOrder", "WorkOrder='" + ganttTask.WorkOrder + "'", null);
+                    MainWindowViewModel.SQLiteHelpers.Delete("WorkOrderSteps", "WorkOrder='" + ganttTask.WorkOrder + "'", null);
                     GanttChartNEW();
                 }
             }
@@ -248,12 +237,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)
         {
             Picture.Content = null;                   
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库                       
-            int con = SQLiteHelpers.ExecuteDataSet(
+            int con = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(
                 "select * from WorkOrder where WorkOrder='" + Select_WorkOrderNumder.Text +
                 "'Order by StartTime", null).Tables[0].Rows.Count;          
-            SQLiteHelpers.Close();
 
             if (con > 0)
             {
@@ -294,7 +280,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
             {
-                Interval = TimeSpan.FromSeconds(1)//秒
+                Interval = TimeSpan.FromSeconds(5)//秒
             };
             timer1s.Tick += Tick_Event_1S;
             timer1s.Start();
@@ -302,11 +288,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         public static bool UI;
         void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
-            if (UI) 
-            {
+          //  if (UI) 
+           // {
                 GanttChartNEW();
-                UI= false;
-            }
+           //     UI= false;
+          //  }
         }
     }
 }

View/ProgramgroupView.xaml

@@ -65,7 +65,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsHitTestVisible="False" x:Name="edit">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Edit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -73,7 +73,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Rename" IsEnabled="False" x:Name="Rename">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Rename" IsHitTestVisible="False" x:Name="Rename">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Rename" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Rename}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -81,7 +81,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Remark" IsEnabled="False" x:Name="Remark">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Remark" IsHitTestVisible="False" x:Name="Remark">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Note" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Remark}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -89,7 +89,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsHitTestVisible="False" x:Name="Delete">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Delete" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Delete}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>

View/ProgramgroupView.xaml.cs

@@ -1,4 +1,5 @@
-using SunlightCentralizedControlManagement_SCCM_.WindowsView;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using SunlightCentralizedControlManagement_SCCM_.WindowsView;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -21,23 +22,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Group.Text = "ALL";
         }
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
         DataSet sql; //内存数据缓存
 
         public void Programgroup_sql()
         {
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-
             string sql_script = "select * from ProgramName order by ProgramID desc";
             string sql_ProgramGroup = "select * from ProgramGroup order by ID desc";
 
             if (sql != null) sql.Clear();  //清空缓存
-            sql = SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
+            sql = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
             if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
 
-            DataTable GROUP = SQLiteHelpers.ExecuteDataSet(sql_ProgramGroup, null).Tables[0];  //获得程序组
+            DataTable GROUP = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(sql_ProgramGroup, null).Tables[0];  //获得程序组
             List<string> result = new List<string>();
             result.Add("ALL");
             for (int i =0; i<GROUP.Rows.Count;i++) 
@@ -45,8 +41,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 result.Add (GROUP.Rows[i][1].ToString());
             }
             Group.ItemsSource = result.ToArray();
-
-            SQLiteHelpers.Close();  //关闭连接
         } 
 
         public static string Programgroup_Numder { get; set; }
@@ -60,10 +54,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 Programgroup_ID = (Grid.Columns[0].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
                 Programgroup_Numder = (Grid.Columns[1].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
             }
-            edit.IsEnabled = true;
-            Rename.IsEnabled = true;
-            Remark.IsEnabled = true;
-            Delete.IsEnabled = true;
+            edit.IsHitTestVisible = true;
+            Rename.IsHitTestVisible = true;
+            Remark.IsHitTestVisible = true;
+            Delete.IsHitTestVisible = true;
         }
 
         private void Grid_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)//双击表格编辑事件
@@ -86,45 +80,42 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         void InputBox_new_accept(object sender, EventArgs e)//新建按钮窗口返回
         {
             //事件的接收者通过一个简单的类型转换得到InputBox的引用
-               InputBox frm = (InputBox)sender;
-               //接收到InputBox的TextBox值
-               string VALUE = frm.InputValue;
-               string ID = DateTime.Now.ToString("yyMMddHHmmss"); //id为时间合
-               Dictionary<string, object> Program_new = new Dictionary<string, object>();//缓存函数
-               Program_new.Add("ProgramName", VALUE);
-               Program_new.Add("ProgramID", ID);
-               Program_new.Add("Groups", Group.Text);
-               Program_new.Add("Step", "0");
-               Program_new.Add("Time", "0:00");
-               Program_new.Add("Notes", null);
+            InputBox frm = (InputBox)sender;
+            //接收到InputBox的TextBox值
+            string VALUE = frm.InputValue;
+            string ID = DateTime.Now.ToString("yyMMddHHmmss"); //id为时间合
+            Dictionary<string, object> Program_new = new Dictionary<string, object>();//缓存函数
+            Program_new.Add("ProgramName", VALUE);
+            Program_new.Add("ProgramID", ID);
+            Program_new.Add("Groups", Group.Text);
+            Program_new.Add("Step", "0");
+            Program_new.Add("Time", "0:00");
+            Program_new.Add("Notes", null);
 
-               SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-               SQLiteHelpers.Open();  //打开数据库
-               SQLiteHelpers.InsertData("ProgramName", Program_new);// 执行插入
-               SQLiteHelpers.Close();  //关闭连接
+            MainWindowViewModel.SQLiteHelpers.InsertData("ProgramName", Program_new);// 执行插入
 
-               Programgroup_Numder = VALUE;
-               Programgroup_ID = ID;
+            Programgroup_Numder = VALUE;
+            Programgroup_ID = ID;
 
-               Programgroup_sql();
+            Programgroup_sql();
         }
 
         private void ListViewItem_edit(object sender, System.Windows.Input.MouseButtonEventArgs e)//编辑事件
         {
-            edit.IsEnabled = false;
-            Rename.IsEnabled = false;
-            Remark.IsEnabled = false;
-            Delete.IsEnabled = false;
+            edit.IsHitTestVisible = false;
+            Rename.IsHitTestVisible = false;
+            Remark.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false;
             if (Programgroup_ID == null) return;
             container.Content = new ProgramstepsView();
         }
 
         private void ListViewItem_Rename(object sender, System.Windows.Input.MouseButtonEventArgs e)//重命名
         {
-            edit.IsEnabled = false;
-            Rename.IsEnabled = false;
-            Remark.IsEnabled = false;
-            Delete.IsEnabled = false; 
+            edit.IsHitTestVisible = false;
+            Rename.IsHitTestVisible = false;
+            Remark.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false; 
             if (Programgroup_ID == null) return;
             InputBox frm = new InputBox();
             frm.Accept += new EventHandler(InputBox_Rename_accept);
@@ -139,11 +130,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Dictionary<string, object> Program_Rename = new Dictionary<string, object>();//缓存函数
             Program_Rename.Add("ProgramName", VALUE);
             Program_Rename.Add("Groups", Group.Text);
+            MainWindowViewModel.SQLiteHelpers.Update("ProgramName", Program_Rename, "ProgramID='" + Programgroup_ID + "'", null);
 
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            SQLiteHelpers.Update("ProgramName", Program_Rename, "ProgramID='" + Programgroup_ID + "'", null);
-            SQLiteHelpers.Close();  //关闭连接
+
+            Dictionary<string, object> Program_Steps = new Dictionary<string, object>();//缓存函数
+            Program_Steps.Add("Program", VALUE);
+            MainWindowViewModel.SQLiteHelpers.Update("ProgramSteps", Program_Steps, "ProgramID='" + Programgroup_ID + "'", null);
 
             Programgroup_sql();
             Programgroup_Numder = null;
@@ -152,10 +144,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void ListViewItem_Remark(object sender, System.Windows.Input.MouseButtonEventArgs e)//备注
         {
-            edit.IsEnabled = false;
-            Rename.IsEnabled = false;
-            Remark.IsEnabled = false;
-            Delete.IsEnabled = false;
+            edit.IsHitTestVisible = false;
+            Rename.IsHitTestVisible = false;
+            Remark.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false;
             if (Programgroup_ID == null) return;
             InputBox frm = new InputBox();
             frm.Accept += new EventHandler(InputBox_Remark_accept);
@@ -170,10 +162,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Dictionary<string, object> Program_Remark = new Dictionary<string, object>();//缓存函数
             Program_Remark.Add("Notes", VALUE);
 
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            SQLiteHelpers.Update("ProgramName", Program_Remark, "ProgramID='" + Programgroup_ID + "'", null);
-            SQLiteHelpers.Close();  //关闭连接
+            MainWindowViewModel.SQLiteHelpers.Update("ProgramName", Program_Remark, "ProgramID='" + Programgroup_ID + "'", null);
 
             Programgroup_sql();
             Programgroup_Numder = null;
@@ -182,21 +171,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void ListViewItem_Delete(object sender, System.Windows.Input.MouseButtonEventArgs e)//删除
         {
-            edit.IsEnabled = false;
-            Rename.IsEnabled = false;
-            Remark.IsEnabled = false;
-            Delete.IsEnabled = false;
+            edit.IsHitTestVisible = false;
+            Rename.IsHitTestVisible = false;
+            Remark.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false;
             if (Programgroup_Numder == null) return;
             ///弹窗提示确认删除
             if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + Programgroup_Numder, "Delete ",
                 System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
             {
                 ///执行删除
-                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                SQLiteHelpers.Delete("ProgramName", "ProgramID='" + Programgroup_ID + "'", null);
-                SQLiteHelpers.Delete("ProgramSteps", "ProgramID='" + Programgroup_ID + "'", null);
-                SQLiteHelpers.Close();
+                MainWindowViewModel.SQLiteHelpers.Delete("ProgramName", "ProgramID='" + Programgroup_ID + "'", null);
+                MainWindowViewModel.SQLiteHelpers.Delete("ProgramSteps", "ProgramID='" + Programgroup_ID + "'", null);
                 Programgroup_sql();
             }
             Programgroup_Numder = null;

View/ProgramstepsView .xaml

@@ -11,18 +11,24 @@
             d:DesignHeight="630" d:DesignWidth="1280">
     <UserControl.Resources>
         <ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>
-    </UserControl.Resources>
+            <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
+            <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
+            <ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
+            <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
+        </UserControl.Resources>
     <Grid>
-        <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" d:ItemsSource="{d:SampleData ItemCount=90}"
-                  PreviewMouseLeftButtonUp="Grid_PreviewMouseLeftButtonUp" MouseDoubleClick="Grid_MouseDoubleClick"
-                  Background="White" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9"                 
-                  GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" FontSize="15" 
-                  Grid.ColumnSpan="2" CanUserResizeRows="False" AutoGenerateColumns="False" MinColumnWidth="30" 
-                  CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility ="Column" SelectionMode="Single" 
-                  Margin="0,0,0,60">
+        <DataGrid x:Name="Grid_step" AlternationCount="2" MouseDoubleClick="Grid_MouseDoubleClick"
+                  MouseLeftButtonUp="Grid_PreviewMouseLeftButtonUp"
+           d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"               
+           HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" Background="White"
+           GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" BorderBrush="{x:Null}"  
+           CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"    
+           CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" CanUserAddRows="True">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
-                    <Setter Property="Height" Value="30" />
+                    <Setter Property="IsHitTestVisible" Value="{Binding DataContext.IsInteractive,
+                 RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                    <Setter Property="Height" Value="100" />
                     <Setter Property="FontSize" Value="25" />
                     <Style.Triggers>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="0">
@@ -32,42 +38,115 @@
                             <Setter Property="Background" Value="#FFF0F0F0" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="False"/>
+                        <DataTrigger Binding="{Binding RUN}" Value="1">
+                            <Setter Property="Background" Value="#FF00D6FF"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding RUN}" Value="2">
+                            <Setter Property="Background" Value="Yellow"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding RUN}" Value="9">
+                            <Setter Property="Background" Value="Red"/>
+                        </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </DataGrid.RowStyle>
             <DataGrid.CellStyle>
-                <Style TargetType="DataGridCell">
+                <Style TargetType="{x:Type DataGridCell}">
                     <Setter Property="BorderThickness" Value="0"/>
-                    <Setter Property="MinWidth" Value="20"/>
                     <Style.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Background" Value="#FFC0C0C0"/>
-                            <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                            <Setter Property="Background" Value="#FF00D6FF"/>
+                            <Setter Property="BorderBrush" Value="#FF00D6FF"/>
                             <Setter Property="Foreground" Value="Black"/>
                         </Trigger>
                     </Style.Triggers>
                 </Style>
             </DataGrid.CellStyle>
-
             <DataGrid.Columns>
                 <!--列信息绑定-->
                 <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="60" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="100" Binding="{Binding StepID}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="300" Binding="{Binding StepName}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" 
+          Width="80" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+          MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"
+          MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+          MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Binding="{Binding StepTime}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="600"  IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <StackPanel>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0,0,0.5">
+                                    <TextBlock Height="50" >                         
+              <Run Text="{x:Static lang:Resources.Function}"/>        
+              <Run Text=":"/>                       
+              <Run Text="{Binding StepName}"/>
+                                    </TextBlock>
+                                </Border>
+                                <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0.5,0,0">
+                                    <TextBlock Height="50" >                         
+              <Run Text="{x:Static lang:Resources.ParameterSet}"/>                           
+              <Run Text=":"/>                      
+              <Run Text="{Binding ParameterName}"/>
+                                    </TextBlock>
+                                </Border>
+                            </StackPanel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding Path=StepID_S3  ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Binding="{Binding Remark}" 
+          Width="*" IsReadOnly="True">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                            <Setter Property="TextWrapping" Value="Wrap"/>
+                            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
             </DataGrid.Columns>
         </DataGrid>
         <StackPanel x:Name="scr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,400,0">            
@@ -80,7 +159,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsHitTestVisible="False" x:Name="edit">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Edit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -88,7 +167,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsHitTestVisible="False" x:Name="Insert">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="InsertComment" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Insert}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -104,7 +183,7 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsHitTestVisible="False" x:Name="Delete">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Delete" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
                         <TextBlock Text="{x:Static lang:Resources.Delete}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>

View/ProgramstepsView .xaml.cs

@@ -1,4 +1,7 @@
-using SunlightCentralizedControlManagement_SCCM_.UserClass;
+
+
+using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
 using SunlightCentralizedControlManagement_SCCM_.WindowsView;
 using System;
 using System.Collections.Generic;
@@ -24,6 +27,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Xml.Linq;
+using TouchSocket.Core;
 using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
 using static SunlightCentralizedControlManagement_SCCM_.WindowsView.ViewStep;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
@@ -46,10 +50,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Programgroup_sql();
         }
 
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        DataSet sql; //内存数据缓存
-
+      // DataSet sql; //内存数据缓存
+        DataTable Step;
         string ProgramID;
         string ProgramNAME;
         string Numder = null;
@@ -58,39 +60,26 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         string StepTime = null;
         public void Programgroup_sql()
         {
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-
             string sql_script = "select * from ProgramSteps where ProgramID='" + ProgramID + "' order by Step asc";
-
-            if (sql != null) sql.Clear();  //清空缓存
-            sql = SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
-            //sql.Tables[0].Rows.Add(datatable_t);
-            DataRow dr = sql.Tables[0].NewRow();//添加表数据
-            dr["ProgramID"] = ProgramID;
-            dr["Program"] = ProgramNAME;
-            sql.Tables[0].Rows.Add(dr);
-            Dat();
-            if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
-            SQLiteHelpers.Close();  //关闭连接
+            Step = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0];  //读取计划表写入缓存
+            Grid_step.ItemsSource = Step.DefaultView;  //转换显示计划表
         }
 
-        public void Dat()//行号刷新
+        public void Dat(DataTable dat)//行号刷新
         {
-            int a = sql.Tables[0].Rows.Count;
+            int a = dat.Rows.Count;
             for (int i = 0; i < a; i++)
             {
-                DataRow dr = sql.Tables[0].Rows[i];
+                DataRow dr = dat.Rows[i];
                 dr.BeginEdit();
                 dr["Step"] = i + 1;
                 dr.EndEdit();
             }
+            dat.AcceptChanges();
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作
         {
-            if (ID == null) ID = sql.Tables[0].Rows.Count.ToString();
-            Grid.SelectedIndex = Convert.ToInt32(ID)-1;
         }
         public static T GetVisualChild<T>(Visual parent) where T : Visual
         {
@@ -114,43 +103,83 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void Grid_PreviewMouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e)//表格选择事件
         {
-            edit.IsEnabled = true;
-            Insert.IsEnabled = true;
-            Delete.IsEnabled = true;
-            int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量
+            edit.IsHitTestVisible = true;
+            Insert.IsHitTestVisible = true;
+            Delete.IsHitTestVisible = true;
+            int rownum = Grid_step.SelectedIndex;//获取鼠标选中行并定义变量
             if (rownum != -1)//判断鼠标定位是否有效
             {
-                ID = (Grid.Columns[2].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
-                Numder = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
-                P1 = (Grid.Columns[6].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第6列，
-                P2 = (Grid.Columns[7].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第7列，
-                P3 = (Grid.Columns[8].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第8列，
-                P4 = (Grid.Columns[9].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第9列，
-                P5 = (Grid.Columns[10].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第10列，
-                StepTime = (Grid.Columns[16].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//
+                ID = (Grid_step.Columns[2].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第0列，
+                Numder = (Grid_step.Columns[3].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第1列，
+                P1 = (Grid_step.Columns[6].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第6列，
+                P2 = (Grid_step.Columns[7].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第7列，
+                P3 = (Grid_step.Columns[8].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第8列，
+                P4 = (Grid_step.Columns[9].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第9列，
+                P5 = (Grid_step.Columns[10].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第10列，
+                StepTime = (Grid_step.Columns[16].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//
             }
         }
 
         private void Grid_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)//双击表格编辑事件
         {
-            edit.IsEnabled = true;
-            Insert.IsEnabled = true;
-            Delete.IsEnabled = true;
-            int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量
+            edit.IsHitTestVisible = true;
+            Insert.IsHitTestVisible = true;
+            Delete.IsHitTestVisible = true;
+            int rownum = Grid_step.SelectedIndex;//获取鼠标选中行并定义变量
             if (rownum != -1)//判断鼠标定位是否有效
             {
-                ID = (Grid.Columns[2].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
-                Numder = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
-                P1 = (Grid.Columns[6].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第6列，
-                P2 = (Grid.Columns[7].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第7列，
-                P3 = (Grid.Columns[8].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第8列，
-                P4 = (Grid.Columns[9].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第9列，
-                P5 = (Grid.Columns[10].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第10列，
-                StepTime = (Grid.Columns[16].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//
+                ID = (Grid_step.Columns[2].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第0列，
+                Numder = (Grid_step.Columns[3].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第1列，
+                P1 = (Grid_step.Columns[6].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第6列，
+                P2 = (Grid_step.Columns[7].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第7列，
+                P3 = (Grid_step.Columns[8].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第8列，
+                P4 = (Grid_step.Columns[9].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第9列，
+                P5 = (Grid_step.Columns[10].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//定位第10列，
+                StepTime = (Grid_step.Columns[16].GetCellContent(Grid_step.Items[rownum]) as TextBlock).Text;//
 
                 if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
-                if (ID == null) ID = sql.Tables[0].Rows.Count.ToString();
-                ViewStep viewstop = new ViewStep(Numder, P1, P2, P3, P4, P5);
+                if (string.IsNullOrEmpty(ID))
+                {
+                    DataRow dr = Step.NewRow();//添加表数据
+                    dr["ProgramID"] = ProgramID;
+                    dr["Program"] = ProgramNAME; 
+                    dr["Parameter1"] = 0;
+                    dr["Parameter2"] = 0;
+                    dr["Parameter3"] = 0;
+                    dr["Parameter4"] = 0;
+                    dr["Parameter5"] = 0;
+                    dr["Parameter6"] = 0;
+                    dr["Parameter7"] = 0;
+                    dr["Parameter8"] = 0;
+                    dr["Parameter9"] = 0;
+                    dr["Parameter10"] = 0;
+                    dr["Parameter1_S1"] = 0;
+                    dr["Parameter2_S1"] = 0;
+                    dr["Parameter3_S1"] = 0;
+                    dr["Parameter4_S1"] = 0;
+                    dr["Parameter5_S1"] = 0;
+                    dr["Parameter1_S2"] = 0;
+                    dr["Parameter2_S2"] = 0;
+                    dr["Parameter3_S2"] = 0;
+                    dr["Parameter4_S2"] = 0;
+                    dr["Parameter5_S2"] = 0;
+                    dr["Parameter1_S3"] = 0;
+                    dr["Parameter2_S3"] = 0;
+                    dr["Parameter3_S3"] = 0;
+                    dr["Parameter4_S3"] = 0;
+                    dr["Parameter5_S3"] = 0;
+                    dr["StepName_S1"] = " ";
+                    dr["StepName_S2"] = " ";
+                    dr["StepName_S3"] = " ";
+                    dr["StepID_S1"] = "000";
+                    dr["StepID_S2"] = "000";
+                    dr["StepID_S3"] = "000";
+                    Step.Rows.InsertAt(dr, Step.Rows.Count);
+                    Dat(Step);
+                    ID = (Step.Rows.Count).ToString();
+                }
+                    
+                ViewStep viewstop = new ViewStep(Numder, Step.Select("STEP = " + ID).First());
                 viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
                 viewstop.data = ID;
                 viewstop.ShowDialog();
@@ -164,46 +193,76 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void ListViewItem_edit(object sender, System.Windows.Input.MouseButtonEventArgs e)//编辑事件
         {
-            edit.IsEnabled = false;
-            Insert.IsEnabled = false;
-            Delete.IsEnabled = false;
+            edit.IsHitTestVisible = false;
+            Insert.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false;
             if (string.IsNullOrEmpty(Numder)) { Numder = null; P1 = "0"; P2 = "0"; P3 = "0"; P4 = "0"; P5 = "0"; }
-            if (ID == null) ID = sql.Tables[0].Rows.Count.ToString();
-            ViewStep viewstop = new ViewStep(Numder, P1, P2, P3, P4, P5);
+            if (string.IsNullOrEmpty(ID))
+            {
+                DataRow dr = Step.NewRow();//添加表数据
+                dr["ProgramID"] = ProgramID;
+                dr["Program"] = ProgramNAME;
+                dr["Parameter1"] = 0;
+                dr["Parameter2"] = 0;
+                dr["Parameter3"] = 0;
+                dr["Parameter4"] = 0;
+                dr["Parameter5"] = 0;
+                dr["Parameter6"] = 0;
+                dr["Parameter7"] = 0;
+                dr["Parameter8"] = 0;
+                dr["Parameter9"] = 0;
+                dr["Parameter10"] = 0;
+                dr["Parameter1_S1"] = 0;
+                dr["Parameter2_S1"] = 0;
+                dr["Parameter3_S1"] = 0;
+                dr["Parameter4_S1"] = 0;
+                dr["Parameter5_S1"] = 0;
+                dr["Parameter1_S2"] = 0;
+                dr["Parameter2_S2"] = 0;
+                dr["Parameter3_S2"] = 0;
+                dr["Parameter4_S2"] = 0;
+                dr["Parameter5_S2"] = 0;
+                dr["Parameter1_S3"] = 0;
+                dr["Parameter2_S3"] = 0;
+                dr["Parameter3_S3"] = 0;
+                dr["Parameter4_S3"] = 0;
+                dr["Parameter5_S3"] = 0;
+                dr["StepName_S1"] = " ";
+                dr["StepName_S2"] = " ";
+                dr["StepName_S3"] = " ";
+                dr["StepID_S1"] = "000";
+                dr["StepID_S2"] = "000";
+                dr["StepID_S3"] = "000";
+                Step.Rows.InsertAt(dr, Step.Rows.Count);
+                Dat(Step);
+                ID = Step.Rows.Count.ToString();
+            }
+            ViewStep viewstop = new ViewStep(Numder, Step.Select("STEP = " + ID).First());
             viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
             viewstop.data = ID;
             viewstop.ShowDialog();
         }
         private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
         {
-            int i = sql.Tables[0].Rows.Count;
-            int n = StrToInt.To16Convert10(ID);
-            if (i == n)
-            {
-                DataRow dr_ = sql.Tables[0].NewRow();//添加表数据
-                dr_["ProgramID"] = ProgramID;
-                dr_["Program"] = ProgramNAME;
-                sql.Tables[0].Rows.Add(dr_);
-                Dat();
-                ID = (n + 1).ToString();
-            }
+            int i = Step.Rows.Count;
+            int n = Convert.ToInt16(ID);
       
-            int steptime=0;//时间秒
+            int steptime = 0;//时间秒
             string[] time_D = { "001", "013", "015", "017", "065" };
             string[] time_J = { "031", "093" };
-            string[] time_T = { "054", "055","056" };
+            string[] time_T = { "054", "055", "056" };
             foreach (var item in time_D)
             {
                 if (item == e.StepID)
                 {
-                    steptime = Convert.ToUInt16(e.P3)*60;
+                    steptime = Convert.ToUInt16(e.Row_DAT.Field<double>("Parameter3")) * 60;
                 }
             }
             foreach (var item in time_J)
             {
                 if (item == e.StepID)
                 {
-                    steptime = Convert.ToUInt16(e.P1) * 60;
+                    steptime = Convert.ToUInt16(e.Row_DAT.Field<double>("Parameter1")) * 60;
                 }
             }
             foreach (var item in time_T)
@@ -213,78 +272,126 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     steptime = 5;
                 }
             }
-            if (steptime==0)
+            if (steptime == 0)
             {
                 steptime = 300;
             }
 
-            DataRow dr = sql.Tables[0].Rows[n - 1];
+            DataRow dr = Step.Rows[n - 1];
             dr.BeginEdit();
             dr["StepID"] = e.StepID;
             dr["StepName"] = e.StepNAME;
             dr["ParameterName"] = e.PNAME;
-            dr["Parameter1"] = e.P1;
-            dr["Parameter2"] = e.P2;
-            dr["Parameter3"] = e.P3;
-            dr["Parameter4"] = e.P4;
-            dr["Parameter5"] = e.P5;
-            dr["StepTime"] =steptime;// 
+            dr["Parameter1"] = e.Row_DAT.Field<double>("Parameter1");
+            dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter2");
+            dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter3");
+            dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter4");
+            dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter5");
+            dr["Parameter1_S1"] = e.Row_DAT.Field<double>("Parameter1_S1");
+            dr["Parameter2_S1"] = e.Row_DAT.Field<double>("Parameter2_S1");
+            dr["Parameter3_S1"] = e.Row_DAT.Field<double>("Parameter3_S1");
+            dr["Parameter4_S1"] = e.Row_DAT.Field<double>("Parameter4_S1");
+            dr["Parameter5_S1"] = e.Row_DAT.Field<double>("Parameter5_S1");
+            dr["Parameter1_S2"] = e.Row_DAT.Field<double>("Parameter1_S2");
+            dr["Parameter2_S2"] = e.Row_DAT.Field<double>("Parameter2_S2");
+            dr["Parameter3_S2"] = e.Row_DAT.Field<double>("Parameter3_S2");
+            dr["Parameter4_S2"] = e.Row_DAT.Field<double>("Parameter4_S2");
+            dr["Parameter5_S2"] = e.Row_DAT.Field<double>("Parameter5_S2");
+            dr["Parameter1_S3"] = e.Row_DAT.Field<double>("Parameter1_S3");
+            dr["Parameter2_S3"] = e.Row_DAT.Field<double>("Parameter2_S3");
+            dr["Parameter3_S3"] = e.Row_DAT.Field<double>("Parameter3_S3");
+            dr["Parameter4_S3"] = e.Row_DAT.Field<double>("Parameter4_S3");
+            dr["Parameter5_S3"] = e.Row_DAT.Field<double>("Parameter5_S3");
+            dr["StepName_S1"] = e.Row_DAT.Field<string>("StepName_S1");
+            dr["StepName_S2"] = e.Row_DAT.Field<string>("StepName_S2");
+            dr["StepName_S3"] = e.Row_DAT.Field<string>("StepName_S3");
+            dr["StepID_S1"] = e.Row_DAT.Field<string>("StepID_S1");
+            dr["StepID_S2"] = e.Row_DAT.Field<string>("StepID_S2");
+            dr["StepID_S3"] = e.Row_DAT.Field<string>("StepID_S3");
+            dr["StepTime"] = steptime;// 
             dr.EndEdit();
 
-            Grid.ItemsSource = sql.Tables[0].DefaultView;
+            Grid_step.ItemsSource = Step.DefaultView;
         }
 
         private void ListViewItem_Insert(object sender, System.Windows.Input.MouseButtonEventArgs e)//插入事件
         {
-            edit.IsEnabled = false;
-            Insert.IsEnabled = false;
-            Delete.IsEnabled = false; int d = 0;
+            edit.IsHitTestVisible = false;
+            Insert.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false; 
+            int d = 0;
             if (ID != null) { d = Convert.ToInt32(ID); } else { return; }
-            DataRow dr = sql.Tables[0].NewRow();//添加表数据
+            DataRow dr = Step.NewRow();//添加表数据
             dr["ProgramID"] = ProgramID;
             dr["Program"] = ProgramNAME;
-            sql.Tables[0].Rows.InsertAt(dr, d - 1);
+            dr["Parameter1"] = 0;
+            dr["Parameter2"] = 0;
+            dr["Parameter3"] = 0;
+            dr["Parameter4"] = 0;
+            dr["Parameter5"] = 0;
+            dr["Parameter6"] = 0;
+            dr["Parameter7"] = 0;
+            dr["Parameter8"] = 0;
+            dr["Parameter9"] = 0;
+            dr["Parameter10"] = 0;
+            dr["Parameter1_S1"] = 0;
+            dr["Parameter2_S1"] = 0;
+            dr["Parameter3_S1"] = 0;
+            dr["Parameter4_S1"] = 0;
+            dr["Parameter5_S1"] = 0;
+            dr["Parameter1_S2"] = 0;
+            dr["Parameter2_S2"] = 0;
+            dr["Parameter3_S2"] = 0;
+            dr["Parameter4_S2"] = 0;
+            dr["Parameter5_S2"] = 0;
+            dr["Parameter1_S3"] = 0;
+            dr["Parameter2_S3"] = 0;
+            dr["Parameter3_S3"] = 0;
+            dr["Parameter4_S3"] = 0;
+            dr["Parameter5_S3"] = 0;
+            dr["StepName_S1"] = " ";
+            dr["StepName_S2"] = " ";
+            dr["StepName_S3"] = " ";
+            dr["StepID_S1"] = "000";
+            dr["StepID_S2"] = "000";
+            dr["StepID_S3"] = "000";
+            Step.Rows.InsertAt(dr, d - 1);
             ID = null;
 
-            Dat();
-            Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
+            Dat(Step);
+            Grid_step.ItemsSource = Step.DefaultView;  //转换显示计划表
         }
 
         private void ListViewItem_Save(object sender, System.Windows.Input.MouseButtonEventArgs e)//保存事件
         {
-            edit.IsEnabled = false;
-            Insert.IsEnabled = false;
-            Delete.IsEnabled = false;
+            edit.IsHitTestVisible = false;
+            Insert.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false;
             int r = 0;
-
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            SQLiteHelpers.Delete("ProgramSteps", "ProgramID = '" + ProgramID + "'", null);
-
+            MainWindowViewModel.SQLiteHelpers.Delete("ProgramSteps", "ProgramID = '" + ProgramID + "'", null);
             DataTable data_t = new DataTable();
-            data_t = sql.Tables[0].Clone();
+            data_t = Step.Clone();
 
-            int a = sql.Tables[0].Rows.Count;
-            for (int i = 0; i < a - 1; i++)
+            int a = Step.Rows.Count;
+            for (int i = 0; i < a ; i++)
             {
                 data_t.Clear();//清空
 
-                DataRow dt = sql.Tables[0].Rows[i];//行转换
+                DataRow dt = Step.Rows[i];//行转换
                 DataRow dr = data_t.NewRow();
                 dr.ItemArray = dt.ItemArray;
                 data_t.Rows.InsertAt(dr, 0);                
 
-                r = SQLiteHelpers.InsertData("ProgramSteps", SQLiteHelpers.DataTableToDictionary(data_t));//行插入                                                                                     
+                r = MainWindowViewModel.SQLiteHelpers.InsertData("ProgramSteps", MainWindowViewModel.SQLiteHelpers.DataTableToDictionary(data_t));//行插入                                                                                     
             }
             
-            int time =Convert.ToUInt16( sql.Tables[0].Compute("sum(StepTime)", ""))/60;
+            int time =Convert.ToUInt16( Step.Compute("sum(StepTime)", ""))/60;
             string time_ =DateTime.Parse( TimeSpan.FromMinutes(time).ToString()).ToString("HH:mm");//   DateTime.Parse(time.ToString()).ToString("HH:mm");
             Dictionary<string, object> Program_Step = new Dictionary<string, object>();//缓存函数
             Program_Step.Add("Step", a - 1);
             Program_Step.Add("Time", time_);
-            SQLiteHelpers.Update("ProgramName", Program_Step, "ProgramID='" + ProgramID + "'", null);
+            MainWindowViewModel.SQLiteHelpers.Update("ProgramName", Program_Step, "ProgramID='" + ProgramID + "'", null);
 
-            SQLiteHelpers.Close();  //关闭连接
             if (r != 0)
             {
                 System.Windows.Forms.MessageBox.Show(ProgramNAME, Properties.Resources.Save);
@@ -294,20 +401,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void ListViewItem_Delete(object sender, System.Windows.Input.MouseButtonEventArgs e)//删除事件
         {
-            edit.IsEnabled = false;
-            Insert.IsEnabled = false;
-            Delete.IsEnabled = false;
+            edit.IsHitTestVisible = false;
+            Insert.IsHitTestVisible = false;
+            Delete.IsHitTestVisible = false;
 
-            int d = 0;
-            int a = sql.Tables[0].Rows.Count;
-
-            if (ID != null) { d = Convert.ToInt32(ID); } else { return; }
-            if (a != d)//如果删除不是最后一行执行
+            int a = Step.Rows.Count;
+            int rownum = Grid_step.SelectedIndex;
+            if (rownum >= 0 && rownum<a) 
             { 
-                sql.Tables[0].Rows.RemoveAt(d - 1);
-
-                Dat();
-                Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
+                Step.Rows.RemoveAt(rownum);
+                Dat(Step);
+                Grid_step.ItemsSource = Step.DefaultView;  //转换显示计划表
             }
         }
 

View/Whole.xaml

@@ -8,9 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <ScrollViewer Margin="0" VerticalScrollBarVisibility="Auto">
-            <WrapPanel Orientation="Horizontal" x:Name="WholeView" Background="White">
-
-            </WrapPanel>
+            <WrapPanel Orientation="Horizontal" x:Name="WholeView" Background="White"/>
         </ScrollViewer>
     </Grid>
 </UserControl>

View/Whole.xaml.cs

@@ -64,6 +64,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 WholeView.Children.Add(inf[i]);
             }
+            for (int i = 0; i < MainWindowViewModel.Machines.Rows.Count; i++)
+            {               
+                DataRow[] rows=  MainWindowViewModel.Whole_dat.Select("Machine='" + inf[i].name.Text+"'");
+                inf[i].DataROW(rows);
+            }
                 
             CountDown();
         }
@@ -86,17 +91,20 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             }
         }
 
+        int t30S = 0;
         private void CountDown()
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
             {
                 Interval = TimeSpan.FromSeconds(1)//秒
             };
-            timer1s.Tick += Tick_Event_1S;
+            timer1s.Tick += Tick_Event_S;
             timer1s.Start();
         }//时间周期初始化
-        void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
+
+        void Tick_Event_S(object sender, EventArgs e)//Tick_Event周期执行事件1S
         {
+            DateTime dateTime = DateTime.Now;
             for (int i = 0; i < MainWindowViewModel.Machines.Rows.Count; i++)
             {
                 string State_ = Selet_Machines(MainWindowViewModel.Machines, "State", i).ToString();
@@ -105,17 +113,30 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 else if (State_ == "201")
                 { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(0, 255, 0)); }
                 else if (State_ == "202")
-                { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(255, 255, 0)); }
+                { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(0, 255, 0)); }
                 else
                 { inf[i].name.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0)); }
-
                 inf[i].temp.Text = Selet_Machines(MainWindowViewModel.Machines, "Temperature", i).ToString() + "°C";
                 inf[i].Process.Text = (string)Selet_Machines(MainWindowViewModel.Machines, "Process", i);
                 inf[i].Step.Text = (string)Selet_Machines(MainWindowViewModel.Machines, "Step", i);
                 inf[i].Message.Text = (string)Selet_Machines(MainWindowViewModel.Machines, "Message", i);
                 inf[i].Orders.Text = (string)Selet_Machines(MainWindowViewModel.Machines, "WorkOrder", i);
                 inf[i].time.Text = (string)Selet_Machines(MainWindowViewModel.Machines, "time", i);
+
+                if ((t30S > 10)&&(State_!="800")) 
+                {
+                    t30S = 0;
+                    inf[i].DataAdd(dateTime,Convert.ToDouble( Selet_Machines(MainWindowViewModel.Machines, "Temperature", i)));
+                  
+                  //  DataRow whole_Dat = MainWindowViewModel.Whole_dat.NewRow();
+                  //  whole_Dat["Machine"] = Selet_Machines(MainWindowViewModel.Machines, "NAME", i).ToString();
+                  //  whole_Dat["DateTime"] = dateTime;
+                  //  whole_Dat["DAT"] = (double)Selet_Machines(MainWindowViewModel.Machines, "Temperature", i);
+                  //  MainWindowViewModel.Whole_dat.Rows.Add(whole_Dat);
+                } 
+                
             }
+            t30S++;
         }
     }
 }

ViewModel/CurveDiagramViewModel.cs

@@ -90,7 +90,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             CrosshairSnapEnabled = true,
             Position = LiveChartsCore.Measure.AxisPosition.End
         }, //液位轴
-        new Axis // 
+       /* new Axis // 
         {
             MinLimit =0,
             MaxLimit =14,
@@ -106,10 +106,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             DrawTicksPath = true,
             CrosshairSnapEnabled = true,
             Position = LiveChartsCore.Measure.AxisPosition.End
-        }, //PH轴        
+        },*/ //PH轴        
         };
 
-        private static  Random _r = new Random();
         private static  ObservableCollection<DateTimePoint> MTT_values;
         private static  ObservableCollection<DateTimePoint> MTL_values;
         private static ObservableCollection<DateTimePoint> MTH_values;
@@ -121,9 +120,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         private static ObservableCollection<DateTimePoint> STLB_values;
         private static ObservableCollection<DateTimePoint> STTC_values;
         private static ObservableCollection<DateTimePoint> STLC_values;
-
-        private static SQLiteHelper SQLiteHelpers = null;  //定义数据库
-        private static string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db";  //数据库路径
         static DataTable CDB = new DataTable();
         private static int CDB_Count;//长度
 
@@ -136,10 +132,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             if (mode)
             {
                 if (string.IsNullOrEmpty(w)) return;
-                SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where WorkOrder = '" + w + "'order by Time", null).Tables[0];
-                SQLiteHelpers.Close();
+                CDB = MainWindowViewModel.SQLiteChartAdress.ExecuteDataSet("select * from Chart where WorkOrder = '" + w + "'order by Time", null).Tables[0];
 
             }
             else
@@ -147,18 +140,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 if (string.IsNullOrEmpty(m)) return;
                 if (string.IsNullOrEmpty(s)) return;
                 if (string.IsNullOrEmpty(e)) return;
-                SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
-                SQLiteHelpers.Open();  //打开数据库
-                CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where Machine = '" + m + "'" +
+              //  SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
+              //  SQLiteHelpers.Open();  //打开数据库
+                CDB = MainWindowViewModel.SQLiteChartAdress.ExecuteDataSet("select * from Chart where Machine = '" + m + "'" +
                     " and Time > '" + s + "' and Time < '" + e + "' order by Time", null).Tables[0];
-                SQLiteHelpers.Close();
+             //   SQLiteHelpers.Close();
 
             }
 
             CDB_Count = CDB.Rows.Count;
             var MTT_items = new List<DateTimePoint>();
             var MTL_items = new List<DateTimePoint>();
-            var MTH_items = new List<DateTimePoint>();
+        //    var MTH_items = new List<DateTimePoint>();
             var MST_items = new List<DateTimePoint>();
             var MUT_items = new List<DateTimePoint>();
             var STTA_items = new List<DateTimePoint>();
@@ -167,26 +160,29 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             var STLB_items = new List<DateTimePoint>();
             var STTC_items = new List<DateTimePoint>();
             var STLC_items = new List<DateTimePoint>();
-            for (var i = 0; i < CDB_Count; i++)
+            for (var i = 0; i < CDB_Count; i=i+4)
             {
-                DateTime TIME = Convert.ToDateTime(CDB.Rows[i].Field<string>("Time"));
-                MTT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTT")));
-                MTL_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTL")));
-                MTH_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTH")));
-                MST_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MST")));
-                MUT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MUT")));
-                STTA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTA")));
-                STLA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLA")));
-                STTB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTB")));
-                STLB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLB")));
-                STTC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTC")));
-                STLC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLC")));
-                
+                try
+                {
+                    DateTime TIME = Convert.ToDateTime(CDB.Rows[i].Field<string>("Time"));
+                    MTT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTT")));
+                    MTL_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTL")));
+                    //   MTH_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTH")));
+                    MST_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MST")));
+                    MUT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MUT")));
+                    STTA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTA")));
+                    STLA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLA")));
+                    STTB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTB")));
+                    STLB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLB")));
+                    STTC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTC")));
+                    STLC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLC")));
+                }
+                catch (Exception) { }
             }
 
             MTT_values = new ObservableCollection<DateTimePoint>(MTT_items);
             MTL_values = new ObservableCollection<DateTimePoint>(MTL_items);
-            MTH_values = new ObservableCollection<DateTimePoint>(MTH_items);
+        //   MTH_values = new ObservableCollection<DateTimePoint>(MTH_items);
             MST_values = new ObservableCollection<DateTimePoint>(MST_items);
             MUT_values = new ObservableCollection<DateTimePoint>(MUT_items);                        
             STTA_values = new ObservableCollection<DateTimePoint>(STTA_items);               
@@ -198,7 +194,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             
             Series = new ISeries[]
             {
-                    new LineSeries<DateTimePoint>
+                 /*   new LineSeries<DateTimePoint>
                     {
                         Name = Properties.Resources.MasterCylinder +"PH",
                         Values = MTH_values,
@@ -208,7 +204,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                         Fill = null,
                         LineSmoothness = 0,
                         ScalesYAt = 2,
-                    },   //PH               
+                    },   *///PH               
                     new LineSeries<DateTimePoint>
                     {
                         Name = Resources.Target + Resources.Temperature,

WindowsView/InputBox.xaml

@@ -11,7 +11,7 @@
         Title="SUNLIGHT"  
         Height="150" Width="400">
     <Grid FocusManager.FocusedElement="{Binding ElementName=Boxx}">
-        <TextBox x:Name="Boxx" Height="40" Margin="20,10,20,0" VerticalAlignment="Top" FontSize="26" 
+        <TextBox x:Name="Boxx" Height="50" Margin="20,10,20,0" VerticalAlignment="Top" FontSize="26" 
                  MaxLines="1" BorderThickness="3,3,3,3" ClipToBounds="True"/>
         <Button Content="{x:Static lang:Resources.YES}" HorizontalAlignment="Left" Height="35" Margin="50,70,0,5" VerticalAlignment="Bottom" Width="80" Click="YES_Click"/>
         <Button Content="{x:Static lang:Resources.NO}" HorizontalAlignment="Right" Height="35" Margin="0,70,50,5" VerticalAlignment="Bottom" Width="80" Click="NO_Click"/>

WindowsView/MachineSelection.xaml.cs

@@ -29,8 +29,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
         public delegate void AddressUpdateHandler(object sender, AddressUpdateEventArgs e);
         //声明一个更新Address的事件
         public event AddressUpdateHandler AddressUpdated;       
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        private SQLiteHelper SQLiteHelpers = null;  //定义数据库
         private string MACHINEDATA;
         DataTable machine_table;
         private List<string> machine;
@@ -40,12 +38,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
         {
             InitializeComponent();
        
-            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库           
-            comboBoxMachine.ItemsSource = SQLiteHelpers.ExecuteDataSet("select * from MachinesGroups order by Name desc", null).Tables[0].
+            comboBoxMachine.ItemsSource = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from MachinesGroups order by Name desc", null).Tables[0].
                 AsEnumerable().Select(rowdata => rowdata.Field<string>("Name")).ToList();//转换代码 
-            machine_table = SQLiteHelpers.ExecuteDataSet("select * from Machines order by Name desc", null).Tables[0];
-            SQLiteHelpers.Close();  //关闭连接
+            machine_table = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from Machines order by Name desc", null).Tables[0];
 
             machine = machine_table.AsEnumerable().Select(rowdata => rowdata.Field<string>("Name")).ToList();//转换代码
 

WindowsView/User.xaml.cs

@@ -1,5 +1,6 @@
 using nGantt.GanttChart;
 using SunlightCentralizedControlManagement_SCCM_.View;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -17,8 +18,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
     /// </summary>
     public partial class User : Window
     {     
-        private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db";  //数据库路径
-        private UserClass.SqliteHelper.SQLiteHelper SQLiteHelpers = null;  //定义数据库
         CheckBox[] checkBoxes = new CheckBox[99];
         string[] strings = new string[13] {"修改系统设置", "修改用户设置",
             "单机监控","单机控制","单机设置","新建排程","排程编辑","排程删除",        
@@ -40,10 +39,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
                 checkBoxes[i].Height = 50;
                 Capacity.Children.Add(checkBoxes[i]);
             }
-            SQLiteHelpers = new UserClass.SqliteHelper.SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            DataGriduser.ItemsSource = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0].DefaultView;
-            SQLiteHelpers.Close();
+            DataGriduser.ItemsSource = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0].DefaultView;
         }       
 
         private void Tb_KeyFloating(object sender, TextCompositionEventArgs e)//输入事件
@@ -105,22 +101,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
             USER_new.Add("Groups", Group);
             USER_new.Add("Capacity", Cap);
             USER_new.Add("Note", note);
-            SQLiteHelpers = new UserClass.SqliteHelper.SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            SQLiteHelpers.Delete("USER", "Name='" + name + "'", null);
-            SQLiteHelpers.InsertData("USER", USER_new);// 执行插入
-            DataGriduser.ItemsSource = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0].DefaultView;
-            SQLiteHelpers.Close();
+            MainWindowViewModel.SQLiteHelpers.Delete("USER", "Name='" + name + "'", null);
+            MainWindowViewModel.SQLiteHelpers.InsertData("USER", USER_new);// 执行插入
+            DataGriduser.ItemsSource = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0].DefaultView;
             _Name.Text = null;
         }
 
         private void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
         {
-            SQLiteHelpers = new UserClass.SqliteHelper.SQLiteHelper(DBAddress); //数据库连接路径
-            SQLiteHelpers.Open();  //打开数据库
-            SQLiteHelpers.Delete("USER", "Name='" + _Name.Text + "'", null);
-            DataGriduser.ItemsSource = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0].DefaultView;
-            SQLiteHelpers.Close();
+            MainWindowViewModel.SQLiteHelpers.Delete("USER", "Name='" + _Name.Text + "'", null);
+            DataGriduser.ItemsSource = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0].DefaultView;
             _Name.Text = null;
         }
     }

WindowsView/UserInf.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="SunlightCentralizedControlManagement_SCCM_.WindowsView.UserInf"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
+        xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
+        WindowStartupLocation="CenterScreen"
+        Loaded ="Window_Loaded"
+        ResizeMode="NoResize"
+        mc:Ignorable="d"
+        Title="SUNLIGHT 800" Height="400" Width="800">
+    <Grid>
+        <Grid Margin="0,0,0,100">
+            <TextBox x:Name="INF_DATA" Margin="140,20,20,20" TextWrapping="Wrap" FontSize="30" IsReadOnly="True" BorderBrush="#FF673AB7" BorderThickness="2,2,2,2" Cursor="Hand" />       
+            <Image Height="100" Width="100" FlowDirection="LeftToRight" HorizontalAlignment="Left" Margin="20,0,0,0" Source="/Lmage/IconParkInfo.png" VerticalAlignment="Center"/>
+        </Grid>
+        <Button Content="{x:Static lang:Resources.YES}" HorizontalAlignment="Left" Height="45" Margin="50,70,20,20" 
+                VerticalAlignment="Bottom" Width="100" Click="YES_Click" HorizontalContentAlignment="Center"/>
+        <Button Content="{x:Static lang:Resources.NO}" HorizontalAlignment="Right" Height="45" Margin="50,70,20,20" 
+                VerticalAlignment="Bottom" Width="100" Click="YES_Click"/>
+    </Grid>
+</Window>

WindowsView/UserInf.xaml.cs

@@ -0,0 +1,47 @@
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using System.Xml.Linq;
+using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+
+namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
+{
+    /// <summary>
+    /// ViewProgram.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserInf : Window
+    {
+        public string Inf_DAT;//信息
+        public UserInf()
+        {
+            InitializeComponent();           
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            INF_DATA.Text = Inf_DAT;
+        }
+
+        private void YES_Click(object sender, RoutedEventArgs e)//确认
+        {
+            this.Close(); //关闭窗口
+        }
+
+    }
+}

WindowsView/UserWorkOrder.xaml

@@ -0,0 +1,93 @@
+<Window x:Class="SunlightCentralizedControlManagement_SCCM_.WindowsView.UserWorkOrder"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
+        xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
+        WindowStartupLocation="CenterScreen"
+        Loaded ="Window_Loaded"
+        ResizeMode="NoResize"
+        mc:Ignorable="d"
+        Title="SUNLIGHT 800" Height="400" Width="800">
+    <Grid>
+        <DataGrid Grid.Row="0" Grid.Column="0" x:Name="WorkOrder" AlternationCount="2" IsReadOnly="True" 
+                 SelectedCellsChanged="WorkOrder_SelectedCellsChanged" EnableRowVirtualization="True"  EnableColumnVirtualization="True"
+              VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling" AutoGenerateColumns="False" MinColumnWidth="30"                          
+              Background="White" GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" 
+              CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="True"   
+              CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" Margin="0,0,0,132" >
+            <DataGrid.RowStyle >
+                <Style TargetType="{x:Type DataGridRow}">
+                    <Setter Property="Height" Value="30" />
+                    <Setter Property="FontSize" Value="25" />
+                    <Setter Property="VerticalAlignment" Value="Center"/>
+                    <Style.Triggers>
+                        <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                            <Setter Property="Background" Value="#FFFFFFFF" />
+                        </Trigger>
+                        <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                            <Setter Property="Background" Value="#FFF0F0F0" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="False"/>
+                        <DataTrigger Binding="{Binding lock}" Value="True">
+                            <Setter Property="Background" Value="Red"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="309">
+                            <Setter Property="Background" Value="Red"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="308">
+                            <Setter Property="Background" Value="Yellow"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding State}" Value="800">
+                            <Setter Property="IsHitTestVisible" Value="False"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.RowStyle>
+            <DataGrid.CellStyle>
+                <Style TargetType="DataGridCell">
+                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="MinWidth" Value="20"/>
+                    <Setter Property="VerticalAlignment" Value="Center"/>
+                    <Style.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="#FFC0C0C0"/>
+                            <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                            <Setter Property="Foreground" Value="Black"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.CellStyle>
+            <DataGrid.Resources>
+                <Style x:Key="CellStyle" TargetType="{x:Type DataGridCell}">
+                    <Setter Property="Focusable" Value="False"/>
+                    <Setter Property="Background" Value="#FFFFFFFF"/>
+                    <Setter Property="BorderBrush" Value="#FFFFFFFF"/>
+                    <Setter Property="Foreground" Value="#000000"/>
+                </Style>
+            </DataGrid.Resources>
+            <DataGrid.Columns>
+                <!--列信息绑定-->
+                <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrder}" Binding="{Binding WorkOrder}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ProgramName}" Binding="{Binding ProgramName}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.StartTime}" Binding="{Binding StartTime}" Width="250" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Machines}" Binding="{Binding Machines}" Width="100" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ColorNumber}" Binding="{Binding ColorNumber}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Client}" Binding="{Binding Client}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ClothWeight}" Binding="{Binding ClothWeight}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ClothSpecies}" Binding="{Binding ClothSpecies}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.BathRatio}" Binding="{Binding BathRatio}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Total}" Binding="{Binding Total}" Width="200" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.USER}" Binding="{Binding USER}" Width="150" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ColorName}" Binding="{Binding ColorName}" Width="200" IsReadOnly="True"/>
+            </DataGrid.Columns>
+        </DataGrid>
+        <Image Height="100" Width="100" FlowDirection="LeftToRight" HorizontalAlignment="Left" Margin="20,0,0,20" Source="/Lmage/IconParkInfo.png" VerticalAlignment="Bottom"/>
+
+        <Button Content="{x:Static lang:Resources.Start}" HorizontalAlignment="Right" Height="45" Margin="50,70,200,20" IsEnabled="False" x:Name="Start"
+                VerticalAlignment="Bottom" Width="100" Click="Start_Click" HorizontalContentAlignment="Center"/>
+        <Button Content="{x:Static lang:Resources.Quit}" HorizontalAlignment="Right" Height="45" Margin="50,70,20,20" 
+                VerticalAlignment="Bottom" Width="100" Click="Quit_Click" HorizontalContentAlignment="Center"/>
+    </Grid>
+</Window>

WindowsView/UserWorkOrder.xaml.cs

@@ -0,0 +1,139 @@
+using ScottPlot.TickGenerators.TimeUnits;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using System.Xml.Linq;
+using TouchSocket.Core;
+using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+using static SunlightCentralizedControlManagement_SCCM_.ViewModel.MainWindowViewModel;
+
+namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
+{
+    /// <summary>
+    /// ViewProgram.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserWorkOrder : Window
+    {
+
+        public DataTable WorkOrderTable = new DataTable();//信息
+        private string WorkOrder_=null;
+        private string machine_ = null;
+        public UserWorkOrder()
+        {
+            InitializeComponent();           
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            WorkOrder.ItemsSource = WorkOrderTable.DefaultView;
+        }
+
+        private void Start_Click(object sender, RoutedEventArgs e)//确认
+        {
+            Dictionary<string, object> dat_821 = new Dictionary<string, object>();
+            dat_821.Clear();
+            dat_821.Add("INSTRUCTION", "START");
+            dat_821.Add("WorkOrder", WorkOrder_);
+            DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine_ + "'").First();
+            int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+            string dat = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_821.ToJsonString();
+
+            lock (MainWindowViewModel.Machines.Rows.SyncRoot)
+            {
+                if (drEmployee.Field<bool>("Type"))
+                {//网络
+                    MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                    {
+                        ID = index,
+                        DAT = dat
+                    });
+                }
+                else 
+                {//串口
+                    if (drEmployee.Field<string>("Serial") == "PORT1")
+                    {
+                        bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat);
+                        if (!exists)
+                        {
+                            stringQueueSerial_1.Enqueue(new QueueSerial
+                            {
+                                ID = index,
+                                DAT = dat
+                            });
+                        }
+                    }
+                    else if (drEmployee.Field<string>("Serial") == "PORT2")
+                    {
+                        bool exists = stringQueueSerial_2.Any(item => item.ID == index && item.DAT == dat);
+                        if (!exists)
+                        {
+                            stringQueueSerial_2.Enqueue(new QueueSerial
+                            {
+                                ID = index,
+                                DAT = dat
+                            });
+                        }
+                    }
+                    else if (drEmployee.Field<string>("Serial") == "PORT3")
+                    {
+                        bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat);
+                        if (!exists)
+                        {
+                            stringQueueSerial_3.Enqueue(new QueueSerial
+                            {
+                                ID = index,
+                                DAT = dat
+                            });
+                        }
+                    }
+                    else if (drEmployee.Field<string>("Serial") == "PORT4")
+                    {
+                        bool exists = stringQueueSerial_4.Any(item => item.ID == index && item.DAT == dat);
+                        if (!exists)
+                        {
+                            stringQueueSerial_4.Enqueue(new QueueSerial
+                            {
+                                ID = index,
+                                DAT = dat
+                            });
+                        }
+                    }
+                }
+            }
+
+            this.Close(); 
+        }
+        private void Quit_Click(object sender, RoutedEventArgs e)//退出
+        {
+            this.Close(); //关闭窗口
+        }
+        private void WorkOrder_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
+        {
+            int rownum = WorkOrder.SelectedIndex;//获取鼠标选中行并定义变量
+            if (rownum != -1)//判断鼠标定位是否有效
+            {
+                WorkOrder_ = (WorkOrder.Columns[0].GetCellContent(WorkOrder.Items[rownum]) as TextBlock).Text;//定位第0列，
+                machine_ = (WorkOrder.Columns[3].GetCellContent(WorkOrder.Items[rownum]) as TextBlock).Text;//定位第0列，
+
+                Start.IsEnabled = true;
+            }
+        }
+    }
+}

WindowsView/ViewStep.xaml

@@ -5,36 +5,149 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
         xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d" 
         WindowStartupLocation="CenterScreen"
         ResizeMode="NoResize"
-        Title="SUNLIGHT 800" Height="400" Width="400">
-    <Grid  FocusManager.FocusedElement="{Binding ElementName=boxNAME}">
-        <TextBlock Text="{x:Static lang:Resources.Code}" HorizontalAlignment="Left" Height="30" Margin="10,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE"/>
-        <TextBlock Text="{x:Static lang:Resources.Function}" HorizontalAlignment="Left" Height="30" Margin="10,60,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE"/>
-        <ComboBox x:Name="boxID" HorizontalAlignment="Right" Height="30" Margin="0,60,10,0" VerticalAlignment="Top" Width="230" FontSize="18" SelectionChanged="BoxID_SelectionChanged" BorderBrush="#FF5100E0"/>
-        <TextBox x:Name="boxNAME" HorizontalAlignment="Right" Height="30" Margin="0,20,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True" ToolTip="code"
-                 TextChanged="TextBox_TextChanged" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" FontSize="18" HorizontalContentAlignment="Left" MaxLength="3" CaretBrush="#FF5100E0" BorderBrush="#FF5100E0"/>
+        WindowStyle="None"
+        Title="SUNLIGHT 800" Height="800" Width="600">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="300"/>
+            <RowDefinition/>
+            <RowDefinition Height="50"/>
+        </Grid.RowDefinitions>
+        <Border Grid.Row="1" BorderThickness="5,5,5,5" BorderBrush="#FFABABAB"/>
+        <Grid Grid.Row="0">
+            <TextBlock Text="{x:Static lang:Resources.Code}" HorizontalAlignment="Left" Height="30"
+                   Margin="210,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150"
+                   FontSize="20" Background="#FFEFEEEE"/>
+            <TextBlock Text="{x:Static lang:Resources.Function}" HorizontalAlignment="Left" Height="30" 
+                   Margin="210,60,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" 
+                   FontSize="20" Background="#FFEFEEEE"/>
+            <ComboBox x:Name="boxID" HorizontalAlignment="Right" Height="30" Margin="0,60,10,0" 
+                  VerticalAlignment="Top" Width="230" FontSize="20" SelectionChanged="BoxID_SelectionChanged"/>
+            <TextBox x:Name="boxNAME" HorizontalAlignment="Right" Height="30" Margin="0,20,10,0" 
+                 TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"
+                 TextChanged="TextBox_TextChanged" PreviewTextInput="Tb_KeyPress" 
+                 InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Right" MaxLength="3"/>
+            <Image x:Name="imageP" HorizontalAlignment="Left" Height="200" Margin="10,20,0,0" VerticalAlignment="Top" Width="200">
+                <Image.OpacityMask>
+                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                        <GradientStop Color="Black"/>
+                        <GradientStop Color="White" Offset="1"/>
+                    </LinearGradientBrush>
+                </Image.OpacityMask>
+            </Image>
+            <TextBlock x:Name="P1N" HorizontalAlignment="Left" Height="30" Margin="210,120,0,0" 
+                   TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
+                   Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P1" HorizontalAlignment="Right" Height="30" Margin="0,120,10,0"                
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"                    
+                     Text="0" PreviewTextInput="Tb_KeyP1" InputMethod.IsInputMethodEnabled="False"               
+                     FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P1_TextChanged"/>
+            <TextBlock x:Name="P2N" HorizontalAlignment="Left" Height="30" Margin="210,155,0,0" 
+                   TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20" 
+                   Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P2" HorizontalAlignment="Right" Height="30" Margin="0,155,10,0" 
+                 TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"            
+                     Text="0" PreviewTextInput="Tb_KeyP2" InputMethod.IsInputMethodEnabled="False" 
+                 FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P2_TextChanged"/>
+            <TextBlock x:Name="P3N" HorizontalAlignment="Left" Height="30" Margin="210,190,0,0" 
+                   TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20" 
+                   Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P3" HorizontalAlignment="Right" Height="30" Margin="0,190,10,0" 
+                 TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"             
+                 Text="0" PreviewTextInput="Tb_KeyP3" InputMethod.IsInputMethodEnabled="False"
+                 FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P3_TextChanged"/>
+            <TextBlock x:Name="P4N" HorizontalAlignment="Left" Height="30" Margin="210,225,0,0" 
+                   TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20" 
+                   Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P4" HorizontalAlignment="Right" Height="30" Margin="0,225,10,0" 
+                 TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"             
+                 Text="0" PreviewTextInput="Tb_KeyP4" InputMethod.IsInputMethodEnabled="False" 
+                 FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P4_TextChanged"/>
+            <TextBlock x:Name="P5N" HorizontalAlignment="Left" Height="30" Margin="210,260,0,0" 
+                   TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20" 
+                   Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P5" HorizontalAlignment="Right" Height="30" Margin="0,260,10,0" 
+                 TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"             
+                 Text="0" PreviewTextInput="Tb_KeyP5" InputMethod.IsInputMethodEnabled="False" 
+                 FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P5_TextChanged"/>
+        </Grid>
 
-        <TextBlock x:Name="P1N" HorizontalAlignment="Left" Height="30" Margin="10,120,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE" Visibility="Hidden"/>
-        <TextBox x:Name="P1" HorizontalAlignment="Right" Height="30" Margin="0,120,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"
-             Text="0" PreviewTextInput="Tb_KeyP1" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Left" Visibility="Hidden" CaretBrush="#FF5100E0" />
-        <TextBlock x:Name="P2N" HorizontalAlignment="Left" Height="30" Margin="10,155,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE" Visibility="Hidden"/>
-        <TextBox x:Name="P2" HorizontalAlignment="Right" Height="30" Margin="0,155,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"
-             Text="0" PreviewTextInput="Tb_KeyP2" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Left" Visibility="Hidden" CaretBrush="#FF5100E0" />
-        <TextBlock x:Name="P3N" HorizontalAlignment="Left" Height="30" Margin="10,190,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE" Visibility="Hidden"/>
-        <TextBox x:Name="P3" HorizontalAlignment="Right" Height="30" Margin="0,190,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"
-             Text="0" PreviewTextInput="Tb_KeyP3" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Left" Visibility="Hidden" CaretBrush="#FF5100E0" />
-        <TextBlock x:Name="P4N" HorizontalAlignment="Left" Height="30" Margin="10,225,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE" Visibility="Hidden"/>
-        <TextBox x:Name="P4" HorizontalAlignment="Right" Height="30" Margin="0,225,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"
-             Text="0" PreviewTextInput="Tb_KeyP4" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Left" Visibility="Hidden" CaretBrush="#FF5100E0" />
-        <TextBlock x:Name="P5N" HorizontalAlignment="Left" Height="30" Margin="10,260,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="130" FontSize="20" Background="#FFEFEEEE" Visibility="Hidden"/>
-        <TextBox x:Name="P5" HorizontalAlignment="Right" Height="30" Margin="0,260,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"
-             Text="0" PreviewTextInput="Tb_KeyP5" InputMethod.IsInputMethodEnabled="False" FontSize="20" HorizontalContentAlignment="Left" Visibility="Hidden" CaretBrush="#FF5100E0" />
+        <Grid Grid.Row="1">
+            <TextBlock x:Name="Sub" Text="{x:Static lang:Resources.Subroutine}" HorizontalAlignment="Left" 
+                       Height="40" Margin="210,20,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="360" 
+                       FontSize="25" Background="#FFEFEEEE"/>
+            <Image x:Name="imageP1" Source="/Lmage/ADD.jpg" HorizontalAlignment="Left" Height="125"        
+                   Margin="20,10,0,0" VerticalAlignment="Top" Width="125" Opacity="0.4"
+                   MouseLeftButtonDown="imageP1_MouseLeftButtonDown" MouseLeftButtonUp="imageP1_MouseLeftButtonUp"/>
+            <Image x:Name="imageP2" Source="/Lmage/ADD.jpg" HorizontalAlignment="Left" Height="125"       
+                   Margin="20,145,0,0" VerticalAlignment="Top" Width="125" Opacity="0.4"
+                   MouseLeftButtonDown="imageP2_MouseLeftButtonDown" MouseLeftButtonUp="imageP2_MouseLeftButtonUp"/>
+            <Image x:Name="imageP3" Source="/Lmage/ADD.jpg" HorizontalAlignment="Left" Height="125"             
+                   Margin="20,280,0,0" VerticalAlignment="Top" Width="125" Opacity="0.4"
+                   MouseLeftButtonDown="imageP3_MouseLeftButtonDown" MouseLeftButtonUp="imageP3_MouseLeftButtonUp"/>
+            <TextBlock Text="{x:Static lang:Resources.Code}" HorizontalAlignment="Left" Height="30"
+            Margin="210,70,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150"
+            FontSize="20" Background="#FFEFEEEE"/>
+            <TextBlock Text="{x:Static lang:Resources.Function}" HorizontalAlignment="Left" Height="30" 
+            Margin="210,110,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" 
+            FontSize="20" Background="#FFEFEEEE"/>
+            <ComboBox x:Name="boxIDp" HorizontalAlignment="Right" Height="30" Margin="0,110,10,0" 
+           VerticalAlignment="Top" Width="230" FontSize="20" SelectionChanged="boxIDp_SelectionChanged"/>
+            <TextBox x:Name="boxNAMEp" HorizontalAlignment="Right" Height="30" Margin="0,70,10,0"         
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" ClipToBounds="True"         
+                     IsReadOnly="True"  FontSize="20" HorizontalContentAlignment="Right" MaxLength="3"
+                      TextChanged="TextBoxp_TextChanged" />
+            <TextBlock x:Name="P1NP" HorizontalAlignment="Left" Height="30" Margin="210,170,0,0"           
+                       TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"           
+                       Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P1P" HorizontalAlignment="Right" Height="30" Margin="0,170,10,0"          
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" 
+                     ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP1p" 
+                     TextChanged="P1P_TextChanged" InputMethod.IsInputMethodEnabled="False" 
+                     FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
+            <TextBlock x:Name="P2NP" HorizontalAlignment="Left" Height="30" Margin="210,205,0,0"            
+                       TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"           
+                       Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P2P" HorizontalAlignment="Right" Height="30" Margin="0,205,10,0"           
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" 
+                     ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP2p" 
+                     TextChanged="P2P_TextChanged" InputMethod.IsInputMethodEnabled="False" 
+                     FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
+            <TextBlock x:Name="P3NP" HorizontalAlignment="Left" Height="30" Margin="210,240,0,0"            
+                       TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"           
+                       Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P3P" HorizontalAlignment="Right" Height="30" Margin="0,240,10,0"          
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" 
+                     ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP3p" 
+                     TextChanged="P3P_TextChanged" InputMethod.IsInputMethodEnabled="False" 
+                     FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
+            <TextBlock x:Name="P4NP" HorizontalAlignment="Left" Height="30" Margin="210,275,0,0"          
+                       TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"          
+                       Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P4P" HorizontalAlignment="Right" Height="30" Margin="0,275,10,0"         
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1"
+                     ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP4p"
+                     TextChanged="P4P_TextChanged" InputMethod.IsInputMethodEnabled="False"         
+                     FontSize="20"  HorizontalContentAlignment="Right" Visibility="Hidden" />
+            <TextBlock x:Name="P5NP" HorizontalAlignment="Left" Height="30" Margin="210,310,0,0"           
+                       TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"           
+                       Background="#FFEFEEEE" Visibility="Hidden"/>
+            <TextBox x:Name="P5P" HorizontalAlignment="Right" Height="30" Margin="0,310,10,0"         
+                     TextWrapping="Wrap" VerticalAlignment="Top" Width="230"  MaxLines="1" 
+                     ClipToBounds="True" Text="0" PreviewTextInput="Tb_KeyP5p" 
+                     TextChanged="P5P_TextChanged" InputMethod.IsInputMethodEnabled="False"       
+                     FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
+        </Grid>
 
-        <Button Content="{x:Static lang:Resources.YES}" HorizontalAlignment="Left" Height="35" Margin="50,70,0,5" VerticalAlignment="Bottom" Width="80" Click="YES_Click" Background="#FF5100E0"/>
-        <Button Content="{x:Static lang:Resources.NO}" HorizontalAlignment="Right" Height="35" Margin="0,70,50,5" VerticalAlignment="Bottom" Width="80" Click="NO_Click" Background="#FF5100E0"/>
+        <Button Grid.Row="2" x:Name="yes" Content="{x:Static lang:Resources.YES}" 
+                HorizontalAlignment="Right" Height="35" Margin="0,0,200,5" 
+                VerticalAlignment="Bottom" Width="80" Click="YES_Click"/>
+        <Button Grid.Row="2" x:Name="no" Content="{x:Static lang:Resources.NO}" 
+                HorizontalAlignment="Right" Height="35" Margin="0,0,50,5" 
+                VerticalAlignment="Bottom" Width="80" Click="NO_Click"/>
 
     </Grid>
 </Window>