diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index 7d0e362..9845b3f 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -201,6 +201,9 @@ Sampling.xaml + + UserInf.xaml + UserCall.xaml @@ -282,6 +285,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -425,6 +432,7 @@ + diff --git a/Lmage/IconParkInfo.png b/Lmage/IconParkInfo.png new file mode 100644 index 0000000..6ad8a11 Binary files /dev/null and b/Lmage/IconParkInfo.png differ diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index bfb0fdd..fa7786d 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -699,6 +699,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Locked state 的本地化字符串。 + /// + public static string LockedState { + get { + return ResourceManager.GetString("LockedState", resourceCulture); + } + } + /// /// 查找类似 Low-water level 的本地化字符串。 /// @@ -897,6 +906,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 please continue after the restriction is lifted 的本地化字符串。 + /// + public static string PCATRIL { + get { + return ResourceManager.GetString("PCATRIL", resourceCulture); + } + } + /// /// 查找类似 PHControl 的本地化字符串。 /// @@ -1338,6 +1356,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 The current operation is restricted 的本地化字符串。 + /// + public static string TCOIR { + get { + return ResourceManager.GetString("TCOIR", resourceCulture); + } + } + /// /// 查找类似 Process 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index f3b5348..0230de4 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -591,4 +591,13 @@ Waiting For Check + + Locked state + + + The current operation is restricted + + + please continue after the restriction is lifted + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index f446f5a..69d56a7 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -591,4 +591,13 @@ Inspect + + Locked state + + + The current operation is restricted + + + please continue after the restriction is lifted + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 67163f1..dea63db 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -591,4 +591,13 @@ 等待检查 + + 锁定状态 + + + 当前操作已限制 + + + 请解除限制后继续 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index c6c5083..202856d 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -591,4 +591,13 @@ 等待檢查 + + 锁定状态 + + + 目前操作已限制 + + + 請解除限制後繼續 + \ No newline at end of file diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 36e8e6a..483f61d 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -1,30 +1,31 @@ using DyeingComputer.UserClass; +using DyeingComputer.View; +using DyeingComputer.ViewModel; +using Newtonsoft.Json; using System; +using System.Collections; using System.Collections.Generic; using System.Data; +using System.Diagnostics; using System.Linq; using System.Net; using System.Net.Http; using System.Net.Sockets; using System.Reflection.Emit; +using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Diagnostics; +using System.Windows; +using System.Windows.Controls; using TouchSocket.Core; using TouchSocket.Sockets; -using DyeingComputer.ViewModel; -using System.Runtime.InteropServices; -using static System.Windows.Forms.AxHost; -using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; -using Newtonsoft.Json; using static DyeingComputer.UserClass.SqliteHelper; -using DyeingComputer.View; -using System.Windows; -using System.Windows.Controls; using static System.Net.WebRequestMethods; -using System.Collections; +using static System.Windows.Forms.AxHost; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock; namespace DyeingComputer.UserClass {/// @@ -242,6 +243,7 @@ namespace DyeingComputer.UserClass else if (dat_821.GetValue("INSTRUCTION").ToString() == "PAUSE") { MainWindowViewModel.WORK_RUN = 1;//暂停 + MainWindowViewModel.errTabler.Clear(); client.SendAsync("SC821" + SYSKEY + SYSDAT); } @@ -299,20 +301,14 @@ namespace DyeingComputer.UserClass // SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 // SQLiteHelpers.Open(); //打开数据库 MainWindow.SQLiteHelpers.Delete("RUN", null, null); - DataTable data_t = MainWindowViewModel.dt_TP.Clone(); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { - data_t.Clear();//清空 - DataRow dt = MainWindowViewModel.dt_TP.Rows[i];//行转换 - DataRow drT = data_t.NewRow(); - drT.ItemArray = dt.ItemArray; - data_t.Rows.InsertAt(drT, 0); - drT.BeginEdit(); //添加订单号 - drT["DYELOT"] = MainWindowViewModel.WorkNumder; - drT.EndEdit(); - - MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + dt.BeginEdit(); //添加订单号 + dt["DYELOT"] = MainWindowViewModel.WorkNumder; + dt.EndEdit(); + + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入 } //SQLiteHelpers.Close(); //关闭连接 @@ -345,19 +341,13 @@ namespace DyeingComputer.UserClass DataTable data_t = MainWindowViewModel.dt_TP.Clone(); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { - data_t.Clear();//清空 - DataRow dt = MainWindowViewModel.dt_TP.Rows[i];//行转换 - DataRow drT = data_t.NewRow(); - drT.ItemArray = dt.ItemArray; - data_t.Rows.InsertAt(drT, 0); - drT.BeginEdit(); //添加订单号 - drT["DYELOT"] = MainWindowViewModel.WorkNumder; - drT.EndEdit(); - - MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 - } - //SQLiteHelpers.Close(); //关闭连接 + dt.BeginEdit(); //添加订单号 + dt["DYELOT"] = MainWindowViewModel.WorkNumder; + dt.EndEdit(); + + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入 + } //SQLiteHelpers.Close(); //关闭连接 client.SendAsync("SC831" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_TP.ToJsonString()); MainWindowViewModel.TX++; @@ -374,17 +364,12 @@ namespace DyeingComputer.UserClass DataTable data_t = MainWindowViewModel.dt_TP.Clone(); for (int i = 0; i < MainWindowViewModel.dt_TP.Rows.Count; i++) { - data_t.Clear();//清空 - DataRow dt = MainWindowViewModel.dt_TP.Rows[i];//行转换 - DataRow drT = data_t.NewRow(); - drT.ItemArray = dt.ItemArray; - data_t.Rows.InsertAt(drT, 0); - drT.BeginEdit(); //添加订单号 - drT["DYELOT"] = MainWindowViewModel.WorkNumder; - drT.EndEdit(); - - MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + dt.BeginEdit(); //添加订单号 + dt["DYELOT"] = MainWindowViewModel.WorkNumder; + dt.EndEdit(); + + MainWindow.SQLiteHelpers.InsertData("RUN", MainWindow.SQLiteHelpers.ToDictionary(dt));//行插入 } //SQLiteHelpers.Close(); //关闭连接 diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml index 43c0a8e..b67a642 100644 --- a/View/TechnologicalProcessView.xaml +++ b/View/TechnologicalProcessView.xaml @@ -209,7 +209,8 @@ + HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" ColumnHeaderHeight="40" + CellEditEnding="Parameter_set_CellEditEnding" BeginningEdit="Parameter_set_BeginningEdit" >