增加扫码过滤

SCADA_DAQ/Customer/Machines/SortMachine.cs

@@ -470,7 +470,8 @@ namespace SCADA_DAQ.Customer.Machines
                                 var labels = JsonHelper.JsonDeserialize<CameraModels>(_strContent);  //获取标签位置
                                 var codes = labels.ID.Split(',');
                                 var labelModels = new List<LabelModel>();
-                                for (int i = 0; i < codes.Count(); i++)
+                                var minCount =Math.Min( Math.Min(labels.X.Count, labels.R.Count),codes.Length);
+                                for (int i = 0; i < minCount; i++)
                                 {
                                     labelModels.Add(new LabelModel { X = labels.X[i], Y = labels.Y[i], R = labels.R[i], CodeID = codes[i] });
                                 }
@@ -483,31 +484,34 @@ namespace SCADA_DAQ.Customer.Machines
                                 else
                                 {
                                     _lbl = new LabelModel { CodeID = CurrentLabel.CodeID };
-
-                                    if (!CustomerEnv.SortingMacConfigValue.IsCameraFailForceRun)
+                                    if (CurrentLabel.Waste == 0)
                                     {
-                                        if (MessageBox.Show($"相机数据中没有识别到数据 \n 是否继续？", "相机数据", MessageBoxButton.YesNo) == MessageBoxResult.No)
+                                        if (!CustomerEnv.SortingMacConfigValue.IsCameraFailForceRun)
                                         {
-                                            isCancel = true;
-                                            CurrentLabel.Status = Models.TaskStatus.None;
-                                            GetListenReg(Tag_Reset).SetBit();
+                                            if (MessageBox.Show($"相机数据中没有识别到数据 \n 是否继续？", "相机数据", MessageBoxButton.YesNo) == MessageBoxResult.No)
+                                            {
+                                                isCancel = true;
+                                                CurrentLabel.Status = Models.TaskStatus.None;
+                                                GetListenReg(Tag_Reset).SetBit();
+                                            }
                                         }
                                     }
+                                    
                                 }
 
                             }
                             else
                             {
-                                if (MessageBox.Show("连接相机失败，是否继续执行？", "相机数据", MessageBoxButton.YesNo) == MessageBoxResult.No)
-                                {
-                                    isCancel = true;
-                                    CurrentLabel.Status = Models.TaskStatus.None;
-                                    GetListenReg(Tag_Reset).SetBit();
-                                }
-                                else
-                                {
-                                    _lbl.CodeID = CurrentLabel.CodeID;
+                                _lbl.CodeID = CurrentLabel.CodeID;
 
+                                if (!CustomerEnv.SortingMacConfigValue.IsCameraFailForceRun)
+                                {
+                                    if (MessageBox.Show("连接相机失败，是否继续执行？", "相机数据", MessageBoxButton.YesNo) == MessageBoxResult.No)
+                                    {
+                                        isCancel = true;
+                                        CurrentLabel.Status = Models.TaskStatus.None;
+                                        GetListenReg(Tag_Reset).SetBit();
+                                    }
                                 }
                             }
 

SCADA_DAQ/Customer/Service/ScannerService.cs

@@ -59,6 +59,8 @@ namespace SCADA_DAQ.Customer.Service
         public SortingDeliveryMachine Plc1 = MachineServer.GetInstance().GetMachine<SortingDeliveryMachine>("开料分拣输送");
         private List<BoardTaskModel> BoardTasks = new List<BoardTaskModel>();
 
+        public DateTime LastScanTime { get; set; } = DateTime.Now;
+
         public int Index { get; set; }
 
         public TcpComm _tcpComm { get; set; }
@@ -112,68 +114,77 @@ namespace SCADA_DAQ.Customer.Service
             var barcodeTask = BoardTasks.Where(t => t.BoardID == barcode).FirstOrDefault();
             //var barcodeTask = Env.DAL.App_Hold_BoardInfo.GetData<BoardTaskModel>(t=>t.BoardID == barcode).FirstOrDefault();
             var api = new WebApiHelper(_ScannerServiceConfig.Url);
-            if (barcode != "NoRead" && barcodeTask != null)
+            if ((DateTime.Now - LastScanTime).TotalSeconds > 3)
             {
-                var MinProportion = Math.Min(barcodeTask.Width, barcodeTask.Height) / Math.Max(barcodeTask.Width, barcodeTask.Height);
-                var minSize = Math.Min(barcodeTask.Width, barcodeTask.Height);
-                //先判断是否异型 
-                //大于200启用限制时判断最小比例
-                //
-                if (barcodeTask.IsAbnormalShape ||
-                    minSize < SortingEnv.SortingWorkReportSettingValue.MinSize
-                    || (MinProportion < SortingEnv.SortingWorkReportSettingValue.MinProportion && SortingEnv.SortingWorkReportSettingValue.IsMinProportionEnable
-                        || (MinProportion < SortingEnv.SortingWorkReportSettingValue.MinProportion && minSize < 200 && !SortingEnv.SortingWorkReportSettingValue.IsMinProportionEnable))
-                         || Math.Max(barcodeTask.Width, barcodeTask.Height) > 2620)
+                if (barcode != "NoRead" && barcodeTask != null)
                 {
-                    Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(2);
-
-                    //Plc1.GetListenReg(SortingDeliveryMachine.Tag_IsLeftovers).WriteReg(0);
-                    Plc1.LeftLoversOrAbnormal.Enqueue(2);
-                    Log.Info("板件异型或尺寸或比例太小或尺寸超出2620mm！");
-
-                }
-                else
-                {
-                    Log.Info("开始调用WebApi接口");
-                    var result = api.POST<CodeApiModel>(new { panelCode = e.Barcode });
-                    Log.Info("收到WebApi接口返回");
-
-                    if (result.Data != null && result.Data.success == true)
+                    var MinProportion = Math.Min(barcodeTask.Width, barcodeTask.Height) / Math.Max(barcodeTask.Width, barcodeTask.Height);
+                    var minSize = Math.Min(barcodeTask.Width, barcodeTask.Height);
+                    //先判断是否异型 
+                    //大于200启用限制时判断最小比例
+                    //
+                    if (barcodeTask.IsAbnormalShape ||
+                        minSize < SortingEnv.SortingWorkReportSettingValue.MinSize
+                        || (MinProportion < SortingEnv.SortingWorkReportSettingValue.MinProportion && SortingEnv.SortingWorkReportSettingValue.IsMinProportionEnable
+                            || (MinProportion < SortingEnv.SortingWorkReportSettingValue.MinProportion && minSize < 200 && !SortingEnv.SortingWorkReportSettingValue.IsMinProportionEnable))
+                             || Math.Max(barcodeTask.Width, barcodeTask.Height) > 2620)
                     {
-                        Log.Info("缓存仓：条码匹配成功");
-                        //Plc1.GetListenReg(SortingDeliveryMachine.Tag_CanRelease).SetBit();
-                        var model = new CodeInfoModel();
-                        model.Barcode = barcode;
-                        model.Index = Index + 1;
-                        model.FinishTime = DateTime.Now;
-                        Index++;
-                        Application.Current.Dispatcher.Invoke(() =>
-                        {
-                            Plc1.CodeQueue.Add(model);
+                        Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(2);
+
+                        //Plc1.GetListenReg(SortingDeliveryMachine.Tag_IsLeftovers).WriteReg(0);
+                        Plc1.LeftLoversOrAbnormal.Enqueue(2);
+                        Log.Info("板件异型或尺寸或比例太小或尺寸超出2620mm！");
 
-                        });
-                        Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(1);
-                        
                     }
                     else
                     {
-                        //Log.Info($"{result.Data.success},{result.Data.code},{result.Data.message}");
-                        Log.Info($"缓存仓：条码匹配失败");
-                        Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(2);
-                        //Plc1.GetListenReg(SortingDeliveryMachine.Tag_IsLeftovers).WriteReg(1);
-                        Plc1.LeftLoversOrAbnormal.Enqueue(1);
+                        Log.Info("开始调用WebApi接口");
+                        var result = api.POST<CodeApiModel>(new { panelCode = e.Barcode });
+                        Log.Info("收到WebApi接口返回");
+
+                        if (result.Data != null && result.Data.success == true)
+                        {
+                            Log.Info("缓存仓：条码匹配成功");
+                            //Plc1.GetListenReg(SortingDeliveryMachine.Tag_CanRelease).SetBit();
+                            var model = new CodeInfoModel();
+                            model.Barcode = barcode;
+                            model.Index = Index + 1;
+                            model.FinishTime = DateTime.Now;
+                            Index++;
+                            Application.Current.Dispatcher.Invoke(() =>
+                            {
+                                Plc1.CodeQueue.Add(model);
+
+                            });
+                            Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(1);
+
+                        }
+                        else
+                        {
+                            //Log.Info($"{result.Data.success},{result.Data.code},{result.Data.message}");
+                            Log.Info($"缓存仓：条码匹配失败");
+                            Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(2);
+                            //Plc1.GetListenReg(SortingDeliveryMachine.Tag_IsLeftovers).WriteReg(1);
+                            Plc1.LeftLoversOrAbnormal.Enqueue(1);
+                        }
                     }
+
                 }
+                else
+                {
+                    Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(2);
+                    //Plc1.GetListenReg(SortingDeliveryMachine.Tag_IsLeftovers).WriteReg(1);
+                    Plc1.LeftLoversOrAbnormal.Enqueue(1);
 
+                    Log.Info($"没有获取到条码");
+                }
             }
             else
             {
-                Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(2);
-                //Plc1.GetListenReg(SortingDeliveryMachine.Tag_IsLeftovers).WriteReg(1);
-                Plc1.LeftLoversOrAbnormal.Enqueue(1);
-
-                Log.Info($"没有获取到条码");
+                Log.Warn("扫码频率过高,已经屏蔽");
             }
+            LastScanTime = DateTime.Now;
+           
             
             
             //if (barcodeTask != null )

SCADA_DAQ/Customer/Views/Menu/UctFrmSorting/UctFrmSortingManual.xaml

@@ -26,18 +26,15 @@
             </Style>
         </Grid.Resources>
         <Grid.RowDefinitions>
-            <RowDefinition/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition />
             <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="2*"/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Grid >
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
+        <Grid Grid.ColumnSpan="2">
             <StackPanel Orientation="Horizontal">
                 <wpfcontrol:IconButton Title="自动模式" Click="SetBit_Click" x:Name="AutoBtn" Style="{StaticResource SameTitle}">
                     <wpfcontrol:IconButton.Icon>
@@ -114,13 +111,43 @@
 
                 </wpfcontrol:IconButton>
             </StackPanel>
-            <Grid Grid.Row="1" x:Name="ManualBtnGrid">
+            
+
+        </Grid>
+        <Grid Grid.Row="1" x:Name="ManualBtnGrid">
+            <Grid.Resources>
+                <Style TargetType="Grid">
+                    <Setter Property="IsEnabled" Value="False"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Value}" Value="1">
+                            <Setter Property="IsEnabled" Value="True"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <Grid Grid.ColumnSpan="2" >
                 <Grid.Resources>
