diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index e565873..c1502a5 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -71,7 +71,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass drEmployee["State"] = "800"; drEmployee["WorkOrder"] = "------"; drEmployee["Dyelot"] = ""; - drEmployee["Temperature"] = "---.-"; + drEmployee["Temperature"] = 0.0; drEmployee["WaterLevel"] = "----"; drEmployee["Process"] = ""; drEmployee["Step"] = ""; @@ -97,7 +97,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass drEmployee["State"] = "800"; drEmployee["WorkOrder"] = "------"; drEmployee["Dyelot"] = ""; - drEmployee["Temperature"] = "---.-"; + drEmployee["Temperature"] = 0.0; drEmployee["WaterLevel"] = "----"; drEmployee["Process"] = ""; drEmployee["Step"] = ""; @@ -174,11 +174,40 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass try { DAT = DAT.Substring(DAT.IndexOf("]") + 1); - MainWindowViewModel.Dyelot_CALL = JsonConvert.DeserializeObject(DAT).Copy();//反序列化 + DataTable dataTable = JsonConvert.DeserializeObject(DAT);//反序列化 + foreach (DataRow sourceRow in dataTable.Rows) + { + // 创建新行(基于目标表结构) + 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 Product_ = new Dictionary();//缓存函数 + Product_.Add("State", 202); + Product_.Add("Dyelot", newRow.Field("Dyelot")); + Product_.Add("Step", newRow.Field("Step")); + Product_.Add("ProductCode", newRow.Field("ProductCode")); + Product_.Add("Amount", newRow.Field("Amount")); + Product_.Add("DispenseEndTime", newRow.Field("DispenseEndTime")); + MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString + { + ID = Convert.ToInt16(MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, + "ID", "Name='" + newRow.Field("Machine") + "'")), + DAT = "SC828" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, + "SYSKEY", "Name='" + newRow.Field("Machine") + "'") + Product_.ToJsonString() + }); + } } - catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } + catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } }//呼叫领料单 else if (SYSAPI == "SC830") { diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 8b3f413..c7bc9f8 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -97,6 +97,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel SQLiteHelpers.Open(); //打开数据库 Machines = SQLiteHelpers.ExecuteDataSet("select * from Machines Order by id", null).Tables[0]; //读取表写入缓存 USER_data = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0]; + Dyelot_CALL = SQLiteHelpers.ExecuteDataSet("select * from Dyelot", null).Tables[0].Clone(); SQLiteHelpers.Close(); USERCapacity(App.USER_Purview);//App.USER_Purview); @@ -334,6 +335,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } catch (Exception) { } + /**染机呼叫状态**/ try { if ((bool)Selet_Machines(Machines, "CALL", "ID='" + i + "'"))