下传工单逻辑调整
This commit is contained in:
commit
7242195f45
2 files changed
+6
-4
No files matched your search
@@ -153,7 +153,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
MessageBoxResult vr = System.Windows.MessageBox.Show(Properties.Resources.Delete + comboBoxMachine.Text, "SCCM", MessageBoxButton.OKCancel, MessageBoxImage.Question);
|
MessageBoxResult vr = System.Windows.MessageBox.Show(Properties.Resources.Delete + comboBoxMachine.Text, "SCCM", MessageBoxButton.OKCancel, MessageBoxImage.Question);
|
||||||
if (vr == MessageBoxResult.OK) // 如果是确定,就执行下面代码
|
if (vr == MessageBoxResult.OK) // 如果是确定,就执行下面代码
|
||||||
{
|
{
|
||||||
MainWindowViewModel.Machines.Rows.RemoveAt(ID_);
|
MainWindowViewModel.Machines.Rows.RemoveAt(ID_-1);
|
||||||
DatSteps(MainWindowViewModel.Machines);
|
DatSteps(MainWindowViewModel.Machines);
|
||||||
|
|
||||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||||
@@ -196,7 +196,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
{
|
{
|
||||||
DataRow dr = db.Rows[i];
|
DataRow dr = db.Rows[i];
|
||||||
dr.BeginEdit();
|
dr.BeginEdit();
|
||||||
dr["ID"] = i + 1;
|
dr["ID"] = i ;
|
||||||
dr.EndEdit();
|
dr.EndEdit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -180,7 +180,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
|||||||
//下传工单信息
|
//下传工单信息
|
||||||
SQLiteHelper WorkOrderSQL = new SQLiteHelper(DBAddress); //数据库连接路径
|
SQLiteHelper WorkOrderSQL = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||||
WorkOrderSQL.Open(); //打开数据库
|
WorkOrderSQL.Open(); //打开数据库
|
||||||
DataTable WorkOrderstepdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where State='111'", null).Tables[0]; //读取表写入缓存
|
DataTable WorkOrderstepdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where State='111'" +
|
||||||
|
"AND EndTime >'" + 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();
|
||||||
@@ -196,7 +197,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
|||||||
"WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
|
"WorkOrder ='" + WorkOrderstepdata.Select()[k].Field<object>("WorkOrder").ToString() + "'", null);
|
||||||
}
|
}
|
||||||
//下传工单总览
|
//下传工单总览
|
||||||
DataTable WorkOrderdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where State='100'", null).Tables[0]; //读取表写入缓存
|
DataTable WorkOrderdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where State='100' " +
|
||||||
|
"AND EndTime >'" + DateTime.Now.AddHours(-8).ToString("yyyy/MM/dd HH:mm:ss") + "'", null).Tables[0]; //读取表写入缓存
|
||||||
for (int k = 0; k < WorkOrderdata.Rows.Count; k++)
|
for (int k = 0; k < WorkOrderdata.Rows.Count; k++)
|
||||||
{
|
{
|
||||||
string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString();
|
string WorkOrderdata_m = WorkOrderdata.Select()[k].Field<object>("Machines").ToString();
|
||||||
|
|||||||
Reference in new issue
Block a user