-                    <Style TargetType="Grid">
-                        <Setter Property="IsEnabled" Value="True"/>
+                    <Style TargetType="GroupBox">
+                        <Setter Property="Margin" Value="10"/>
+                    </Style>
+                    <Style TargetType="wpfcontrol:IconButton">
+                        <Setter Property="ButtonStyle" Value="Info"/>
+                        <Setter Property="Width" Value="200"/>
+                        <Setter Property="Height" Value="50"/>
+                        <Setter Property="Margin" Value="5"/>
+                        <Setter Property="FontSize" Value="24"/>
+                        <Setter Property="FontWeight" Value="Bold"/>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding Value}" Value="1">
-                                <Setter Property="IsEnabled" Value="False"/>
+                                <Setter Property="ButtonStyle" Value="Success"/>
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -128,54 +155,100 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
                     <ColumnDefinition/>
+                    <ColumnDefinition Width="1.5*"/>
                 </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-                <Grid Grid.ColumnSpan="2" >
-                    <Grid.Resources>
-                        <Style TargetType="GroupBox">
-                            <Setter Property="Margin" Value="10"/>
-                        </Style>
-                        <Style TargetType="wpfcontrol:IconButton">
-                            <Setter Property="ButtonStyle" Value="Info"/>
-                            <Setter Property="Width" Value="200"/>
-                            <Setter Property="Height" Value="50"/>
-                            <Setter Property="Margin" Value="5"/>
-                            <Setter Property="FontSize" Value="24"/>
-                            <Setter Property="FontWeight" Value="Bold"/>
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Value}" Value="1">
-                                    <Setter Property="ButtonStyle" Value="Success"/>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </Grid.Resources>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="1.5*"/>
-                    </Grid.ColumnDefinitions>
-                    <GroupBox Header="皮带控制" x:Name="BeltGroup" >
-                        <wpfcontrol:IconButton Title="皮带启动" Click="Reverse_Click" 
-                          ButtonKind="StartButton" x:Name="BeltStartBtn" VerticalAlignment="Top"/>
-                    </GroupBox>
-                    <GroupBox Header="吸盘控制" Grid.Column="1">
-                        <StackPanel x:Name="CupGroup" VerticalAlignment="Top"/>
-                    </GroupBox>
-                    <GroupBox Header="运动轴控制" Grid.Column="2">
-                        <WrapPanel x:Name="AxisGroup" VerticalAlignment="Top" HorizontalAlignment="Center"/>
-                    </GroupBox>
-                </Grid>
-                <ucrsorting:UctCurrentPosition Grid.Row="1" x:Name="CurrentPos"/>
-                <GroupBox Header="手动参数设置" Grid.Row="1" Grid.Column="1" Margin="10" >
-                    <WrapPanel x:Name="ManualSettingPanel" HorizontalAlignment="Center"/>
+                <GroupBox Header="皮带控制" x:Name="BeltGroup" >
+                    <wpfcontrol:IconButton Title="皮带启动" Click="Reverse_Click" 
+              ButtonKind="StartButton" x:Name="BeltStartBtn" VerticalAlignment="Top"/>
+                </GroupBox>
+                <GroupBox Header="吸盘控制" Grid.Column="1">
+                    <StackPanel x:Name="CupGroup" VerticalAlignment="Top"/>
+                </GroupBox>
+                <GroupBox Header="运动轴控制" Grid.Column="2">
+                    <WrapPanel x:Name="AxisGroup" VerticalAlignment="Top" HorizontalAlignment="Center"/>
                 </GroupBox>
             </Grid>
