810,811,812指令逻辑修改
This commit is contained in:
commit
42d728b2ca
1 file changed
+11
-9
@@ -113,16 +113,17 @@ namespace DyeingComputer.UserClass
|
|||||||
//WorkOrder_dat.GetValue("WorkOrder");
|
//WorkOrder_dat.GetValue("WorkOrder");
|
||||||
|
|
||||||
object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = " + WorkOrder_dat.GetValue("WorkOrder").ToString(), null);
|
object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = " + WorkOrder_dat.GetValue("WorkOrder").ToString(), null);
|
||||||
|
Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
|
||||||
|
Step_new.Add("WorkOrder", WorkOrder_dat.GetValue("WorkOrder").ToString());
|
||||||
|
Step_new.Add("ReDye", WorkOrder_dat.GetValue("ReDye").ToString());
|
||||||
if (i != null)
|
if (i != null)
|
||||||
{
|
{
|
||||||
client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" +
|
client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
|
||||||
WorkOrder_dat.GetValue("WorkOrder").ToString());
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" +
|
client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
|
||||||
WorkOrder_dat.GetValue("WorkOrder").ToString()); MainWindowViewModel.TX++;
|
MainWindowViewModel.TX++;
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat);
|
MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat);
|
||||||
@@ -145,15 +146,16 @@ namespace DyeingComputer.UserClass
|
|||||||
DataTable WorkOrder_dat;
|
DataTable WorkOrder_dat;
|
||||||
WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<DataTable>(SYSDAT);
|
WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<DataTable>(SYSDAT);
|
||||||
bool dat_w = SQLDATA.WorkOderStep(WorkOrder_dat);
|
bool dat_w = SQLDATA.WorkOderStep(WorkOrder_dat);
|
||||||
|
Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
|
||||||
|
Step_new.Add("WorkOrder", WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
|
||||||
|
Step_new.Add("ReDye", WorkOrder_dat.Select().First().Field<object>("ReDye"));
|
||||||
if (!dat_w)
|
if (!dat_w)
|
||||||
{
|
{
|
||||||
client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" +
|
client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
|
||||||
WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" +
|
client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
|
||||||
WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
|
|
||||||
MainWindowViewModel.TX++;
|
MainWindowViewModel.TX++;
|
||||||
}
|
}
|
||||||
APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
|
APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
|
||||||
|
|||||||
Reference in new issue
Block a user