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

View/WorkOrderView.xaml.cs

@@ -135,8 +135,15 @@ namespace DyeingComputer.View
         private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
         {
             SQL_UPDATE = false;
-            MainWindowViewModel.WorkNumder = DateTime.Now.ToString("yyMMddHHmmss");
+            MainWindowViewModel.WorkNumder = MainWindowViewModel.S01 + "_"+ DateTime.Now.ToString("yyMMddHHmmss");
             TechnologicalProcessView.workName = e.ID;
+            TechnologicalProcessView.workName = e.NAME; 
+            TechnologicalProcessView.workName = e.TIME;
+
+
+
+
+
         }
         private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
         {

Windows/ViewProgram.xaml

@@ -47,9 +47,10 @@
             </DataGrid.CellStyle>
             <DataGrid.Columns>
                 <!--列信息绑定-->
-                <DataGridTextColumn Header="ProcessID" Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="330" Binding="{Binding ProgramName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="ProcessID" Binding="{Binding ProgramID}" MaxWidth="0"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="250" Binding="{Binding ProgramName}" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Width="50" Binding="{Binding Step}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Time}" Width="100" Binding="{Binding Time}" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
 

Windows/ViewProgram.xaml.cs

@@ -57,7 +57,7 @@ namespace DyeingComputer.Windows
 
         private void YES_Click(object sender, RoutedEventArgs e)//确认
         {
-            var args = new AddressUpdateEventArgs(Program_STEP, Program_ID,Program_STEP);
+            var args = new AddressUpdateEventArgs(Program_STEP, Program_ID, Program_NAME, Program_TIME);
             AddressUpdated(this, args);
             this.Close(); //关闭窗口
         }
@@ -70,6 +70,7 @@ namespace DyeingComputer.Windows
         string Program_ID;
         string Program_NAME;
         string Program_STEP;
+        string Program_TIME;
         private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)//表格选择事件
         {
             int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量
@@ -78,21 +79,24 @@ namespace DyeingComputer.Windows
                 Program_ID = (Grid.Columns[0].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
                 Program_NAME = (Grid.Columns[1].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
                 Program_STEP = (Grid.Columns[2].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
+                Program_TIME = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
             }
         }
 
         public class AddressUpdateEventArgs : System.EventArgs
         {
-            public AddressUpdateEventArgs(string dStep, string dID, string dNAME)
+            public AddressUpdateEventArgs(string dStep, string dID, string dNAME, string dtime)
             {
                 this.ID = dID;
                 this.Step = dStep;
                 this.NAME = dNAME;
+                this.TIME = dtime;
             }
 
             public string Step { get; set; }
             public string ID { get; set; }
             public string NAME { get; set; }
+            public string TIME { get; set; }
 
         }
     }