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
6120fe283a cedd2c189b
commit
22c061db9e
1 changed files with 34 additions and 36 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. 70
      ViewModel/MainWindowViewModel.cs

70
ViewModel/MainWindowViewModel.cs
View File

@ -363,7 +363,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
DataTable WorkOrderstepdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where (State='111' or State='112') AND EndTime >'" + DataTable WorkOrderstepdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where (State='111' or State='112') AND EndTime >'" +
DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存 DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存
for (int k = 0; k < WorkOrderstepdata.Rows.Count; k++) for (int k = 0; k < WorkOrderstepdata.Rows.Count; k++)
{ {//网络
string WorkOrderdata_m = WorkOrderstepdata.Select()[k].Field<object>("Machines").ToString(); string WorkOrderdata_m = WorkOrderstepdata.Select()[k].Field<object>("Machines").ToString();
//string m= WorkOrderstepdata.Rows[k].Field<string>("Machines"); //string m= WorkOrderstepdata.Rows[k].Field<string>("Machines");
if (Convert.ToBoolean(Selet_Machines(Machines, "Type", "Name='" + WorkOrderdata_m + "'"))) if (Convert.ToBoolean(Selet_Machines(Machines, "Type", "Name='" + WorkOrderdata_m + "'")))
@ -381,7 +381,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
"WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null); "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
} }
else else
{ {//串口
} }
} }
@ -393,7 +393,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString(); string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString();
//string m = WorkOrderdata.Rows[k].Field<string>("Machines"); //string m = WorkOrderdata.Rows[k].Field<string>("Machines");
if (Convert.ToBoolean( Selet_Machines(Machines, "Type", "Name='" + WorkOrderdata_m + "'"))) if (Convert.ToBoolean( Selet_Machines(Machines, "Type", "Name='" + WorkOrderdata_m + "'")))
{ {//网络
//string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString(); //string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString();
string State = Selet_Machines(Machines, "State", "Name='" + WorkOrderdata_m + "'").ToString(); string State = Selet_Machines(Machines, "State", "Name='" + WorkOrderdata_m + "'").ToString();
@ -418,7 +418,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
} }
} }
else else
{ {//串口
//string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString(); //string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString();
string State = Selet_Machines(Machines, "State", "Name='" + WorkOrderdata_m + "'").ToString(); string State = Selet_Machines(Machines, "State", "Name='" + WorkOrderdata_m + "'").ToString();
string POR = Selet_Machines(Machines, "Serial", "ID='" + k + "'").ToString(); string POR = Selet_Machines(Machines, "Serial", "ID='" + k + "'").ToString();
@ -452,7 +452,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString(); string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString();
//string m = WorkOrderset_.Rows[k].Field<string>("Machines"); //string m = WorkOrderset_.Rows[k].Field<string>("Machines");
if (Convert.ToBoolean(Selet_Machines(Machines, "Type", "Name='" + WorkOrderset_m + "'"))) if (Convert.ToBoolean(Selet_Machines(Machines, "Type", "Name='" + WorkOrderset_m + "'")))
{ {//网络
//string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString(); //string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString();
string WorkOrderset_w = WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString(); string WorkOrderset_w = WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString();
int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderset_m + "'").ToString()); int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderset_m + "'").ToString());
@ -472,7 +472,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
"WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null); "WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
} }
else else
{ {//串口
//string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString(); //string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString();
string WorkOrderset_w = WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString(); string WorkOrderset_w = WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString();
string POR = Selet_Machines(Machines, "Serial", "ID='" + k + "'").ToString(); string POR = Selet_Machines(Machines, "Serial", "ID='" + k + "'").ToString();
@ -669,7 +669,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
if (Convert.ToBoolean(MachinesRow["CALL"])) if (Convert.ToBoolean(MachinesRow["CALL"]))
{ {
if (Convert.ToBoolean(MachinesRow["Type"])) if (Convert.ToBoolean(MachinesRow["Type"]))
{ {//网络
stringQueue.Enqueue(new QueueString stringQueue.Enqueue(new QueueString
{ {
ID = Convert.ToInt16(MachinesRow["ID"]), ID = Convert.ToInt16(MachinesRow["ID"]),
@ -677,13 +677,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
}); });
} }
else else
{ {//串口
string POR = MachinesRow["Serial"].ToString(); string POR = MachinesRow["Serial"].ToString();
stringQueueSerial.Enqueue(new QueueSerial stringQueueSerial.Enqueue(new QueueSerial
{ {
ID = POR, ID = POR,
DAT = "SC827[" + MachinesRow["Station"] DAT = "SC827[" + MachinesRow["Station"]+"]"
}); });
} }
@ -780,13 +780,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
Row["DispenseEndTime"] = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); Row["DispenseEndTime"] = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
Row.EndEdit(); Row.EndEdit();
} }
// MainWindow.InfData.Rows.Add(new object[] { dataRow["Machine"],
// Resources.Dyelot + dataRow["Dyelot"] + Resources.Step + dataRow["Step"]+
// Resources.DispenseException,
// Selet_Machines(Machines, "SYSKEY", "Name='" + dataRow["Machine"] + "'"),
// Selet_Machines(Machines, "ID", "Name='" + dataRow["Machine"] + "'")});
} }
} }
} }
@ -798,7 +791,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
{ {
if (dt.Select("PowderState = 301").Count() > 0) if (dt.Select("PowderState = 301").Count() > 0)
{ {
// Dyelot_CALL.Rows.Remove(dataRow);
DataTable dr = await bDCSqlHelper.SELECT("DyelotsBulkedRecipe", DataTable dr = await bDCSqlHelper.SELECT("DyelotsBulkedRecipe",
"Dyelot = '" + dataRow.Field<string>("Dyelot") + "Dyelot = '" + dataRow.Field<string>("Dyelot") +
"' AND ReDye = " + dataRow.Field<int>("ReDye") + "' AND ReDye = " + dataRow.Field<int>("ReDye") +
@ -849,7 +841,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
{ {
if (dt.Select("ChemicalState = 301").Count() > 0) if (dt.Select("ChemicalState = 301").Count() > 0)
{ {
// Dyelot_CALL.Rows.Remove(dataRow);
DataTable dr = await bDCSqlHelper.SELECT("DyelotsBulkedRecipe", DataTable dr = await bDCSqlHelper.SELECT("DyelotsBulkedRecipe",
"Dyelot = '" + dataRow.Field<string>("Dyelot") + "Dyelot = '" + dataRow.Field<string>("Dyelot") +
"' AND ReDye = " + dataRow.Field<int>("ReDye") + "' AND ReDye = " + dataRow.Field<int>("ReDye") +
@ -902,29 +893,36 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
{//301列表发送完成至染机（203=>301） {//301列表发送完成至染机（203=>301）
foreach (DataRow row in Dyelot_CALL.Select("State='301' OR State='309'")) foreach (DataRow row in Dyelot_CALL.Select("State='301' OR State='309'"))
{ {
Dictionary<string, object> Product_ = new Dictionary<string, object>();//缓存函数 if (Convert.ToBoolean(MachinesRow["Type"]))
Product_.Add("State", row.Field<int>("State")); {//网络
Product_.Add("Step", row.Field<int>("Step")); Dictionary<string, object> Product_ = new Dictionary<string, object>();//缓存函数
Product_.Add("Dyelot", row.Field<string>("Dyelot")); Product_.Add("State", row.Field<int>("State"));
Product_.Add("ProductCode", row.Field<string>("ProductCode")); Product_.Add("Step", row.Field<int>("Step"));
Product_.Add("Amount", row.Field<object>("Amount")); Product_.Add("Dyelot", row.Field<string>("Dyelot"));
Product_.Add("DispenseEndTime", row.Field<object>("DispenseEndTime")); Product_.Add("ProductCode", row.Field<string>("ProductCode"));
Product_.Add("Amount", row.Field<object>("Amount"));
Product_.Add("DispenseEndTime", row.Field<object>("DispenseEndTime"));
stringQueue.Enqueue(new QueueString stringQueue.Enqueue(new QueueString
{ {
ID = Convert.ToInt16(Selet_Machines(Machines, ID = Convert.ToInt16(Selet_Machines(Machines,
"ID", "Name='" + row.Field<string>("Machine") + "'")), "ID", "Name='" + row.Field<string>("Machine") + "'")),
DAT = "SC828" + Selet_Machines(Machines, DAT = "SC828" + Selet_Machines(Machines,
"SYSKEY", "Name='" + row.Field<string>("Machine") + "'") + Product_.ToJsonString() "SYSKEY", "Name='" + row.Field<string>("Machine") + "'") + Product_.ToJsonString()
}); });
if (row["State"].ToString() == "309") if (row["State"].ToString() == "309")
{ {
MainWindow.InfData.Rows.Add(new object[] { row["Machine"], MainWindow.InfData.Rows.Add(new object[] { row["Machine"],
Resources.Step + row["Step"]+ Resources.DispenseException, Resources.Step + row["Step"]+ Resources.DispenseException,
Selet_Machines(Machines, "SYSKEY", "Name='" + row["Machine"] + "'"), Selet_Machines(Machines, "SYSKEY", "Name='" + row["Machine"] + "'"),
Selet_Machines(Machines, "ID", "Name='" + row["Machine"] + "'")}); Selet_Machines(Machines, "ID", "Name='" + row["Machine"] + "'")});
}
Dyelot_CALL.Rows.Remove(row);
}
else
{//串口
} }
Dyelot_CALL.Rows.Remove(row);
} }
} }
catch (Exception EX) { LogGing.ERRDATA(EX); } catch (Exception EX) { LogGing.ERRDATA(EX); }

Write Preview
Loading…
Cancel
Save