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

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

master
sc 1 month ago
parent
b062420be1 a248c41163
commit
68b98ac7e4
2 changed files with 20 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      UserClass/AsyncSerialPortClient.cs
  2. 27
      ViewModel/MainWindowViewModel.cs

2
UserClass/AsyncSerialPortClient.cs
View File

@ -135,7 +135,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("WorkOrder", new Dictionary<string, object> { { "State", 101 } }, MainWindowViewModel.SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "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++; } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
}//回复的工单设置状态后就位101 }//回复的工单设置状态后就位101

27
ViewModel/MainWindowViewModel.cs
View File

@ -313,7 +313,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
ID = index, ID = index,
DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString() DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString()
}); });
} } }
}
else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3") else if (Selet_Machines(Machines, "Serial", "Name='" + WorkOrderdata_m + "'").ToString() == "PORT3")
{ // 检查队列中是否已存在相同项 { // 检查队列中是否已存在相同项
bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat); bool exists = stringQueueSerial_3.Any(item => item.ID == index && item.DAT == dat);
@ -336,11 +337,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
ID = index, ID = index,
DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString() DAT = "SC811[" + Selet_Machines(Machines, "Station", "ID='" + index + "'") + "]" + dat_.ToJsonString()
}); });
} } }
}
} }
} }
SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 112 } }, if (WorkOrderstepdata.Select()[k].Field<object>("State").ToString() == "111")
{
SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 112 } },
"WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null); "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
}
} }
} }
/*下传工单总览*/ /*下传工单总览*/
@ -448,8 +453,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
} }
} }
} }
SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 110 } }, if (WorkOrderdata.Select()[k].Field<object>("State").ToString() == "110")
{
SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 110 } },
"WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null); "WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
}
} }
} }
/*下传工单设置*/ /*下传工单设置*/
@ -476,7 +484,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
ID = index, ID = index,
DAT = "SC812" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + DataTableToDictionary(WorkOrder_set).ToJsonString() DAT = "SC812" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + DataTableToDictionary(WorkOrder_set).ToJsonString()
}); });
} }
} }
else else
{//串口 {//串口
@ -538,10 +546,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
}); });
} }
} }
} }
}
if (WorkOrderset_.Select()[k].Field<object>("State").ToString() == "113")
{
SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 114 } },
"WorkOrder ='" + WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
} }
SQLiteHelpers.Update("WorkOrder", new Dictionary<string, object> { { "State", 114 } },
"WorkOrder ='" + WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
} }
} }

Write Preview
Loading…
Cancel
Save