sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

Browse Source
This commit is contained in:
sc committed 2025-10-15 22:14:26 +08:00
2 parents 751a2b092f 8a5e0ecfd9
commit abfcf6e36a
2 files changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserClass/AsyncSerialPortClient.cs
+1 -1
View File
@@ -115,7 +115,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
Dictionary<string, object> _dat; Dictionary<string, object> _dat;
_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT); _dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(DAT);
MainWindowViewModel.SQLiteHelpers.Update("WorkorderSteps", new Dictionary<string, object> { { "Mode", 1 } }, MainWindowViewModel.SQLiteHelpers.Update("WorkorderSteps", new Dictionary<string, object> { { "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); _dat.GetValue("Step") + "'", null);
int x = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='"+ int x = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps where WorkOrder='"+
ViewModel/MainWindowViewModel.cs
+1 -2
View File
@@ -254,11 +254,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
foreach (DataRow dataRow in dataTable.Select("Mode<>'1'")) foreach (DataRow dataRow in dataTable.Select("Mode<>'1'"))
{ {
Dictionary<string, object> dat_ = new Dictionary<string, object>(); Dictionary<string, object> dat_ = new Dictionary<string, object>();
dat_.Add("Order", dataRow["WorkOrder"].ToString()); dat_.Add("Work", dataRow["WorkOrder"].ToString());
dat_.Add("Dye", dataRow["DYELOT"].ToString()); dat_.Add("Dye", dataRow["DYELOT"].ToString());
dat_.Add("Time", dataRow["StepTime"].ToString()); dat_.Add("Time", dataRow["StepTime"].ToString());
dat_.Add("ReDye", dataRow["ReDye"].ToString()); dat_.Add("ReDye", dataRow["ReDye"].ToString());
dat_.Add("Program", dataRow["Program"].ToString());
dat_.Add("Step", dataRow["Step"].ToString()); dat_.Add("Step", dataRow["Step"].ToString());
dat_.Add("StepID", dataRow["StepID"].ToString()); dat_.Add("StepID", dataRow["StepID"].ToString());
dat_.Add("P1", dataRow["Parameter1"].ToString()); dat_.Add("P1", dataRow["Parameter1"].ToString());