-
+            <ucrsorting:UctCurrentPosition Grid.Row="1" x:Name="CurrentPos"/>
+            <GroupBox Header="手动参数设置" Grid.Row="1" Grid.Column="1" Margin="10" >
+                <WrapPanel x:Name="ManualSettingPanel" HorizontalAlignment="Center"/>
+            </GroupBox>
         </Grid>
         <uct:UctAlarmBar Grid.Row="1" x:Name="AlarmRoller" Grid.ColumnSpan="2"/>
+        <StackPanel Grid.Column="1" Grid.Row="1" x:Name="OriginSettingSp">
+            <StackPanel.Resources>
+                <Style TargetType="wpfcontrol:IconButton">
+                    <Setter Property="Margin" Value="20"/>
+                    <Setter Property="FontSize" Value="24"/>
+                    <Setter Property="FontWeight" Value="Bold"/>
+                    <Setter Property="Height" Value="50"/>
+                    <Setter Property="Width" Value="200"/>
+                    <Setter Property="Title" Value="设置开启"/>
+                    <Setter Property="ButtonKind" Value="EditButton"/>
+                    <Setter Property="ButtonStyle" Value="Info"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Value}" Value="1">
+                            <Setter Property="Title" Value="设置关闭"/>
+                            <Setter Property="ButtonStyle" Value="Danger"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+
+
+                </Style>
+                <Style TargetType="StackPanel">
+                    <Setter Property="IsEnabled" Value="False"/>
+                    <Style.Triggers >
+                        <DataTrigger Binding="{Binding Value}" Value="1">
+                            <Setter Property="IsEnabled" Value="True"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </StackPanel.Resources>
+            
+            <GroupBox Header="X轴原点设置">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <wpfcontrol:IconButton  x:Name="XOriginSwitch" Click="RegisterReverse_Click">
+                    </wpfcontrol:IconButton>
+                    <wpfcontrol:IconButton Title="原点确认" ButtonKind="OkButton" x:Name="XOriginConfirm" 
+                                           PreviewMouseDown="OriginConfirm_PreviewMouseDown" PreviewMouseUp="OriginConfirm_PreviewMouseUp"/>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Header="Y轴原点设置">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <wpfcontrol:IconButton ButtonKind="EditButton" x:Name="YOriginSwitch" Click="RegisterReverse_Click">
+                       
+                    </wpfcontrol:IconButton>
+                    <wpfcontrol:IconButton Title="原点确认" ButtonKind="OkButton" x:Name="YOriginConfirm" 
+                                           PreviewMouseDown="OriginConfirm_PreviewMouseDown" PreviewMouseUp="OriginConfirm_PreviewMouseUp"/>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Header="Y1轴原点设置">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <wpfcontrol:IconButton ButtonKind="EditButton" x:Name="Y1OriginSwitch" Click="RegisterReverse_Click">
+                       
+                    </wpfcontrol:IconButton>
+                    <wpfcontrol:IconButton Title="原点确认" ButtonKind="OkButton" x:Name="Y1OriginConfirm"
+                                           PreviewMouseDown="OriginConfirm_PreviewMouseDown" PreviewMouseUp="OriginConfirm_PreviewMouseUp"/>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Header="Z轴原点设置">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <wpfcontrol:IconButton  ButtonKind="EditButton" x:Name="ZOriginSwitch" Click="RegisterReverse_Click">
+                
+                    </wpfcontrol:IconButton>
+                    <wpfcontrol:IconButton Title="原点确认" ButtonKind="OkButton" x:Name="ZOriginConfirm"
+                                           PreviewMouseDown="OriginConfirm_PreviewMouseDown" PreviewMouseUp="OriginConfirm_PreviewMouseUp"/>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Header="旋转轴原点设置">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <wpfcontrol:IconButton  ButtonKind="EditButton" x:Name="AOriginSwitch" Click="RegisterReverse_Click">
+                        
+                    </wpfcontrol:IconButton>
+                    <wpfcontrol:IconButton Title="原点确认" ButtonKind="OkButton" x:Name="AOriginConfirm"
+                                           PreviewMouseDown="OriginConfirm_PreviewMouseDown" PreviewMouseUp="OriginConfirm_PreviewMouseUp"/>
+                </StackPanel>
+            </GroupBox>
+        </StackPanel>
 
 
     </Grid>

SCADA_DAQ/Customer/Views/Menu/UctFrmSorting/UctFrmSortingManual.xaml.cs

