diff --git a/UserClass/AsyncSerialPortClient.cs b/UserClass/AsyncSerialPortClient.cs index 706db66..a6b7bb6 100644 --- a/UserClass/AsyncSerialPortClient.cs +++ b/UserClass/AsyncSerialPortClient.cs @@ -115,7 +115,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass 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 ='" + + "WorkOrder ='" + _dat.GetValue("Work") + "' AND ReDye ='" + _dat.GetValue("ReDye") + "' AND Step ='" + _dat.GetValue("Step") + "'", null); int x = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='"+ diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index e5201d9..d6fdc3e 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -254,11 +254,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel foreach (DataRow dataRow in dataTable.Select("Mode<>'1'")) { Dictionary dat_ = new Dictionary(); - dat_.Add("Order", dataRow["WorkOrder"].ToString()); + dat_.Add("Work", 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());