diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 0779351..0dc8b19 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -171,6 +171,35 @@ namespace DyeingComputer.UserClass } else { client.SendAsync("SC999"); } }//WorkOrderstep表信息检查写入 + else if (SYSAPI == "SC812") + { + if (SYSKEY == MainWindowViewModel.SYSKEY) + { + try + { + DataTable WorkOrder_dat; + WorkOrder_dat = SerializeConvert.JsonDeserializeFromString(SYSDAT); + bool dat_w = SQLDATA.WorkOderStep(WorkOrder_dat); + if (!dat_w) + { + client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + + WorkOrder_dat.Select().First().Field("WorkOrder")); + } + else + { + client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + + WorkOrder_dat.Select().First().Field("WorkOrder")); + MainWindowViewModel.TX++; + } + APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令 + } + catch (Exception ex) + { + client.SendAsync("SC991" + "[" + MainWindowViewModel.S01 + "]" + ex); + } + } + else { client.SendAsync("SC999"); } + }//WorkOrderset表信息检查写入 else if (SYSAPI == "SC813") { if (SYSKEY == MainWindowViewModel.SYSKEY) diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index 1ead47b..375d50d 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -226,12 +226,12 @@ namespace DyeingComputer.View MainWindowViewModel.Updata_dtm("1028", Convert.ToDouble(newValue)); MainWindowViewModel.Updata_dtm("1029", Convert.ToDouble(newValue)); MainWindowViewModel.Updata_dtm("1035", Convert.ToDouble(newValue)); + MainWindowViewModel.Updata_dtm("1036", Convert.ToDouble(newValue)); MainWindowViewModel.Updata_dtm("1037", Convert.ToDouble(newValue)); + MainWindowViewModel.Updata_dtm("1038", Convert.ToDouble(newValue)); MainWindowViewModel.Updata_dtm("1039", Convert.ToDouble(newValue)); - MainWindowViewModel.Updata_dtm("1053", Convert.ToDouble(newValue)); - MainWindowViewModel.Updata_dtm("1055", Convert.ToDouble(newValue)); - MainWindowViewModel.Updata_dtm("1057", Convert.ToDouble(newValue)); - MainWindowViewModel.Updata_dtm("1059", Convert.ToDouble(newValue)); + MainWindowViewModel.Updata_dtm("1040", Convert.ToDouble(newValue)); + MainWindowViewModel.Updata_dtm("1041", Convert.ToDouble(newValue)); } else { diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index c4e30d0..749f377 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -1775,6 +1775,23 @@ namespace DyeingComputer.ViewModel case "055": if (Selet_dtm("1015") > MT41) { + if (Selet_dtm("1020") == 0) Updata_dtm("1020",Convert.ToInt16( Selet_con("MT48"))); + if (Selet_dtm("1021") == 0) Updata_dtm("1021", Convert.ToInt16(Selet_con("MT49"))); + if (Selet_dtm("1030") == 0) Updata_dtm("1030", Convert.ToInt16(Selet_con("MT50"))); + + if (Selet_dtm("1025") == 0) Updata_dtm("1025", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1026") == 0) Updata_dtm("1026", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1027") == 0) Updata_dtm("1027", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1028") == 0) Updata_dtm("1028", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1029") == 0) Updata_dtm("1029", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1035") == 0) Updata_dtm("1035", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1036") == 0) Updata_dtm("1036", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1037") == 0) Updata_dtm("1037", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1038") == 0) Updata_dtm("1038", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1039") == 0) Updata_dtm("1039", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1040") == 0) Updata_dtm("1040", Convert.ToInt16(Selet_con("MT51"))); + if (Selet_dtm("1041") == 0) Updata_dtm("1041", Convert.ToInt16(Selet_con("MT51"))); + Updata_dtd("3011", true);//主泵启动 if (S16 == 1) Updata_dtd("3012", true);//风机启动 STEP_TIME--; @@ -2427,9 +2444,10 @@ namespace DyeingComputer.ViewModel else if (WORK_RUN == 1) { Status_Str = Resources.Paused; - Updata_dtm("1004", 0); - Updata_dtd("3009", false); - Updata_dtd("3010", false); + for (int i = 4; i < 128; i++) + { + Updata_dtd((3000 + i).ToString(), false); + } } else if (WORK_RUN == 0) { @@ -3585,12 +3603,12 @@ namespace DyeingComputer.ViewModel Updata_dta("5012", Convert.ToInt16(Selet_dtm("1028"))); Updata_dta("5013", Convert.ToInt16(Selet_dtm("1029"))); Updata_dta("5014", Convert.ToInt16(Selet_dtm("1035"))); - Updata_dta("5015", Convert.ToInt16(Selet_dtm("1037"))); - Updata_dta("5016", Convert.ToInt16(Selet_dtm("1039"))); - Updata_dta("5017", Convert.ToInt16(Selet_dtm("1051"))); - Updata_dta("5018", Convert.ToInt16(Selet_dtm("1053"))); - Updata_dta("5019", Convert.ToInt16(Selet_dtm("1055"))); - Updata_dta("5020", Convert.ToInt16(Selet_dtm("1057"))); + Updata_dta("5015", Convert.ToInt16(Selet_dtm("1036"))); + Updata_dta("5016", Convert.ToInt16(Selet_dtm("1037"))); + Updata_dta("5017", Convert.ToInt16(Selet_dtm("1038"))); + Updata_dta("5018", Convert.ToInt16(Selet_dtm("1039"))); + Updata_dta("5019", Convert.ToInt16(Selet_dtm("1040"))); + Updata_dta("5020", Convert.ToInt16(Selet_dtm("1041"))); } private async void IO_data()//刷新 {