临时提交

SCADA_DAQ/Customer/Machines/SampleMachine.cs

@@ -129,7 +129,7 @@ namespace SCADA_DAQ.Customer.Machines
                 else if (CustomerEnv.StackCapture.RotationAngle_Dec == 180 || CustomerEnv.StackCapture.RotationAngle_Dec == -180) { jiaodu = 25520; }
                 var PutBoxXIsSucess = GetListenReg("X轴放料点上方").WriteReg(PutBoxX + ((int)CustomerEnv.StackCapture.XLocation_Dec * Xmm));
                 var PutBoxYIsSucess = GetListenReg("Y轴放料点上方").WriteReg(PutBoxY + ((int)CustomerEnv.StackCapture.YLocation_Dec * Ymm));
-                var PutBoxRIsSucess = GetListenReg("R轴放料点上方").WriteReg(jiaodu);
+                var PutBoxRIsSucess = GetListenReg("R轴放料点角度").WriteReg(jiaodu);
 
                 var PutBoxZIsSucess = GetListenReg("Z轴放料点").WriteReg((int)(CustomerEnv.StackCapture.ZLocation_Dec + (CustomerEnv.StackCapture.ZLocation_Dec / 2)));
                 if (TakeBoxYIsSucess && TakeBoxXIsSucess && TakeBoxZIsSucess && PutBoxXIsSucess && PutBoxYIsSucess && PutBoxRIsSucess && PutBoxZIsSucess)

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"  PreviewMouseDown="RestSystem_PreviewMouseDown" PreviewMouseUp="RestSystem_PreviewMouseUp" Style="{StaticResource SameTitle}">
+                <wpfcontrol:IconButton Title="手动来料"  x:Name="ManualIncomingMaterial" Grid.Column="1" Click="RegiserReverse_Click"  Style="{StaticResource SameTitle}">
                     <wpfcontrol:IconButton.Icon>
                         <iconPacks:PackIconMaterial Kind="HandBackLeft"/>
                     </wpfcontrol:IconButton.Icon>