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

View/WorkOrderView.xaml

@@ -61,14 +61,14 @@
 
                 <DataGrid.Columns>
                     <!--列信息绑定-->
-                    <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="200" Binding="{Binding WorkOrder}" IsReadOnly="True">
+                    <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="250" Binding="{Binding WorkOrder}" IsReadOnly="True">
                         <DataGridTextColumn.ElementStyle>
                             <Style TargetType="{x:Type TextBlock}">
                                 <Setter Property="Foreground" Value="{Binding Path=lock,Converter={StaticResource GramsSQLConvert}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="200" Binding="{Binding ProcessName}" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="300" Binding="{Binding ProcessName}" IsReadOnly="True"/>
                     <DataGridTextColumn Header="ProcessID" Binding="{Binding ProcessID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="90" IsReadOnly="True">

View/WorkOrderView.xaml.cs

@@ -55,7 +55,7 @@ namespace DyeingComputer.View
 
             if (sql != null) sql.Clear();  //清空缓存
             sql = SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
-            if(sql!=null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
+            if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
 
             SQLiteHelpers.Close();  //关闭连接
 
@@ -82,7 +82,7 @@ namespace DyeingComputer.View
 
 
             //   WpfPlot_Grid.Plot.YLabel("Temperature (C)");
-      
+
         }
 
         private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮
@@ -94,28 +94,29 @@ namespace DyeingComputer.View
 
             if (_lock == "0") //改变lock的状态
             {
-                lock_v.Add("lock", 1);               
-                SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='"+WorkOrder_Numder+"'",null);
-            }else
+                lock_v.Add("lock", 1);
+                SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
+            }
+            else
             {
                 lock_v.Add("lock", 0);
                 SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
             }
 
-            SQLiteHelpers.Close();  
+            SQLiteHelpers.Close();
             Workorder_sql();
         }
 
         private void WorkOrderView_new_Click(object sender, RoutedEventArgs e)//新建按钮
         {
-            
+
         }
 
         private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
         {
             if (WorkOrder_Numder == null) return;
             ///弹窗提示确认删除
-            if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + WorkOrder_Numder , "Delete ",
+            if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Delete + WorkOrder_Numder, "Delete ",
                 System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
             {
                 ///执行删除
@@ -130,13 +131,13 @@ namespace DyeingComputer.View
         private void WorkOrderView_redy_Click(object sender, RoutedEventArgs e)//重染按钮
         {
             string WorkNum = MainWindowViewModel.WorkNumder.ToString();
-            if (WorkNum !=null) 
+            if (WorkNum != null)
             {
                 if (System.Windows.Forms.MessageBox.Show(Properties.Resources.Confirm + Properties.Resources.Redye + WorkNum, "Redye ",
                    System.Windows.Forms.MessageBoxButtons.OKCancel, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.OK)
                 {
                     ///执行重染
-                } 
+                }
             }
         }
 
@@ -151,5 +152,7 @@ namespace DyeingComputer.View
                 _lock = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
             }
         }
+
+
     }
 }