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

View/TechnologicalProcessView.xaml.cs

@@ -328,7 +328,7 @@ namespace DyeingComputer.View
             APILog.LOGlog(MainWindowViewModel.WorkNumder.ToString(), "UserActions", "Edit", "STEP = " + ID);
             ViewStep viewstop = new ViewStep(Numder, MainWindowViewModel.dt_TP.Select("STEP = " + ID).First());
             viewstop.boxNAME.IsEnabled=false;
-            viewstop.no.IsEnabled = false;
+            //viewstop.no.IsEnabled = false;
             viewstop.data = ID;
             viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_ButtonClicked);
             viewstop.ShowDialog();
@@ -377,6 +377,8 @@ namespace DyeingComputer.View
             }
             else
             {
+                GridSTEP.SelectedIndex = -1;
+                MainWindowViewModel.User_Button = true;
                 return;
             }
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
@@ -495,7 +497,7 @@ namespace DyeingComputer.View
             if (ID == null) return;// ID = MainWindowViewModel.dt_TP.Rows.Count.ToString();
             ViewStep viewstop = new ViewStep(null, MainWindowViewModel.dt_TP.Select("STEP = " + ID).First());
             viewstop.boxNAME.IsEnabled = false;
-            viewstop.no.IsEnabled = false;
+            //viewstop.no.IsEnabled = false;
             viewstop.data = ID;
             viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Address_InsertClicked);
             viewstop.ShowDialog();
@@ -538,8 +540,6 @@ namespace DyeingComputer.View
                 dr["StepID_S2"] = e.Row_DAT.Field<string>("StepID_S2");
                 dr["StepID_S3"] = e.Row_DAT.Field<string>("StepID_S3");
                 dr.EndEdit();
-
-              //  MainWindowViewModel.dt_TP = sql.Tables[0];
                 GridSTEP.SelectedIndex = -1;
             }
             else
@@ -547,6 +547,8 @@ namespace DyeingComputer.View
                 MainWindowViewModel.dt_TP.Rows.RemoveAt(n - 1);
                 Dat();
                 GridSTEP.SelectedIndex = -1;
+                MainWindowViewModel.User_Button = true;
+                return;
             }
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库

Windows/ViewStep.xaml

@@ -8,6 +8,7 @@
         mc:Ignorable="d" 
         WindowStartupLocation="CenterScreen"
         ResizeMode="NoResize"
+        WindowStyle="None"
         Title="SUNLIGHT 800" Height="800" Width="600">
     <Grid>
         <Grid.RowDefinitions>

Windows/ViewStep.xaml.cs

@@ -55,7 +55,9 @@ namespace DyeingComputer.Windows
             dat_P = 2;
             Setp(DAT.Field<string>("StepID_S2"));
             dat_P = 3;
-            Setp(DAT.Field<string>("StepID_S3"));               
+            Setp(DAT.Field<string>("StepID_S3"));
+            dat_P = 0;
+            boxIDp.IsEnabled=false;    
         }
 
         private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件
@@ -370,11 +372,10 @@ namespace DyeingComputer.Windows
             this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
             this.boxID.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066
             this.boxID.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067
-            this.boxIDp.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
-            this.boxIDp.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
-            this.boxIDp.Items.Add(Properties.Resources.PHDetection);//ph检测093
-            this.boxIDp.Items.Add(Properties.Resources.PHControl);//ph控制094
-
+            this.boxID.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
+            this.boxID.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
+            this.boxID.Items.Add(Properties.Resources.PHDetection);//ph检测093
+            this.boxID.Items.Add(Properties.Resources.PHControl);//ph控制094
 
             this.boxIDp.Items.Add("");//
             this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
@@ -1699,7 +1700,7 @@ namespace DyeingComputer.Windows
         private void imageP1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
             ((Image)sender).RenderTransform = Transform.Identity;
-            dat_P = 1;
+            dat_P = 1; boxIDp.IsEnabled = true;
             Sub.Text = Properties.Resources.Subroutine + ": "+dat_P.ToString();
             boxNAMEp.Text = dat_D.Field<string>("StepID_S1");
             P1P.Text = dat_D.Field<double>("Parameter1_S1").ToString();
@@ -1711,7 +1712,7 @@ namespace DyeingComputer.Windows
         private void imageP2_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
             ((Image)sender).RenderTransform = Transform.Identity;
-            dat_P = 2;
+            dat_P = 2; boxIDp.IsEnabled = true;
             Sub.Text = Properties.Resources.Subroutine + ": "+ dat_P.ToString();
             boxNAMEp.Text = dat_D.Field<string>("StepID_S2");
             P1P.Text = dat_D.Field<double>("Parameter1_S2").ToString();
@@ -1723,7 +1724,7 @@ namespace DyeingComputer.Windows
         private void imageP3_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
             ((Image)sender).RenderTransform = Transform.Identity;
-            dat_P = 3;
+            dat_P = 3; boxIDp.IsEnabled = true;
             Sub.Text = Properties.Resources.Subroutine + ": "+ dat_P.ToString();
             boxNAMEp.Text = dat_D.Field<string>("StepID_S3");
             P1P.Text = dat_D.Field<double>("Parameter1_S3").ToString();
@@ -1731,8 +1732,6 @@ namespace DyeingComputer.Windows
             P3P.Text = dat_D.Field<double>("Parameter3_S3").ToString();
             P4P.Text = dat_D.Field<double>("Parameter4_S3").ToString();
             P5P.Text = dat_D.Field<double>("Parameter5_S3").ToString();
-        }
-
-       
+        }               
     }
 }