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

View/TechnologicalProcessView.xaml

@@ -8,15 +8,20 @@
              mc:Ignorable="d" 
             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
     <Grid>
-        <TextBox HorizontalAlignment="Left" Margin="0,0,0,0" TextWrapping="Wrap" Text="TextBox" Width="400"/>
+        <TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,0,0,0" TextWrapping="Wrap" Width="400" FontSize="20" MinHeight="630" Background="White"/>
-        
+        <TextBlock x:Name="name" HorizontalAlignment="Left" Margin="400,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="NAME" Height="30" Block.TextAlignment="Center">
+            <TextBlock.LayoutTransform>
+                <!--文字同样旋转90度-->
+                <RotateTransform Angle="270"/>
+            </TextBlock.LayoutTransform>
+        </TextBlock>
         <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True"
-      Margin="400,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
+      Margin="430,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
-      HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"         
+      HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="Black"         
       BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"      
       CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
       CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column"     
-      Background="White" SelectionMode="Single" FontSize="15">
+      Background="White" SelectionMode="Single" FontSize="15" MinHeight="632">
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Setter Property="Height" Value="30" />

View/WorkOrderView.xaml

@@ -9,7 +9,7 @@
              xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" 
              xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
              d:DataContext="{d:DesignInstance Type=viewmodel:WorkOrderViewModel}"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" KeyDown="UserControl_KeyDown"
              d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
     <UserControl.Resources>
         <ConvertMoels:StatenConvert x:Key="StatenConvert"/>

View/WorkOrderView.xaml.cs

@@ -153,6 +153,12 @@ namespace DyeingComputer.View
             }
         }
 
-
+        private void UserControl_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.K) 
+            {
+                MainWindowViewModel.WorkNumder = WorkOrder_Numder;
+            }
+        }
     }
 }

ViewModel/MainWindowViewModel.cs

@@ -28,6 +28,7 @@ namespace DyeingComputer.ViewModel
     {
         public MainWindowViewModel() 
         {
+            WorkNumder = "----------";
             CountDown();
         }
 
@@ -79,8 +80,7 @@ namespace DyeingComputer.ViewModel
         {
             Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
             Work_Temp = "130"+"  ℃";
-            Work_Numder = "r2024011200014";
+            Work_Numder = WorkNumder.ToString();
-            WorkNumder = Work_Numder;
             Status_Str = "qweqeqwqqfwfqef";
         }
     }