diff --git a/UserClass/AsyncSerialPortClient.cs b/UserClass/AsyncSerialPortClient.cs index 98a96f9..12d40d1 100644 --- a/UserClass/AsyncSerialPortClient.cs +++ b/UserClass/AsyncSerialPortClient.cs @@ -95,32 +95,50 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass { try { + DAT = DAT.Substring(DAT.IndexOf("]") + 1); + Dictionary _dat; + _dat = SerializeConvert.JsonDeserializeFromString>(DAT); MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 111 } }, - "WorkOrder ='" + DAT + "'", null); + "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null); } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } - } + }//回复的工单记录状态后就位111 else if (SYSAPI == "SC811") { try { - MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 113 } }, - "WorkOrder ='" + DAT + "'", null); + DAT = DAT.Substring(DAT.IndexOf("]") + 1); + Dictionary _dat; + _dat = SerializeConvert.JsonDeserializeFromString>(DAT); + MainWindowViewModel.SQLiteHelpers.Update("WorkorderSteps", new Dictionary { { "Mode", 1 } }, + "WorkOrder ='" + _dat.GetValue("Order") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "' AND Step ='" + + _dat.GetValue("Step") + "'", null); + + int x = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='"+ + _dat.GetValue("Order") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "' AND Mode <> '1'", null).Tables[0].Rows.Count; + if (x == 0) + { + MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 113 } }, + "WorkOrder ='" + _dat.GetValue("Order") + "' 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 _dat; + _dat = SerializeConvert.JsonDeserializeFromString>(DAT); MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 101 } }, - "WorkOrder ='" + DAT + "'", null); + "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null); } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } - } + }//回复的工单设置状态后就位101 else if (SYSAPI == "SC827") { try @@ -427,7 +445,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass _responseEvent.Reset(); serialPortClients.Send(command); // 发送指令 // 等待500毫秒或直到收到响应 - _responseEvent.Wait(TimeSpan.FromMilliseconds(500)); + _responseEvent.Wait(TimeSpan.FromMilliseconds(1000)); // 重置事件状态 _responseEvent.Set(); //清楚了解状态 diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 1a02dd7..e0adfcd 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -159,9 +159,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass { try { - DAT = DAT.Substring(DAT.IndexOf("]") + 1); + DAT = DAT.Substring(DAT.IndexOf("]") + 1); + Dictionary _dat; + _dat = SerializeConvert.JsonDeserializeFromString>(DAT); MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 111 } }, - "WorkOrder ='" + DAT + "'", null); + "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null); } catch (Exception ex) { @@ -173,8 +175,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass try { DAT = DAT.Substring(DAT.IndexOf("]") + 1); + Dictionary _dat; + _dat = SerializeConvert.JsonDeserializeFromString>(DAT); MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 113 } }, - "WorkOrder ='" + DAT + "'", null); + "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='"+ _dat.GetValue("ReDye") + "'", null); } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } } diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs index f4ab286..61d4b38 100644 --- a/View/ProgramstepsView .xaml.cs +++ b/View/ProgramstepsView .xaml.cs @@ -1,4 +1,6 @@ -using SunlightCentralizedControlManagement_SCCM_.UserClass; + + +using SunlightCentralizedControlManagement_SCCM_.UserClass; using SunlightCentralizedControlManagement_SCCM_.ViewModel; using SunlightCentralizedControlManagement_SCCM_.WindowsView; using System; diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 1d9345a..54b66ca 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -230,80 +230,122 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel void Tick_Main_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S { /*下传工单信息*/ - DataTable WorkOrderstepdata = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='111' or State='112') AND EndTime >'" + + DataTable WorkOrderstepdata = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='111' OR State='112') AND StartTime >'" + DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存 for (int k = 0; k < WorkOrderstepdata.Rows.Count; k++) { string WorkOrderdata_m = WorkOrderstepdata.Select()[k].Field("Machines").ToString(); - //string m= WorkOrderstepdata.Rows[k].Field("Machines"); + DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='" + + WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "'", null).Tables[0]; + int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderdata_m + "'").ToString()); + lock (MainWindowViewModel.Machines.Rows.SyncRoot) { if (Convert.ToBoolean(Selet_Machines(Machines, "Type", "Name='" + WorkOrderdata_m + "'"))) {//网络 - //string WorkOrderdata_m = WorkOrderstepdata.Select()[k].Field("Machines").ToString(); - DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='" + - WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "'", null).Tables[0]; - int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderdata_m + "'").ToString()); stringQueue.Enqueue(new QueueString { ID = index, DAT = "SC811" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + dataTable.ToJsonString() }); - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 112 } }, - "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "'", null); } else {//串口 - DataTable dataTable = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='" + - WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "' AND ReDye ='" + - WorkOrderstepdata.Select()[k].Field("ReDye").ToString() + "' AND Mode<> '201'", null).Tables[0]; - - int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderdata_m + "'").ToString()); - if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT1") + foreach (DataRow dataRow in dataTable.Select("Mode<>'1'")) { - stringQueueSerial_1.Enqueue(new QueueSerial - { - ID = index, - DAT = "SC811[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - dataTable.Rows[0].ToJsonString() - }); - } - else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT2") - { - stringQueueSerial_2.Enqueue(new QueueSerial - { - ID = index, - DAT = "SC811[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - dataTable.Rows[0].ToJsonString() - }); - } - else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3") - { - stringQueueSerial_3.Enqueue(new QueueSerial - { - ID = index, - DAT = "SC811[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - dataTable.Rows[0].ToJsonString() - }); - } - else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT4") - { - stringQueueSerial_4.Enqueue(new QueueSerial - { - ID = index, - DAT = "SC811[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - dataTable.Rows[0].ToJsonString() - }); + Dictionary dat_ = new Dictionary(); + dat_.Add("Order", dataRow["WorkOrder"].ToString()); + dat_.Add("Dye", dataRow["DYELOT"].ToString()); + dat_.Add("Time", dataRow["StepTime"].ToString()); + dat_.Add("ReDye", dataRow["ReDye"].ToString()); + dat_.Add("Program", dataRow["Program"].ToString()); + dat_.Add("Step", dataRow["Step"].ToString()); + dat_.Add("StepID", dataRow["StepID"].ToString()); + dat_.Add("P1", dataRow["Parameter1"].ToString()); + dat_.Add("P2", dataRow["Parameter2"].ToString()); + dat_.Add("P3", dataRow["Parameter3"].ToString()); + dat_.Add("P4", dataRow["Parameter4"].ToString()); + dat_.Add("P5", dataRow["Parameter5"].ToString()); + dat_.Add("P6", dataRow["Parameter6"].ToString()); + dat_.Add("P7", dataRow["Parameter7"].ToString()); + dat_.Add("P8", dataRow["Parameter8"].ToString()); + dat_.Add("P9", dataRow["Parameter9"].ToString()); + dat_.Add("P10", dataRow["Parameter10"].ToString()); + dat_.Add("SIDS1", dataRow["StepID_S1"].ToString()); + dat_.Add("SIDS2", dataRow["StepID_S2"].ToString()); + dat_.Add("SIDS3", dataRow["StepID_S3"].ToString()); + dat_.Add("P1S1", dataRow["Parameter1_S1"].ToString()); + dat_.Add("P2S1", dataRow["Parameter2_S1"].ToString()); + dat_.Add("P3S1", dataRow["Parameter3_S1"].ToString()); + dat_.Add("P4S1", dataRow["Parameter4_S1"].ToString()); + dat_.Add("P5S1", dataRow["Parameter5_S1"].ToString()); + dat_.Add("P1S2", dataRow["Parameter1_S2"].ToString()); + dat_.Add("P2S2", dataRow["Parameter2_S2"].ToString()); + dat_.Add("P3S2", dataRow["Parameter3_S2"].ToString()); + dat_.Add("P4S2", dataRow["Parameter4_S2"].ToString()); + dat_.Add("P5S2", dataRow["Parameter5_S2"].ToString()); + dat_.Add("P1S3", dataRow["Parameter1_S3"].ToString()); + dat_.Add("P2S3", dataRow["Parameter2_S3"].ToString()); + dat_.Add("P3S3", dataRow["Parameter3_S3"].ToString()); + dat_.Add("P4S3", dataRow["Parameter4_S3"].ToString()); + dat_.Add("P5S3", dataRow["Parameter5_S3"].ToString()); + + string dat = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString(); + + if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "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 (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT2") + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_2.Any(item => item.ID == index && item.DAT == dat); + if (!exists) + { + stringQueueSerial_2.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString() + }); + } } + else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3") + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat); + if (!exists) + { + stringQueueSerial_3.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString() + }); + } + } + else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT4") + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_4.Any(item => item.ID == index && item.DAT == dat); + if (!exists) + { + stringQueueSerial_4.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString() + }); + } } } } + SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 112 } }, + "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "'", null); } } /*下传工单总览*/ - DataTable WorkOrderdata = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='100' or State='110') AND EndTime >'" + + DataTable WorkOrderdata = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='100' OR State='110') AND StartTime >'" + DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存 for (int k = 0; k < WorkOrderdata.Rows.Count; k++) { @@ -332,8 +374,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel ID = index, DAT = "SC810" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + DataTableToDictionary(dataTable).ToJsonString() }); - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 110 } }, - "WorkOrder ='" + WorkOrderdata.Select()[k].Field("WorkOrder").ToString() + "'", null); } } else @@ -341,7 +381,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel //string WorkOrderdata_m = WorkOrderdata.Select()[k].Field("Machines").ToString(); string State = Selet_Machines(Machines, "State", "Name='" + WorkOrderdata_m + "'").ToString(); - if ((State == "101") || (State == "201") || (State == "202") || (State == "309")) + if ((State == "101") || (State == "201") || (State == "202") || (State == "309") || (State == "802")) { DataTable dataTable = WorkOrderdata.Clone(); // WorkOrderdata.Columns.Remove("Machines"); @@ -352,55 +392,64 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel dataTable.Rows.Add(dt_temp.ItemArray); int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderdata_m + "'").ToString()); + string dat = "SC810[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + + DataTableToDictionary(dataTable).ToJsonString(); if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT1") - { - stringQueueSerial_1.Enqueue(new QueueSerial + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC810[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(dataTable).ToJsonString() - }); + stringQueueSerial_1.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT2") - { - stringQueueSerial_2.Enqueue(new QueueSerial + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_2.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC810[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(dataTable).ToJsonString() - }); + stringQueueSerial_2.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3") - { - stringQueueSerial_3.Enqueue(new QueueSerial + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC810[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(dataTable).ToJsonString() - }); + stringQueueSerial_3.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT4") - { - stringQueueSerial_4.Enqueue(new QueueSerial + { // 检查队列中是否已存在相同项 + bool exists = stringQueueSerial_4.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC810[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(dataTable).ToJsonString() - }); + stringQueueSerial_4.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } - - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 110 } }, - "WorkOrder ='" + WorkOrderdata.Select()[k].Field("WorkOrder").ToString() + "'", null); } } + SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 110 } }, + "WorkOrder ='" + WorkOrderdata.Select()[k].Field("WorkOrder").ToString() + "'", null); } } /*下传工单设置*/ - DataTable WorkOrderset_ = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='113'or State='114') AND EndTime >'" + + DataTable WorkOrderset_ = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where (State='113' OR State='114') AND StartTime >'" + DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存 for (int k = 0; k < WorkOrderset_.Rows.Count; k++) { @@ -423,10 +472,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel ID = index, DAT = "SC812" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + DataTableToDictionary(WorkOrder_set).ToJsonString() }); - } - - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 114 } }, - "WorkOrder ='" + WorkOrderset_.Select()[k].Field("WorkOrder").ToString() + "'", null); + } } else {//串口 @@ -438,50 +484,60 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel if (WorkOrder_set.Rows.Count > 0) { int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderset_m + "'").ToString()); + string dat = "SC812[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + + DataTableToDictionary(WorkOrder_set).ToJsonString(); if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderset_m + "'").ToString() == "PORT1") { - stringQueueSerial_1.Enqueue(new QueueSerial + bool exists = stringQueueSerial_1.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC812[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(WorkOrder_set).ToJsonString() - }); + stringQueueSerial_1.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderset_m + "'").ToString() == "PORT2") { - stringQueueSerial_2.Enqueue(new QueueSerial + bool exists = stringQueueSerial_2.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC812[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(WorkOrder_set).ToJsonString() - }); + stringQueueSerial_2.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderset_m + "'").ToString() == "PORT3") { - stringQueueSerial_3.Enqueue(new QueueSerial + bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC812[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(WorkOrder_set).ToJsonString() - }); + stringQueueSerial_3.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderset_m + "'").ToString() == "PORT4") { - stringQueueSerial_4.Enqueue(new QueueSerial + bool exists = stringQueueSerial_4.Any(item => item.ID == index && item.DAT == dat); + if (!exists) { - ID = index, - DAT = "SC812[" + - Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + - DataTableToDictionary(WorkOrder_set).ToJsonString() - }); + stringQueueSerial_4.Enqueue(new QueueSerial + { + ID = index, + DAT = dat + }); + } } - } - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 110 } }, - "WorkOrder ='" + WorkOrderdata.Select()[k].Field("WorkOrder").ToString() + "'", null); + } } + SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 114 } }, + "WorkOrder ='" + WorkOrderset_.Select()[k].Field("WorkOrder").ToString() + "'", null); } } @@ -814,7 +870,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel else { Time30++; } } async void Tick_Event_5S()//Tick_Event周期执行事件5S - { + { try {//处理呼叫请求列表完成发送后(202》203） if (Dyelot_CALL.Select("State='202'").Count() > 0) @@ -1094,6 +1150,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } catch (Exception EX) { LogGing.ERRDATA(EX); } + /**染机呼叫完成**/ try {//301列表发送完成至染机（203=>301） foreach (DataRow row in Dyelot_CALL.Select("State='301' OR State='309'"))