sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sc/DyeingComputer:37723963cebb918c4ed9e3250f0abeef0e9ff519
sc/DyeingComputer:master
...
compare: sc/DyeingComputer:master
sc/DyeingComputer:master
6 Commits
37723963ce ... master
Author SHA1 Message Date
sc 5aee8ae1b8 Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer 2025-10-08 23:20:43 +08:00
sc dfa9a53ab1 修改数据库 2025-10-08 23:20:42 +08:00
sc 781155370f Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer 2025-10-08 23:12:09 +08:00
sc dd7bf1b4d1 Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer 2025-10-08 23:12:07 +08:00
sc b3fe0f2dd1 Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer 2025-10-08 22:48:36 +08:00
sc 42d728b2ca 810,811,812指令逻辑修改 2025-10-08 22:48:34 +08:00
4 changed files with 17 additions and 11 deletions
Expand all files Collapse all files

No files matched your search

DATA/800COMPUTER.db
BIN
View File
Binary file not shown.
DATA/Chart.db
BIN
View File
Binary file not shown.
DATA/LOG.db
BIN
View File
Binary file not shown.
UserClass/AsyncTcpServer.cs
+17 -11
View File
@@ -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);//记录指令
@@ -174,8 +176,12 @@ namespace DyeingComputer.UserClass
Dictionary<string, object> WorkOrder_dat; Dictionary<string, object> WorkOrder_dat;
WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT); WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
MainWindow.SQLiteHelpers.InsertData("WorkorderSet", WorkOrder_dat);//行插入 MainWindow.SQLiteHelpers.InsertData("WorkorderSet", WorkOrder_dat);//行插入
client.SendAsync("SC812" + "[" + MainWindowViewModel.S01 + "]" +
WorkOrder_dat.GetValue("WorkOrder").ToString()); 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());
client.SendAsync("SC812" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
MainWindowViewModel.TX++; MainWindowViewModel.TX++;
APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令 APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
} }