Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

View/TechnologicalProcessView.xaml.cs

@@ -77,25 +77,21 @@ namespace DyeingComputer.View
             newRow["Value"] = MainWindowViewModel.Selet_dtm("1020");
             newRow["ID"] = "1020";
             tblDatas.Rows.Add(newRow);
-
             newRow = tblDatas.NewRow();
             newRow["ParameterSet"] = Properties.Resources.Blower + " (%)";//风机速度
             newRow["Value"] = MainWindowViewModel.Selet_dtm("1021");
             newRow["ID"] = "1021";
             tblDatas.Rows.Add(newRow);
-
             newRow = tblDatas.NewRow();
             newRow["ParameterSet"] = Properties.Resources.Blower + " (%)";//摆布速度
             newRow["Value"] = MainWindowViewModel.Selet_dtm("1041");
             newRow["ID"] = "1041";
             tblDatas.Rows.Add(newRow);
-
             newRow = tblDatas.NewRow();
             newRow["ParameterSet"] = Properties.Resources.ClothWheel + " (M/min)";//布轮速度
-            newRow["Value"] = MainWindowViewModel.Selet_dtm("1021");
-            newRow["ID"] = "1021";
+            newRow["Value"] = MainWindowViewModel.Selet_dtm("1025");
+            newRow["ID"] = "1025";
             tblDatas.Rows.Add(newRow);
-
             newRow = tblDatas.NewRow();
             newRow["ParameterSet"] = Properties.Resources.ClothWheel + "1 (M/min)";//提不论速度
             newRow["Value"] = MainWindowViewModel.Selet_dtm("1025");
@@ -136,57 +132,57 @@ namespace DyeingComputer.View
             if (MainWindowViewModel.MT18 >= 6)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "6 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1035");
+                newRow["ID"] = "1035";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 7)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "7 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1037");
+                newRow["ID"] = "1037";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 8)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "8 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1039");
+                newRow["ID"] = "1039";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 9)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "9 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1053");
+                newRow["ID"] = "1053";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 10)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "10 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1055");
+                newRow["ID"] = "1055";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 11)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "11 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1057");
+                newRow["ID"] = "1057";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 12)
             {
                 newRow = tblDatas.NewRow();
-                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
-                newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
-                newRow["ID"] = "1026";
+                newRow["ParameterSet"] = Properties.Resources.ClothWheel + "12 (M/min)";//提不论速度
+                newRow["Value"] = MainWindowViewModel.Selet_dtm("1059");
+                newRow["ID"] = "1059";
                 tblDatas.Rows.Add(newRow);
             }