临时提交

SCADA_DAQ/Customer/UctFrmPalletizingManual.xaml.cs

@@ -112,27 +112,27 @@ namespace SCADA_DAQ.Customer
         {
             try
             {
-
+                Dispatcher.Invoke(() =>
+                {
+                    BoardWidth.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoardWidth_Dec + "mm").FirstOrDefault()?.ToString();
+                    BoardLength.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoardLength_Dec + "mm").FirstOrDefault()?.ToString();
+                    StackHeight.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackHeight_Dec + "mm").FirstOrDefault()?.ToString();
+                    BoxHeight.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoxHeight_Dec + "mm").FirstOrDefault()?.ToString();
+                    BoxWidth.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoxWidth_Dec + "mm").FirstOrDefault()?.ToString();
+                    BoxLength.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoxLength_Dec + "mm").FirstOrDefault()?.ToString();
+                    CaptureIndex.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackCaptureList.FirstOrDefault()?.CaptureIndex_Int).FirstOrDefault()?.ToString();
+                    LayerNo.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackCaptureList.FirstOrDefault()?.LayerNo_Int).FirstOrDefault()?.ToString();
+                    LayerIndex.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackCaptureList.FirstOrDefault()?.LayerIndex_Int).FirstOrDefault()?.ToString();
+                });
+                CustomerEnv.StackSln = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text).FirstOrDefault();
+                CustomerEnv.StackCapture = CustomerEnv.StackSln?.StackCaptureList?.FirstOrDefault();
             }
             catch (Exception)
             {
 
             }
 
-            Dispatcher.Invoke(() =>
-            {
-                BoardWidth.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoardWidth_Dec + "mm").FirstOrDefault()?.ToString();
-                BoardLength.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoardLength_Dec + "mm").FirstOrDefault()?.ToString();
-                StackHeight.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackHeight_Dec + "mm").FirstOrDefault()?.ToString();
-                BoxHeight.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoxHeight_Dec + "mm").FirstOrDefault()?.ToString();
-                BoxWidth.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoxWidth_Dec + "mm").FirstOrDefault()?.ToString();
-                BoxLength.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.BoxLength_Dec + "mm").FirstOrDefault()?.ToString();
-                CaptureIndex.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackCaptureList.FirstOrDefault()?.CaptureIndex_Int).FirstOrDefault()?.ToString();
-                LayerNo.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackCaptureList.FirstOrDefault()?.LayerNo_Int).FirstOrDefault()?.ToString();
-                LayerIndex.Value = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text)?.Select(i => i.StackCaptureList.FirstOrDefault()?.LayerIndex_Int).FirstOrDefault()?.ToString();
-            });
-            CustomerEnv.StackSln = StackSlnList.Where(i => i.SlnName_Str == ChooseStackSln.Text).FirstOrDefault();
-            CustomerEnv.StackCapture = CustomerEnv.StackSln.StackCaptureList?.FirstOrDefault();
+           
         }
     }
 }

SCADA_DAQ/Customer/Views/Uct/UctOutputControl.xaml

@@ -38,7 +38,7 @@
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
 
-                <wpfcontrol:IconButton Title="手动来料" Click="RegiserReverse_Click" x:Name="ManualIncomingMaterial" Grid.Column="1" Style="{StaticResource SameTitle}">
+                <wpfcontrol:IconButton Title="手动来料" Click="RegiserReverse_Click" x:Name="ManualIncomingMaterial" Grid.Column="1"  PreviewMouseDown="RestSystem_PreviewMouseDown" PreviewMouseUp="RestSystem_PreviewMouseUp" Style="{StaticResource SameTitle}">
                     <wpfcontrol:IconButton.Icon>
                         <iconPacks:PackIconMaterial Kind="HandBackLeft"/>
                     </wpfcontrol:IconButton.Icon>