diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index a97b9ed..62621bf 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -1069,12 +1069,12 @@ 音量 - + 請求 - + 副功能 - + 輸送異常 \ No newline at end of file diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 69db75e..287c76c 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -78,6 +78,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass 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"); @@ -104,6 +105,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass 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"); @@ -386,12 +388,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass { a.UseCheckClear() .SetCheckClearType(CheckClearType.All) - .SetTick(TimeSpan.FromSeconds(60)) + .SetTick(TimeSpan.FromSeconds(5)) .SetOnClose((c, t) => { c.TryShutdown(); }); - a.UseTcpReconnection();//触发型重连 + // a.UseTcpReconnection();//触发型重连 }) .ConfigureContainer(a => { diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml index 7a0e16a..b2da9fb 100644 --- a/View/MonitorView.xaml +++ b/View/MonitorView.xaml @@ -17,6 +17,14 @@ + + + + + + + + @@ -51,6 +59,21 @@ + + + + + + + + + + + + + + + @@ -74,7 +97,7 @@ - + @@ -152,6 +175,10 @@ + + + @@ -167,13 +194,6 @@ - - - - - - - @@ -260,12 +280,14 @@ - + - + + + @@ -301,15 +323,7 @@ - - - - - - - - - + diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 37c7bce..b5a909e 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -100,8 +100,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View DyeingMachine.IsEnabled = true; Curve.IsEnabled = true; Screen.IsEnabled = true; - Receipt.IsEnabled = true; - LOCK_XML.IsEnabled = true; + Receipt.IsEnabled = true; TechnologicalProcess_bool = true; IsInteractive = false; @@ -226,7 +225,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View dyelotView.DyelotDatatable(Product_DAT); Picture.Content = dyelotView; }//单据 - private void ListViewItem_LOCK_XML(object sender, MouseButtonEventArgs e) + private void MenuItem_LOCK_XML(object sender, RoutedEventArgs e) { string mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("LOCK"); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 79837ef..c986575 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -336,7 +336,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel /**染机用户信息**/ try { - if ((int)Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'") == 901) + if ((int)Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'") == 901)//打开用户提示信息 { MainWindow.InfData.Rows.Add(new object[] { Selet_Machines(Machines, "Name", "ID='" + i + "'"), @@ -345,7 +345,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel Selet_Machines(Machines, "ID", "ID='" + i + "'")}); Updata_Machines(Machines, "UserInfoStart", "ID='" + i + "'", "900"); } - if (Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'").ToString() == "902") + if (Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'").ToString() == "902")//删除用户提示信息 { MainWindow.InfData.Select("ID='" + i + "'").First().Delete(); } @@ -449,7 +449,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel dataRow["Redye"] + "' AND Step = '" + dataRow["Step"] + "'")) { Row.BeginEdit(); - Row["State"] = 301; + Row["State"] = 309; Row["Amount"] = 0; Row["DispenseEndTime"] = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); Row.EndEdit(); @@ -501,13 +501,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } } - else if (dt.Select("DyeState = 309").Count() > 0) + else if (dt.Select("PowderState = 309").Count() > 0) { foreach (DataRow Row in Dyelot_CALL.Select("Dyelot='" + dataRow["Dyelot"] + "' and Redye ='" + dataRow["Redye"] + "' AND Step = '" + dataRow["Step"] + "'")) { Row.BeginEdit(); - Row["State"] = 301; + Row["State"] = 309; Row["Amount"] = 0; Row["DispenseEndTime"] = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); Row.EndEdit(); @@ -552,13 +552,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } } - else if (dt.Select("DyeState = 309").Count() > 0) + else if (dt.Select("ChemicalState = 309").Count() > 0) { foreach (DataRow Row in Dyelot_CALL.Select("Dyelot='" + dataRow["Dyelot"] + "' and Redye ='" + dataRow["Redye"] + "' AND Step = '" + dataRow["Step"] + "'")) { Row.BeginEdit(); - Row["State"] = 301; + Row["State"] = 309; Row["Amount"] = 0; Row["DispenseEndTime"] = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); Row.EndEdit(); @@ -591,6 +591,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel DAT = "SC828" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "Name='" + row.Field("Machine") + "'") + Product_.ToJsonString() }); + if (row["State"].ToString() == "309") + { + MainWindow.InfData.Rows.Add(new object[] { row["Machine"], + Resources.Step + row["Step"]+ Resources.DispenseException, + Selet_Machines(Machines, "SYSKEY", "Name='" + row["Machine"] + "'"), + Selet_Machines(Machines, "ID", "Name='" + row["Machine"] + "'")}); + } Dyelot_CALL.Rows.Remove(row); } }