diff --git a/UserClass/AsyncSerialPortClient.cs b/UserClass/AsyncSerialPortClient.cs index 3bd151a..8431047 100644 --- a/UserClass/AsyncSerialPortClient.cs +++ b/UserClass/AsyncSerialPortClient.cs @@ -135,7 +135,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass Dictionary _dat; _dat = SerializeConvert.JsonDeserializeFromString>(DAT); MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 101 } }, - "WorkOrder ='" + _dat.GetValue("WorkOrder") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null); + "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "'", null); } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } }//回复的工单设置状态后就位101 diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index d2ce3e9..4a192e7 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -313,7 +313,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel 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); @@ -336,11 +337,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel ID = index, DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString() }); - } } + } + } } } - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 112 } }, + if (WorkOrderstepdata.Select()[k].Field("State").ToString() == "111") + { + SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 112 } }, "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "'", null); + } } } /*下传工单总览*/ @@ -448,8 +453,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } } - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 110 } }, + if (WorkOrderdata.Select()[k].Field("State").ToString() == "110") + { + SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 110 } }, "WorkOrder ='" + WorkOrderdata.Select()[k].Field("WorkOrder").ToString() + "'", null); + } } } /*下传工单设置*/ @@ -476,7 +484,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel ID = index, DAT = "SC812" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + DataTableToDictionary(WorkOrder_set).ToJsonString() }); - } + } } else {//串口 @@ -538,10 +546,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel }); } } - } + } + } + if (WorkOrderset_.Select()[k].Field("State").ToString() == "113") + { + SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 114 } }, + "WorkOrder ='" + WorkOrderset_.Select()[k].Field("WorkOrder").ToString() + "'", null); } - SQLiteHelpers.Update("WorkOrder", new Dictionary { { "State", 114 } }, - "WorkOrder ='" + WorkOrderset_.Select()[k].Field("WorkOrder").ToString() + "'", null); } }