@@ -18,6 +18,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using static NPOI.HSSF.Util.HSSFColor;
 
 namespace SCADA_DAQ.Customer.Views.Menu.UctFrmSorting
 {
@@ -41,8 +42,27 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmSorting
             BeltStartBtn.DataContext = plc.GetListenReg(SortMachine.Tag_BeltHighSpeedBtn);
             AutoBtn.DataContext = plc.GetListenReg(SortMachine.Tag_AutoMode);
             ManualBtn.DataContext = plc.GetListenReg(SortMachine.Tag_ManualMode);
-            ManualBtnGrid.DataContext = plc.GetListenReg(SortMachine.Tag_AutoMode);
+            ManualBtnGrid.DataContext = plc.GetListenReg(SortMachine.Tag_ManualMode);
+            OriginSettingSp.DataContext = plc.GetListenReg(SortMachine.Tag_ManualMode);
             AlarmRoller.DataContext = plc;
+            XOriginSwitch.DataContext = plc.GetListenReg(SortMachine.Tag_OriginXSetMode);
+            YOriginSwitch.DataContext = plc.GetListenReg(SortMachine.Tag_OriginYSetMode);
+            Y1OriginSwitch.DataContext = plc.GetListenReg(SortMachine.Tag_OriginY1SetMode);
+            ZOriginSwitch.DataContext = plc.GetListenReg(SortMachine.Tag_OriginZSetMode);
+            AOriginSwitch.DataContext = plc.GetListenReg(SortMachine.Tag_OriginASetMode);
+
+            XOriginConfirm.DataContext = plc.GetListenReg(SortMachine.Tag_OriginXConfirm);
+            YOriginConfirm.DataContext = plc.GetListenReg(SortMachine.Tag_OriginYConfirm);
+            Y1OriginConfirm.DataContext = plc.GetListenReg(SortMachine.Tag_OriginY1Confirm);
+            ZOriginConfirm.DataContext = plc.GetListenReg(SortMachine.Tag_OriginZConfirm);
+            AOriginConfirm.DataContext = plc.GetListenReg(SortMachine.Tag_OriginAConfirm);
+
+            SetVisibility(plc.GetListenReg(SortMachine.Tag_OriginXSetMode));
+            SetVisibility(plc.GetListenReg(SortMachine.Tag_OriginYSetMode));
+            SetVisibility(plc.GetListenReg(SortMachine.Tag_OriginY1SetMode));
+            SetVisibility(plc.GetListenReg(SortMachine.Tag_OriginZSetMode));
+            SetVisibility(plc.GetListenReg(SortMachine.Tag_OriginASetMode));
+
             string[] cupManualStr = new string[]
             {
                 SortMachine.Tag_ACupGetAndPut,
@@ -101,7 +121,17 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmSorting
                 edit.DataContext = plc.GetListenReg(manualSetting[i]);
                 ManualSettingPanel.Children.Add(edit);
             }
+
+            plc.BaseDevice.RegReadValueChanged += BaseDevice_RegReadValueChanged;
         }
+
+        private void BaseDevice_RegReadValueChanged(object sender, RegReadValueChangedEventArgs e)
+        {
+            var reg = (RegInfo)sender;
+            SetVisibility(reg);
+
+        }
+
         public UctFrmSortingManual()
         {
             InitializeComponent();
@@ -135,6 +165,108 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmSorting
             }
         }
 
+
+        public void SetVisibility(RegInfo reg)
+        {
+            if(reg.Comment.Variable == SortMachine.Tag_OriginXSetMode)
+            {
+                if (reg.Value == 1)
+                {
+                    XOriginConfirm.IsEnabled = true;
+                }
+                else
+                {
+                    XOriginConfirm.IsEnabled = false;
+                }
+            }
+            else if (reg.Comment.Variable == SortMachine.Tag_OriginYSetMode)
+            {
+                if (reg.Value == 1)
+                {
+                    YOriginConfirm.IsEnabled = true;
+
+                }
+                else
+                {
+                    YOriginConfirm.IsEnabled = false;
+
+                }
+            }
+            else if (reg.Comment.Variable == SortMachine.Tag_OriginY1SetMode)
+            {
+                if (reg.Value == 1)
+                {
+                    Y1OriginConfirm.IsEnabled = true;
+
+                }
+                else
+                {
+                    Y1OriginConfirm.IsEnabled = false;
+
+                }
+            }
+            else if (reg.Comment.Variable == SortMachine.Tag_OriginZSetMode)
+            {
+                if (reg.Value == 1)
+                {
+                    ZOriginConfirm.IsEnabled = true;
+
+                }
+                else
+                {
+                    ZOriginConfirm.IsEnabled = false;
+
+                }
+            }
+            else if (reg.Comment.Variable == SortMachine.Tag_OriginASetMode)
+            {
+                if (reg.Value == 1)
+                {
+                    AOriginConfirm.IsEnabled = true;
+
+                }
+                else
+                {
+                    AOriginConfirm.IsEnabled = false;
+
+                }
+            }
+        }
+
+        private void RegisterReverse_Click(object sender, RoutedEventArgs e)
+        {
+            var btn = (IconButton)sender;
+            if (btn.DataContext is RegInfo reg)
+            {
+                if (reg.Value == 1)
+                {
+                    reg.WriteReg(0);
+                }
+                else
+                {
+                    reg.WriteReg(1);
+                }
+            }
+        }
+
+
+        private void OriginConfirm_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var btn = sender as IconButton;
+            if (btn.DataContext is RegInfo reg)
+            {
+                reg.SetBit();
+            }
+        }
+
+        private void OriginConfirm_PreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            var btn = sender as IconButton;
+            if (btn.DataContext is RegInfo reg)
+            {
+                reg.ResetBit();
+            }
+        }
     }
 
 }

SCADA_DAQ/Machines/EdgeMachine_封边机.cs

@@ -148,26 +148,26 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_M20="M20";
 			
-		/// <summary>寄存器:D100【D100】
+		/// <summary>寄存器:D80【PassAge】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:</para> 
+		/// <para>备注:通道</para> 
 		/// </summary>
-		public const string @Tag_D100="D100";
+		public const string @Tag_PassAge="PassAge";
 			
-		/// <summary>寄存器:D101【D101】
+		/// <summary>寄存器:D81【TailAfter】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:</para> 
+		/// <para>备注:跟踪</para> 
 		/// </summary>
-		public const string @Tag_D101="D101";
+		public const string @Tag_TailAfter="TailAfter";
 			
-		/// <summary>寄存器:D102【D102】
+		/// <summary>寄存器:D82【Axial】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:</para> 
+		/// <para>备注:压梁</para> 
 		/// </summary>
