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

Properties/Resources.Designer.cs

@@ -1059,6 +1059,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Jump 的本地化字符串。
+        /// </summary>
+        public static string Jump {
+            get {
+                return ResourceManager.GetString("Jump", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Language 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -939,4 +939,7 @@
   <data name="Mode" xml:space="preserve">
     <value>Mode</value>
   </data>
+  <data name="Jump" xml:space="preserve">
+    <value>Jump</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -939,4 +939,7 @@
   <data name="Mode" xml:space="preserve">
     <value>Mode</value>
   </data>
+  <data name="Jump" xml:space="preserve">
+    <value>Jump</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -939,4 +939,7 @@
   <data name="Mode" xml:space="preserve">
     <value>模式</value>
   </data>
+  <data name="Jump" xml:space="preserve">
+    <value>跳步</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -939,4 +939,7 @@
   <data name="SERVER" xml:space="preserve">
     <value>伺服器</value>
   </data>
+  <data name="Jump" xml:space="preserve">
+    <value>跳步</value>
+  </data>
 </root>

View/MonitorView.xaml

@@ -124,7 +124,7 @@
             </DataGrid.Columns>
             </DataGrid>
             <TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>
-            <TextBlock Grid.Column="0" x:Name="log" TextWrapping="Wrap" FontSize="25" Background="White" Margin="0,40,0,0"/>
+            <TextBlock Grid.Column="0" x:Name="log" TextWrapping="Wrap" FontSize="25" Background="White" Margin="0,42,4,-2" Grid.ColumnSpan="2"/>
             <GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/>
         </Grid>
         <StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
@@ -186,6 +186,14 @@
                     </StackPanel>
                 </ListViewItem>
             </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Jump"  IsEnabled="False" x:Name="Jump">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="Jump" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.Jump}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
                 <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
                     <StackPanel Orientation="Horizontal">

View/MonitorView.xaml.cs

@@ -16,6 +16,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Threading;
 using System.Xml.Linq;
+using TouchSocket.Core;
 using TouchSocket.Sockets;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.Rebar;
 
@@ -42,6 +43,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表
         {
             Gridstep.ItemsSource = null; log.Text = null;
+            Stop.IsEnabled = true;
 
             int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量
             if (rownum != -1)//判断鼠标定位是否有效
@@ -56,7 +58,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            Delete.IsEnabled = true;
             Insert.IsEnabled = true;
             edit.IsEnabled = true;
             Paused.IsEnabled = true;
@@ -66,31 +67,66 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private void ListViewItem_DyeingMachine(object sender, MouseButtonEventArgs e)
         {
             machines_info = 0;
-        }
+        }//信息
         private void ListViewItem_Conveyor(object sender, MouseButtonEventArgs e)
         {
             machines_info = 1;
-        }
+        }//输送
         private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e)
         {
             machines_info = 2;
-        }
-
+        }//单据
         private void ListViewItem_Resume(object sender, MouseButtonEventArgs e)
         {
+            if (!string.IsNullOrEmpty(machine))
+            {
+                Dictionary<string, object> dat_821 = new Dictionary<string, object>();
+                dat_821.Clear();
+                dat_821.Add("INSTRUCTION", "CONTINUE");
+                DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index) + dat_821.ToJsonString());
+
+            }
 
+            Insert.IsEnabled = false;
+            edit.IsEnabled = false;
+            Paused.IsEnabled = false;
+            Resume.IsEnabled = false;
         }
         private void ListViewItem_Paused(object sender, MouseButtonEventArgs e)
         {
+            if (!string.IsNullOrEmpty(machine))
+            {
+                Dictionary<string, object> dat_821 = new Dictionary<string, object>();
+                dat_821.Clear();
+                dat_821.Add("INSTRUCTION", "PAUSE");
+                DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index) + dat_821.ToJsonString());
 
+            }
         }
         private void ListViewItem_Stop(object sender, MouseButtonEventArgs e)
         {
+            if (!string.IsNullOrEmpty(machine))
+            {
+                Dictionary<string, object> dat_821 = new Dictionary<string, object>();
+                dat_821.Clear();
+                dat_821.Add("INSTRUCTION", "STOP");
+                DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index)+dat_821.ToJsonString());
 
+            }
         }
         private void ListViewItem_edit(object sender, MouseButtonEventArgs e)
         {
 
+        }
+        private void ListViewItem_Jump(object sender, MouseButtonEventArgs e)
+        {
+
         }
         private void ListViewItem_Insert(object sender, MouseButtonEventArgs e)
         {
@@ -163,6 +199,5 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             }           
         }
 
-      
     }
 }