Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
8091b3dcc4
5 files changed
+171
-75
No files matched your search
@@ -208,7 +208,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
||||
}
|
||||
void Tick_Main_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
|
||||
{
|
||||
int mid;
|
||||
/*下传工单信息*/
|
||||
SQLiteHelper WorkOrderSQL = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||
WorkOrderSQL.Open(); //打开数据库
|
||||
@@ -266,11 +265,34 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
||||
"WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
|
||||
}
|
||||
}
|
||||
/*下传工单设置*/
|
||||
DataTable WorkOrderset_ = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where State='113'"+
|
||||
"AND EndTime >'" + DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存
|
||||
for (int k = 0; k < WorkOrderset_.Rows.Count; k++)
|
||||
{
|
||||
string WorkOrderset_m = WorkOrderset_.Select()[k].Field<object>("Machines").ToString();
|
||||
string WorkOrderset_w = WorkOrderset_.Select()[k].Field<object>("WorkOrder").ToString();
|
||||
int index = Convert.ToInt16(Selet_Machines(Machines, "ID", "Name='" + WorkOrderset_m + "'").ToString());
|
||||
|
||||
DataTable WorkOrder_set = WorkOrderSQL.ExecuteDataSet("select * from WorkOrderSet where WorkOrder='" +
|
||||
WorkOrderset_w + "'", null).Tables[0]; //读取表写入缓存
|
||||
if (WorkOrder_set.Rows.Count > 0)
|
||||
{
|
||||
stringQueue.Enqueue(new QueueString
|
||||
{
|
||||
ID = index,
|
||||
DAT = "SC812" + Selet_Machines(Machines, "SYSKEY", "ID='" + index + "'") + DataTableToDictionary(WorkOrder_set).ToJsonString()
|
||||
});
|
||||
}
|
||||
|
||||
WorkOrderSQL.Update("WorkOrder", new Dictionary<string, object> { { "State", 110 } },
|
||||
"WorkOrder ='" + WorkOrderdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
|
||||
}
|
||||
WorkOrderSQL.Close();
|
||||
|
||||
//系统时间
|
||||
Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
|
||||
//更新机台状态与发送指令
|
||||
//更新机台状态与发送指令
|
||||
for (int i = 0; i < Machinesdata_Count; i++)
|
||||
{
|
||||
if (Selet_Machines(Machines, "State", "ID='" + i + "'").ToString() == "802")
|
||||
@@ -299,9 +321,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
||||
|
||||
Updata_Machines(Machines, "State", "ID='" + i + "'", "101");
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < Machinesdata_Count; i++)
|
||||
{
|
||||
int m_run = (int)Selet_Machines(Machines, "WORK_RUN", "ID='" + i + "'");
|
||||
if (m_run==0)
|
||||
{
|
||||
@@ -665,6 +684,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
||||
dataRow["ERR"] = false;
|
||||
dataRow["LOCK"] = false;
|
||||
dataRow["AUTO"] = false;
|
||||
dataRow["CALL"] = false;
|
||||
dataRow["UserInfoStart"] = 900;
|
||||
dataRow.EndEdit();
|
||||
dataRow.AcceptChanges();
|
||||
|
||||
Reference in new issue
Block a user