-		public const string @Tag_D102="D102";
+		public const string @Tag_Axial="Axial";
 			
 		/// <summary>寄存器:D103【D103】
 		/// <para>单位:</para> 

SCADA_DAQ/Machines/LongMen1_龙门移载1.cs

@@ -739,7 +739,7 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <summary>寄存器:M402【ReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:放行气缸</para> 
+		/// <para>备注:放行气缸打开</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder="ReleaseCylinder";
 			
@@ -750,31 +750,31 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_ScanDeliveryManFwdBtn="ScanDeliveryManFwdBtn";
 			
-		/// <summary>寄存器:M507【ScanDeliveryManRevBtn】
+		/// <summary>寄存器:M507【SideDeliveryManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:侧边皮带手动正转</para> 
 		/// </summary>
-		public const string @Tag_ScanDeliveryManRevBtn="ScanDeliveryManRevBtn";
+		public const string @Tag_SideDeliveryManRevBtn="SideDeliveryManRevBtn";
 			
-		/// <summary>寄存器:M506【DiagonalDeliveryManFwdBtn】
+		/// <summary>寄存器:M506【DiagonalDelivery1ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:斜辊1手动正转</para> 
 		/// </summary>
-		public const string @Tag_DiagonalDeliveryManFwdBtn="DiagonalDeliveryManFwdBtn";
+		public const string @Tag_DiagonalDelivery1ManFwdBtn="DiagonalDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M508【DiagonalDeliveryManRevBtn】
+		/// <summary>寄存器:M508【DiagonalDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:斜辊2手动正转</para> 
 		/// </summary>
-		public const string @Tag_DiagonalDeliveryManRevBtn="DiagonalDeliveryManRevBtn";
+		public const string @Tag_DiagonalDelivery2ManFwdBtn="DiagonalDelivery2ManFwdBtn";
 			
 		/// <summary>寄存器:M424【ScanReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:进料挡板气缸</para> 
+		/// <para>备注:进料挡板气缸打开</para> 
 		/// </summary>
 		public const string @Tag_ScanReleaseCylinder="ScanReleaseCylinder";
 			
@@ -851,35 +851,35 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <summary>寄存器:M409【PushLaunchCylinder1】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:推手1压紧轮推出气缸</para> 
+		/// <para>备注:推手1压紧轮推出气缸打开</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder1="PushLaunchCylinder1";
 			
 		/// <summary>寄存器:M411【PushLaunchCylinder2】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:推手2压紧轮推出气缸</para> 
+		/// <para>备注:推手2压紧轮推出气缸打开</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder2="PushLaunchCylinder2";
 			
 		/// <summary>寄存器:M406【PushLaunchCylinder3】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:封边1压轮气缸1</para> 
+		/// <para>备注:封边1压轮气缸1打开</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder3="PushLaunchCylinder3";
 			
 		/// <summary>寄存器:M407【PushLaunchCylinder4】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:封边1压轮气缸2</para> 
+		/// <para>备注:封边1压轮气缸2打开</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder4="PushLaunchCylinder4";
 			
 		/// <summary>寄存器:M412【PushLaunchCylinder5】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:封边1阻挡气缸</para> 
+		/// <para>备注:封边1阻挡气缸打开</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder5="PushLaunchCylinder5";
 			
@@ -942,7 +942,7 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <summary>寄存器:D732【RCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
-		/// <para>备注:R轴当前位置</para> 
+		/// <para>备注:A轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_RCurrentPos="RCurrentPos";
 			
@@ -1037,6 +1037,13 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_Suspend="Suspend";
 			
+		/// <summary>寄存器:M1003【M1003】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:启动</para> 
+		/// </summary>
+		public const string @Tag_M1003="M1003";
+			
 		/// <summary>寄存器:M1011【M1011】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
@@ -1114,12 +1121,12 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_XManualSpeed="XManualSpeed";
 			
-		/// <summary>寄存器:D522【YManualSpeed】
+		/// <summary>寄存器:D522【ZManualSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴手动速度</para> 
 		/// </summary>
-		public const string @Tag_YManualSpeed="YManualSpeed";
+		public const string @Tag_ZManualSpeed="ZManualSpeed";
 			
 		/// <summary>寄存器:D532【AManualSpeed】
 		/// <para>单位:</para> 
@@ -1152,28 +1159,28 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <summary>寄存器:M425【M425】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
-		/// <para>备注:中转台1气缸</para> 
+		/// <para>备注:中转台1气缸打开</para> 
 		/// </summary>
 		public const string @Tag_M425="M425";
 			
 		/// <summary>寄存器:M426【M426】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
-		/// <para>备注:中转台2气缸</para> 
+		/// <para>备注:中转台2气缸打开</para> 
 		/// </summary>
 		public const string @Tag_M426="M426";
 			
 		/// <summary>寄存器:M427【M427】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
-		/// <para>备注:出口靠边皮带气缸</para> 
+		/// <para>备注:出口靠边皮带气缸打开</para> 
 		/// </summary>
 		public const string @Tag_M427="M427";
 			
 		/// <summary>寄存器:M428【M428】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
-		/// <para>备注:NG挡板</para> 
+		/// <para>备注:NG挡板打开</para> 
 		/// </summary>
 		public const string @Tag_M428="M428";
 			
@@ -1316,6 +1323,566 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:通道滚筒5正转</para> 
 		/// </summary>
 		public const string @Tag_M530="M530";
