运行参数页面

View/TechnologicalProcessView.xaml

@@ -170,8 +170,8 @@
                 </DataGrid.CellStyle>
                 <DataGrid.Columns>
                     <!--列信息绑定-->
-                    <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Binding="{Binding ParameterSet}" Width="200" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Binding="{Binding ParameterSet}" Width="*" IsReadOnly="True"/>
-                    <DataGridTextColumn Header="{x:Static lang:Resources.Value}" Width="200" Binding="{Binding Value}"/>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.Value}" Width="*" Binding="{Binding Value}"/>
                     <DataGridTextColumn MaxWidth="0" Binding="{Binding ID}"/>
                 </DataGrid.Columns>
             </DataGrid>

View/TechnologicalProcessView.xaml.cs

@@ -9,6 +9,7 @@ using System.ComponentModel;
 using System.Data;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -67,22 +68,30 @@ namespace DyeingComputer.View
             //    ProgramgroupView_edit.IsEnabled = false;
             //    ProgramgroupView_del.IsEnabled = false;
             //    ProgramgroupView_Insert.IsEnabled = false;
-            tblDatas.Clear();
+          
             tblDatas.Columns.Add("ParameterSet", Type.GetType("System.String"));
             tblDatas.Columns.Add("Value", Type.GetType("System.Double"));
             tblDatas.Columns.Add("ID", Type.GetType("System.String"));
-
+;
+            ParameterSet_d();
+        }
+        private void ParameterSet_d()
+        {
+            tblDatas.Clear();
             DataRow newRow;
             newRow = tblDatas.NewRow();
-            newRow["ParameterSet"] = Properties.Resources.PumpSpeed +" (%)";//主泵速度
+            newRow["ParameterSet"] = Properties.Resources.PumpSpeed + " (%)";//主泵速度
             newRow["Value"] = MainWindowViewModel.Selet_dtm("1020");
             newRow["ID"] = "1020";
             tblDatas.Rows.Add(newRow);
+            if (MainWindowViewModel.MT17 == 1)
+            {
                 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.Swing + " (%)";//摆布速度
             newRow["Value"] = MainWindowViewModel.Selet_dtm("1041");
@@ -119,7 +128,7 @@ namespace DyeingComputer.View
                 newRow = tblDatas.NewRow();
                 newRow["ParameterSet"] = Properties.Resources.ClothWheel + "4 (M/min)";//提不论速度
                 newRow["Value"] = MainWindowViewModel.Selet_dtm("1028");
-                newRow["ID"] = "1026";
+                newRow["ID"] = "1028";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 5)
@@ -127,7 +136,7 @@ namespace DyeingComputer.View
                 newRow = tblDatas.NewRow();
                 newRow["ParameterSet"] = Properties.Resources.ClothWheel + "5 (M/min)";//提不论速度
                 newRow["Value"] = MainWindowViewModel.Selet_dtm("1029");
-                newRow["ID"] = "1026";
+                newRow["ID"] = "1029";
                 tblDatas.Rows.Add(newRow);
             }
             if (MainWindowViewModel.MT18 >= 6)
@@ -188,6 +197,7 @@ namespace DyeingComputer.View
             }
 
             Parameter_set.ItemsSource = tblDatas.DefaultView;
+
         }
 
         private void Parameter_set_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
@@ -199,6 +209,8 @@ namespace DyeingComputer.View
             if (rownum != -1)//判断鼠标定位是否有效
             {
                 ID = (Parameter_set.Columns[2].GetCellContent(Parameter_set.Items[rownum]) as TextBlock).Text;//定位第0列，               
+                try
+                {
                     if (ID == "ClothWheel")
                     {
                         MainWindowViewModel.Updata_dtm("1025", Convert.ToDouble(newValue));
@@ -216,8 +228,17 @@ namespace DyeingComputer.View
                     }
                     else
                     {
-                    MainWindowViewModel.Updata_dtm(ID, Convert.ToDouble(newValue));
+                        int i = Convert.ToInt16(newValue);
+                        if (i > 999) i = 999;
+                        if ((ID == "1020") || (ID == "1021") || (ID == "1041"))
+                        {
+                            if (i > 100) i = 100;
                         }
+                        MainWindowViewModel.Updata_dtm(ID, i);
+                    }
+                }
+                catch { }
+                ParameterSet_d();
             }
         }//参数设置
 
@@ -468,6 +489,8 @@ namespace DyeingComputer.View
 
         }
 
+        
+
         private void ProgramgroupView_stop_Click(object sender, RoutedEventArgs e)//结束工艺
         {
 

ViewModel/MainWindowViewModel.cs

@@ -123,6 +123,7 @@ namespace DyeingComputer.ViewModel
         private static int MT06;//主缸排水延时
         private int MT12;
         private static double MT16;//流量计数系数
+        public static int MT17;//
         public static int MT18;//主缸管数
         private static double MT33;//主缸温度偏差
         private int MT38;//高水位
@@ -170,6 +171,7 @@ namespace DyeingComputer.ViewModel
             MT06 = Convert.ToInt16(Selet_con("MT06"));//动力排水延时
             MT12 = Convert.ToInt16(Selet_con("MT12"));//
             MT16 = Convert.ToDouble(Selet_con("MT16"));//流量计数系数
+            MT17 = Convert.ToInt16(Selet_con("MT17"));//
             MT18 = Convert.ToInt16(Selet_con("MT18"));//
             MT33 = Convert.ToDouble(Selet_con("MT33"));//温度偏差参数
             MT38 = Convert.ToInt16(Selet_con("MT38"));//
@@ -1587,8 +1589,10 @@ namespace DyeingComputer.ViewModel
                 SYSlog = SYSlog + " | " + Resources.Nozzle + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1043"))) + "Bar";
                 SYSlog = SYSlog + "\n" + Resources.DifferentialPressure + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1044"))) + "%";
             }  //压力
+            if (MainWindowViewModel.MT17 == 1)
+            {
                 SYSlog = SYSlog + "\n" + Resources.Blower + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1021"))) + "%";
-            //    SYSlog = SYSlog + "\n" + Resources.GuidingWheel + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1046"))) + "M/min";
+            }//    SYSlog = SYSlog + "\n" + Resources.GuidingWheel + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1046"))) + "M/min";
             if (MI02 == 2) SYSlog = SYSlog + "\n" + Resources.Nozzle + Resources.Flowmeter + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1045"))) + "L/min";//喷射流量
             if (MI01 == 1)//
             {