810,811,812指令逻辑修改

This commit is contained in:
sc committed 2025-10-08 22:48:34 +08:00
commit 42d728b2ca
1 file changed
+11 -9
+11 -9
View File
@@ -113,16 +113,17 @@ namespace DyeingComputer.UserClass
//WorkOrder_dat.GetValue("WorkOrder");
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)
{
client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" +
WorkOrder_dat.GetValue("WorkOrder").ToString());
client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
}
else
{
client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" +
WorkOrder_dat.GetValue("WorkOrder").ToString()); MainWindowViewModel.TX++;
client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
MainWindowViewModel.TX++;
}
MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat);
@@ -145,15 +146,16 @@ namespace DyeingComputer.UserClass
DataTable WorkOrder_dat;
WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<DataTable>(SYSDAT);
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)
{
client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" +
WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
}
else
{
client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" +
WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
MainWindowViewModel.TX++;
}
APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令