+			
+		/// <summary>寄存器:M800【M800】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1气压低</para> 
+		/// </summary>
+		public const string @Tag_M800="M800";
+			
+		/// <summary>寄存器:M801【M801】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2气压低</para> 
+		/// </summary>
+		public const string @Tag_M801="M801";
+			
+		/// <summary>寄存器:M802【M802】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3气压低</para> 
+		/// </summary>
+		public const string @Tag_M802="M802";
+			
+		/// <summary>寄存器:M803【M803】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门4气压低</para> 
+		/// </summary>
+		public const string @Tag_M803="M803";
+			
+		/// <summary>寄存器:M804【M804】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主控急停按下</para> 
+		/// </summary>
+		public const string @Tag_M804="M804";
+			
+		/// <summary>寄存器:M805【M805】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副控急停按下</para> 
+		/// </summary>
+		public const string @Tag_M805="M805";
+			
+		/// <summary>寄存器:M806【M806】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1急停</para> 
+		/// </summary>
+		public const string @Tag_M806="M806";
+			
+		/// <summary>寄存器:M807【M807】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2急停</para> 
+		/// </summary>
+		public const string @Tag_M807="M807";
+			
+		/// <summary>寄存器:M808【M808】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1故障</para> 
+		/// </summary>
+		public const string @Tag_M808="M808";
+			
+		/// <summary>寄存器:M809【M809】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2故障</para> 
+		/// </summary>
+		public const string @Tag_M809="M809";
+			
+		/// <summary>寄存器:M810【M810】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1接收数据超时</para> 
+		/// </summary>
+		public const string @Tag_M810="M810";
+			
+		/// <summary>寄存器:M811【M811】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1放行未结束</para> 
+		/// </summary>
+		public const string @Tag_M811="M811";
+			
+		/// <summary>寄存器:M812【M812】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1出料感应异常</para> 
+		/// </summary>
+		public const string @Tag_M812="M812";
+			
+		/// <summary>寄存器:M813【M813】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:中转台2有料异常</para> 
+		/// </summary>
+		public const string @Tag_M813="M813";
+			
+		/// <summary>寄存器:M814【M814】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3放行未结束</para> 
+		/// </summary>
+		public const string @Tag_M814="M814";
+			
+		/// <summary>寄存器:M815【M815】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3出料感应异常</para> 
+		/// </summary>
+		public const string @Tag_M815="M815";
+			
+		/// <summary>寄存器:M816【M816】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门4接收数据超市</para> 
+		/// </summary>
+		public const string @Tag_M816="M816";
+			
+		/// <summary>寄存器:M817【M817】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:中转台1有料异常</para> 
+		/// </summary>
+		public const string @Tag_M817="M817";
+			
+		/// <summary>寄存器:M818【M818】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1和龙门4防撞触发</para> 
+		/// </summary>
+		public const string @Tag_M818="M818";
+			
+		/// <summary>寄存器:M819【M819】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2和龙门3防撞触发</para> 
+		/// </summary>
+		public const string @Tag_M819="M819";
+			
+		/// <summary>寄存器:M820【M820】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2和龙门3防撞触发</para> 
+		/// </summary>
+		public const string @Tag_M820="M820";
+			
+		/// <summary>寄存器:M832【M832】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1_X轴报警</para> 
+		/// </summary>
+		public const string @Tag_M832="M832";
+			
+		/// <summary>寄存器:M833【M833】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1_Z轴报警</para> 
+		/// </summary>
+		public const string @Tag_M833="M833";
+			
+		/// <summary>寄存器:M834【M834】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1_A轴报警</para> 
+		/// </summary>
+		public const string @Tag_M834="M834";
+			
+		/// <summary>寄存器:M835【M835】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A封边_靠边1报警</para> 
+		/// </summary>
+		public const string @Tag_M835="M835";
+			
+		/// <summary>寄存器:M836【M836】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A封边_靠边2报警</para> 
+		/// </summary>
+		public const string @Tag_M836="M836";
+			
+		/// <summary>寄存器:M837【M837】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A封边_传送轴报警</para> 
+		/// </summary>
+		public const string @Tag_M837="M837";
+			
+		/// <summary>寄存器:M838【M838】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2_X轴报警</para> 
+		/// </summary>
+		public const string @Tag_M838="M838";
+			
+		/// <summary>寄存器:M839【M839】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2_Z轴报警</para> 
+		/// </summary>
+		public const string @Tag_M839="M839";
+			
+		/// <summary>寄存器:M840【M840】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2_A轴报警</para> 
+		/// </summary>
+		public const string @Tag_M840="M840";
+			
+		/// <summary>寄存器:M841【M841】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3_X轴报警</para> 
+		/// </summary>
+		public const string @Tag_M841="M841";
+			
+		/// <summary>寄存器:M842【M842】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3_Z轴报警</para> 
+		/// </summary>
+		public const string @Tag_M842="M842";
+			
+		/// <summary>寄存器:M843【M843】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3_A轴报警</para> 
+		/// </summary>
+		public const string @Tag_M843="M843";
+			
+		/// <summary>寄存器:M844【M844】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:B封边_靠边1报警</para> 
+		/// </summary>
+		public const string @Tag_M844="M844";
+			
+		/// <summary>寄存器:M845【M845】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:B封边_靠边2报警</para> 
+		/// </summary>
+		public const string @Tag_M845="M845";
+			
+		/// <summary>寄存器:M846【M846】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:B封边_传送轴报警</para> 
+		/// </summary>
+		public const string @Tag_M846="M846";
+			
+		/// <summary>寄存器:M847【M847】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门4_X轴报警</para> 
+		/// </summary>
+		public const string @Tag_M847="M847";
+			
+		/// <summary>寄存器:M848【M848】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门4_Z轴报警</para> 
+		/// </summary>
+		public const string @Tag_M848="M848";
+			
+		/// <summary>寄存器:M849【M849】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门4_A轴报警</para> 
+		/// </summary>
+		public const string @Tag_M849="M849";
+			
+		/// <summary>寄存器:M850【M850】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:进料滚筒报警</para> 
+		/// </summary>
+		public const string @Tag_M850="M850";
+			
+		/// <summary>寄存器:M856【M856】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副17_B斜滚1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M856="M856";
+			
+		/// <summary>寄存器:M857【M857】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副18_B侧皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M857="M857";
+			
+		/// <summary>寄存器:M858【M858】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副19_B斜滚2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M858="M858";
+			
+		/// <summary>寄存器:M859【M859】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副20_龙门3出料皮带2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M859="M859";
+			
+		/// <summary>寄存器:M860【M860】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副21_龙门3出料皮带1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M860="M860";
+			
+		/// <summary>寄存器:M861【M861】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副22_龙门3工位后皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M861="M861";
+			
+		/// <summary>寄存器:M862【M862】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副23_龙门3工位前皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M862="M862";
+			
+		/// <summary>寄存器:M863【M863】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:B封边压轮升降变频报警报警</para> 
+		/// </summary>
+		public const string @Tag_M863="M863";
+			
+		/// <summary>寄存器:M864【M864】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主1_前进料变频报警</para> 
+		/// </summary>
+		public const string @Tag_M864="M864";
+			
+		/// <summary>寄存器:M865【M865】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主2_龙门1工位前皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M865="M865";
+			
+		/// <summary>寄存器:M866【M866】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主3_龙门1工位后皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M866="M866";
+			
+		/// <summary>寄存器:M867【M867】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主4_龙门1出料皮带1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M867="M867";
+			
+		/// <summary>寄存器:M868【M868】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主5_龙门1出料皮带2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M868="M868";
+			
+		/// <summary>寄存器:M869【M869】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主6_A斜滚1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M869="M869";
+			
+		/// <summary>寄存器:M870【M870】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主7_A侧皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M870="M870";
+			
+		/// <summary>寄存器:M871【M871】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主8_A斜滚2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M871="M871";
+			
+		/// <summary>寄存器:M872【M872】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主9_A封边压轮升降变频报警</para> 
+		/// </summary>
+		public const string @Tag_M872="M872";
+			
+		/// <summary>寄存器:M873【M873】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主10_主通道滚筒1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M873="M873";
+			
+		/// <summary>寄存器:M874【M874】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主11_主通道滚筒2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M874="M874";
+			
+		/// <summary>寄存器:M875【M875】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主12_主通道滚筒3变频报警</para> 
+		/// </summary>
+		public const string @Tag_M875="M875";
+			
+		/// <summary>寄存器:M876【M876】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主13_龙门4工位后皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M876="M876";
+			
+		/// <summary>寄存器:M877【M877】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主14_龙门4工位前皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M877="M877";
+			
+		/// <summary>寄存器:M878【M878】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主15_龙门4进料皮带2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M878="M878";
+			
+		/// <summary>寄存器:M879【M879】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主16_龙门4进料皮带1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M879="M879";
+			
+		/// <summary>寄存器:M880【M880】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副1_龙门2进料皮带1变频报警</para> 
+		/// </summary>
+		public const string @Tag_M880="M880";
+			
+		/// <summary>寄存器:M881【M881】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副2_龙门2进料皮带2变频报警</para> 
+		/// </summary>
+		public const string @Tag_M881="M881";
+			
+		/// <summary>寄存器:M882【M882】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副3_龙门2工位前皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M882="M882";
+			
+		/// <summary>寄存器:M883【M883】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副4_龙门2工位后皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M883="M883";
+			
+		/// <summary>寄存器:M884【M884】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副5_龙门2后出料皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M884="M884";
+			
+		/// <summary>寄存器:M885【M885】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副6_龙门2后出料滚筒变频报警</para> 
+		/// </summary>
+		public const string @Tag_M885="M885";
+			
+		/// <summary>寄存器:M886【M886】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副7_龙门2后接驳皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M886="M886";
+			
+		/// <summary>寄存器:M887【M887】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副8_主通道滚筒9变频报警</para> 
+		/// </summary>
+		public const string @Tag_M887="M887";
+			
+		/// <summary>寄存器:M888【M888】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副9_主通道出料靠边皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M888="M888";
+			
+		/// <summary>寄存器:M889【M889】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副10_主通道NG皮带变频报警</para> 
+		/// </summary>
+		public const string @Tag_M889="M889";
+			
+		/// <summary>寄存器:M890【M890】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副11_主通道滚筒8变频报警</para> 
+		/// </summary>
+		public const string @Tag_M890="M890";
+			
+		/// <summary>寄存器:M891【M891】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副12_主通道滚筒7变频报警</para> 
+		/// </summary>
+		public const string @Tag_M891="M891";
+			
+		/// <summary>寄存器:M892【M892】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副13_主通道滚筒6变频报警</para> 
+		/// </summary>
+		public const string @Tag_M892="M892";
+			
+		/// <summary>寄存器:M893【M893】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副14_主通道滚筒5变频报警</para> 
+		/// </summary>
+		public const string @Tag_M893="M893";
+			
+		/// <summary>寄存器:M894【M894】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副15_主通道滚筒4变频报警</para> 
+		/// </summary>
+		public const string @Tag_M894="M894";
+			
+		/// <summary>寄存器:M895【M895】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副16_变频报警</para> 
+		/// </summary>
+		public const string @Tag_M895="M895";
 						
 	}
 }

