添加参数信息传入
This commit is contained in:
commit
a689ff0ad0
3 files changed
+12
-4
No files matched your search
@@ -229,8 +229,10 @@ namespace DyeingComputer.UserClass
|
|||||||
dat_821 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
|
dat_821 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
|
||||||
if (dat_821.GetValue("INSTRUCTION").ToString() == "START")
|
if (dat_821.GetValue("INSTRUCTION").ToString() == "START")
|
||||||
{
|
{
|
||||||
SQLDATA.TechnologicalProcess_START(dat_821.GetValue("ProgramID").ToString());
|
MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" +
|
||||||
|
dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0];
|
||||||
|
MainWindowViewModel.DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" +
|
||||||
|
dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0];
|
||||||
client.SendAsync("SC821" + SYSKEY + SYSDAT);
|
client.SendAsync("SC821" + SYSKEY + SYSDAT);
|
||||||
}
|
}
|
||||||
else if (dat_821.GetValue("INSTRUCTION").ToString() == "STOP")
|
else if (dat_821.GetValue("INSTRUCTION").ToString() == "STOP")
|
||||||
|
|||||||
@@ -400,8 +400,10 @@ namespace DyeingComputer.View
|
|||||||
updata_temp.Clear(); //使用前清缓存
|
updata_temp.Clear(); //使用前清缓存
|
||||||
updata_temp.Add("State", 205);
|
updata_temp.Add("State", 205);
|
||||||
MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null);
|
MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null);
|
||||||
MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot = '" +
|
MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" +
|
||||||
Dyelot + "'", null).Tables[0];
|
WorkOrder_Numder + "'", null).Tables[0];
|
||||||
|
MainWindowViewModel.DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" +
|
||||||
|
WorkOrder_Numder + "'", null).Tables[0];
|
||||||
WorkorderSteps = MainWindow.SQLiteHelpers.ExecuteDataSet(
|
WorkorderSteps = MainWindow.SQLiteHelpers.ExecuteDataSet(
|
||||||
"select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'", null).Tables[0]; //读取表写入缓存
|
"select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'", null).Tables[0]; //读取表写入缓存
|
||||||
MainWindowViewModel.ProgramName = Process_Name;
|
MainWindowViewModel.ProgramName = Process_Name;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ using System.Collections.Generic;
|
|||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
using System.Data.Entity;
|
||||||
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
|
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
|
||||||
using System.Diagnostics.Eventing.Reader;
|
using System.Diagnostics.Eventing.Reader;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
@@ -80,6 +81,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
private PID pid = new PID();
|
private PID pid = new PID();
|
||||||
public static DataTable errTabler = new DataTable();//错误表
|
public static DataTable errTabler = new DataTable();//错误表
|
||||||
// public static DataTable RUN_DATATABLE = new DataTable();//缓存工作表
|
// public static DataTable RUN_DATATABLE = new DataTable();//缓存工作表
|
||||||
|
public static DataTable DT_Set = new DataTable();//cssd
|
||||||
public static DataTable Dyelot_dat = new DataTable();//物料表
|
public static DataTable Dyelot_dat = new DataTable();//物料表
|
||||||
public static string Dyelot; //领料单号
|
public static string Dyelot; //领料单号
|
||||||
public static int RUN_STEPID;//当前步骤
|
public static int RUN_STEPID;//当前步骤
|
||||||
@@ -242,6 +244,8 @@ namespace DyeingComputer.ViewModel
|
|||||||
WORK_RUN = 2;
|
WORK_RUN = 2;
|
||||||
//SQLiteHelpers = new SQLiteHelper(DBAddress);
|
//SQLiteHelpers = new SQLiteHelper(DBAddress);
|
||||||
//SQLiteHelpers.Open();
|
//SQLiteHelpers.Open();
|
||||||
|
DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" +
|
||||||
|
drEmployee.Field<string>("WorkOrder") + "'", null).Tables[0];
|
||||||
Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" +
|
Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" +
|
||||||
drEmployee.Field<string>("WorkOrder") + "'", null).Tables[0];
|
drEmployee.Field<string>("WorkOrder") + "'", null).Tables[0];
|
||||||
//SQLiteHelpers.Close();
|
//SQLiteHelpers.Close();
|
||||||
|
|||||||
Reference in new issue
Block a user