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

Properties/Resources.Designer.cs

@@ -330,6 +330,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DyeingMachine 的本地化字符串。
+        /// </summary>
+        public static string DyeingMachine {
+            get {
+                return ResourceManager.GetString("DyeingMachine", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Dyelot 的本地化字符串。
         /// </summary>
@@ -906,6 +915,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Receipt 的本地化字符串。
+        /// </summary>
+        public static string Receipt {
+            get {
+                return ResourceManager.GetString("Receipt", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Recover 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -483,4 +483,10 @@
   <data name="Bottom" xml:space="preserve">
     <value>Bottom</value>
   </data>
+  <data name="Receipt" xml:space="preserve">
+    <value>Receipt</value>
+  </data>
+  <data name="DyeingMachine" xml:space="preserve">
+    <value>Dyeing</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -483,4 +483,10 @@
   <data name="Bottom" xml:space="preserve">
     <value>Bottom</value>
   </data>
+  <data name="Receipt" xml:space="preserve">
+    <value>Receipt</value>
+  </data>
+  <data name="DyeingMachine" xml:space="preserve">
+    <value>DyeingMachine</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -483,4 +483,10 @@
   <data name="Bottom" xml:space="preserve">
     <value>底</value>
   </data>
+  <data name="Receipt" xml:space="preserve">
+    <value>领料单</value>
+  </data>
+  <data name="DyeingMachine" xml:space="preserve">
+    <value>染色机</value>
+  </data>
 </root>

UserClass/AsyncTcpServer.cs

@@ -237,6 +237,15 @@ namespace DyeingComputer.UserClass
                     }
                     else { client.SendAsync("SC999"); }
                 }//当前细节信息
+                else if (SYSAPI == "SC833")
+                {
+                    if (SYSKEY == MainWindowViewModel.SYSKEY)
+                    {
+
+                        client.SendAsync("SC832" + "[" + MainWindowViewModel.S01 + "]" + "sc833");
+                    }
+                    else { client.SendAsync("SC999"); }
+                }//当前领料单
                 else if (SYSAPI == "SC851")
                 {
                     if (SYSKEY == MainWindowViewModel.SYSKEY)

View/TechnologicalProcessView.xaml

@@ -12,7 +12,7 @@
              d:DesignHeight="630" d:DesignWidth="1280">
     <Grid Focusable="True">
         <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
-      Margin="630,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
+      Margin="630,40,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
       HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="{x:Null}"         
       BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"      
       CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
@@ -74,9 +74,12 @@
                 <RotateTransform Angle="270"/>
             </TextBlock.LayoutTransform>
         </TextBlock>
-        <Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Width="600" Height="40" HorizontalAlignment="Left"/>
+        <WrapPanel Orientation="Horizontal" x:Name="WholeView" Background="#FFCCCCCC" VerticalAlignment="Top">
-        <Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_edit_Click"/>
+            <Button Content="{x:Static lang:Resources.DyeingMachine}" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="DyeingMachine_Click"/>
-        <Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_del_Click"/>
+            <Button Content="{x:Static lang:Resources.Receipt}" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="Receipt_Click"/>
-        <Button Content="{x:Static lang:Resources.Insert}" x:Name="ProgramgroupView_Insert" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Insert_Click"/>
+        <Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_edit_Click"/>
+        <Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_del_Click"/>
+        <Button Content="{x:Static lang:Resources.Insert}" x:Name="ProgramgroupView_Insert" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Insert_Click"/>
+        </WrapPanel>
     </Grid>
 </UserControl>

View/TechnologicalProcessView.xaml.cs

@@ -238,6 +238,16 @@ namespace DyeingComputer.View
         string Numder = null;
         string ID = null;
         string P1 = "0", P2 = "0", P3 = "0", P4 = "0", P5 = "0";
+
+        private void DyeingMachine_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+        private void Receipt_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
         private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (MainWindowViewModel.WORK_RUN == 2) Grid.SelectedIndex = MainWindowViewModel.RUN_STEPID - 1;//设定图表显示