SCADA_DAQ/Machines/LongMen2_龙门移载2.cs

@@ -393,47 +393,47 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M518【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M518【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
+		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M519【GantryDelivery2ManFwdBtn】
+		/// <summary>寄存器:M519【GantryDelivery3ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
+		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
 			
-		/// <summary>寄存器:M520【GantryDelivery2ManRevBtn】
+		/// <summary>寄存器:M520【GantryDelivery4ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
+		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
 			
-		/// <summary>寄存器:M522【GantryDelivery3ManFwdBtn】
+		/// <summary>寄存器:M522【GantryDelivery5ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送5手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
+		public const string @Tag_GantryDelivery5ManFwdBtn="GantryDelivery5ManFwdBtn";
 			
-		/// <summary>寄存器:M521【GantryDelivery3ManRevBtn】
+		/// <summary>寄存器:M521【GantryDelivery6ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送6手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery3ManRevBtn="GantryDelivery3ManRevBtn";
+		public const string @Tag_GantryDelivery6ManFwdBtn="GantryDelivery6ManFwdBtn";
 			
-		/// <summary>寄存器:M523【GantryDelivery4ManFwdBtn】
+		/// <summary>寄存器:M523【GantryDelivery7ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送7手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
+		public const string @Tag_GantryDelivery7ManFwdBtn="GantryDelivery7ManFwdBtn";
 			
 		/// <summary>寄存器:M1113【GantryDelivery4ManRevBtn】
 		/// <para>单位:</para> 
@@ -529,14 +529,14 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <summary>寄存器:M404【ReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:放行气缸</para> 
+		/// <para>备注:放行气缸打开</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder="ReleaseCylinder";
 			
 		/// <summary>寄存器:M405【ReleaseCylinder1】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:放行皮带升降</para> 
+		/// <para>备注:皮带升降气缸打开</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder1="ReleaseCylinder1";
 			
@@ -645,12 +645,12 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_XManualSpeed="XManualSpeed";
 			
-		/// <summary>寄存器:D582【ZManulaSpeed】
+		/// <summary>寄存器:D582【ZManualSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴手动速度</para> 
 		/// </summary>
-		public const string @Tag_ZManulaSpeed="ZManulaSpeed";
+		public const string @Tag_ZManualSpeed="ZManualSpeed";
 			
 		/// <summary>寄存器:D592【AManualSpeed】
 		/// <para>单位:</para> 

SCADA_DAQ/Machines/LongMen3_龙门移载3.cs

@@ -330,47 +330,47 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M538【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M538【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
+		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M536【GantryDelivery2ManFwdBtn】
+		/// <summary>寄存器:M536【GantryDelivery3ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
+		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
 			
-		/// <summary>寄存器:M537【GantryDelivery2ManRevBtn】
+		/// <summary>寄存器:M537【GantryDelivery4ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
+		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
 			
-		/// <summary>寄存器:M534【GantryDelivery3ManFwdBtn】
+		/// <summary>寄存器:M534【SideDeliveryManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:侧皮带手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
+		public const string @Tag_SideDeliveryManFwdBtn="SideDeliveryManFwdBtn";
 			
-		/// <summary>寄存器:M1020【GantryDelivery3ManRevBtn】
+		/// <summary>寄存器:M1020【GantryDelivery6ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送6手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery3ManRevBtn="GantryDelivery3ManRevBtn";
+		public const string @Tag_GantryDelivery6ManFwdBtn="GantryDelivery6ManFwdBtn";
 			
-		/// <summary>寄存器:M1021【GantryDelivery4ManFwdBtn】
+		/// <summary>寄存器:M1021【GantryDelivery7ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送7手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
+		public const string @Tag_GantryDelivery7ManFwdBtn="GantryDelivery7ManFwdBtn";
 			
 		/// <summary>寄存器:M1214【GantryDelivery4ManRevBtn】
 		/// <para>单位:</para> 
@@ -466,7 +466,7 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <summary>寄存器:M414【ReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:放行气缸</para> 
+		/// <para>备注:放行气缸打开</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder="ReleaseCylinder";
 			

SCADA_DAQ/Machines/LongMen4_龙门移载4.cs

@@ -309,55 +309,27 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M515【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M515【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
-		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
-			
-		/// <summary>寄存器:M514【GantryDelivery2ManFwdBtn】
-		/// <para>单位:</para> 
-		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送3手动正转</para> 
-		/// </summary>
 		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M513【GantryDelivery2ManRevBtn】
-		/// <para>单位:</para> 
-		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送4手动正转</para> 
-		/// </summary>
-		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
-			
-		/// <summary>寄存器:M1311【GantryDelivery3ManFwdBtn】
+		/// <summary>寄存器:M514【GantryDelivery3ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
 			
-		/// <summary>寄存器:M1312【GantryDelivery3ManRevBtn】
-		/// <para>单位:</para> 
-		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送3手动反转</para> 
-		/// </summary>
-		public const string @Tag_GantryDelivery3ManRevBtn="GantryDelivery3ManRevBtn";
-			
-		/// <summary>寄存器:M1313【GantryDelivery4ManFwdBtn】
+		/// <summary>寄存器:M513【GantryDelivery4ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
 			
-		/// <summary>寄存器:M1314【GantryDelivery4ManRevBtn】
-		/// <para>单位:</para> 
-		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送4手动反转</para> 
-		/// </summary>
-		public const string @Tag_GantryDelivery4ManRevBtn="GantryDelivery4ManRevBtn";
-			
 		/// <summary>寄存器:M460【GantryVacuumValve1Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 

SCADA_DAQ/Machines/SortMachine_分拣机.cs

@@ -631,7 +631,7 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_CupIndex="CupIndex";
 			
-		/// <summary>寄存器:D1520【Thickness】
+		/// <summary>寄存器:D1056【Thickness】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:吸板厚度</para> 
@@ -1281,6 +1281,76 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:最后一张板放板完成</para> 
 		/// </summary>
 		public const string @Tag_LastBoardPutOK="LastBoardPutOK";
+			
+		/// <summary>寄存器:D1058【OriginXSetMode】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:X原点设置打开</para> 
+		/// </summary>
+		public const string @Tag_OriginXSetMode="OriginXSetMode";
+			
+		/// <summary>寄存器:D1059【OriginYSetMode】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Y原点设置打开</para> 
+		/// </summary>
+		public const string @Tag_OriginYSetMode="OriginYSetMode";
+			
+		/// <summary>寄存器:D1060【OriginY1SetMode】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Y1原点设置打开</para> 
+		/// </summary>
+		public const string @Tag_OriginY1SetMode="OriginY1SetMode";
+			
+		/// <summary>寄存器:D1061【OriginZSetMode】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Z原点设置打开</para> 
+		/// </summary>
+		public const string @Tag_OriginZSetMode="OriginZSetMode";
+			
+		/// <summary>寄存器:D1062【OriginASetMode】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:旋转轴原点设置打开</para> 
+		/// </summary>
+		public const string @Tag_OriginASetMode="OriginASetMode";
+			
+		/// <summary>寄存器:M1023【OriginXConfirm】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:X原点设置确认</para> 
+		/// </summary>
+		public const string @Tag_OriginXConfirm="OriginXConfirm";
+			
+		/// <summary>寄存器:M1024【OriginYConfirm】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Y原点设置确认</para> 
+		/// </summary>
+		public const string @Tag_OriginYConfirm="OriginYConfirm";
+			
+		/// <summary>寄存器:M1025【OriginY1Confirm】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Y1原点设置确认</para> 
+		/// </summary>
+		public const string @Tag_OriginY1Confirm="OriginY1Confirm";
+			
+		/// <summary>寄存器:M1026【OriginZConfirm】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Z原点设置确认</para> 
+		/// </summary>
+		public const string @Tag_OriginZConfirm="OriginZConfirm";
+			
+		/// <summary>寄存器:M1027【OriginAConfirm】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A原点设置确认</para> 
+		/// </summary>
+		public const string @Tag_OriginAConfirm="OriginAConfirm";
 						
 	}
 }

SCADA_DAQ/Machines/SortingDeliveryMachine_开料分拣输送.cs

@@ -1058,12 +1058,12 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_LeftoversTranslateLowSpeed="LeftoversTranslateLowSpeed";
 			
-		/// <summary>寄存器:D780【2#TranslateSpeed】
+		/// <summary>寄存器:D779【2#TranslateHighSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:平移2频率</para> 
+		/// <para>备注:平移2高速</para> 
 		/// </summary>
-		public const string @Tag_2_TranslateSpeed="2#TranslateSpeed";
+		public const string @Tag_2_TranslateHighSpeed="2#TranslateHighSpeed";
 			
 		/// <summary>寄存器:D782【3#TranslateHighSpeed】
 		/// <para>单位:</para> 
@@ -1435,6 +1435,13 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:</para> 
 		/// </summary>
 		public const string @Tag_WriteLeftLoversOrAbnormal="WriteLeftLoversOrAbnormal";
+			
+		/// <summary>寄存器:D902【2#TranslateLowSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:平移2低速</para> 
+		/// </summary>
+		public const string @Tag_2_TranslateLowSpeed="2#TranslateLowSpeed";
 						
 	}
 }