增加板件查询界面

SCADA_DAQ/Customer/Machines/SortMachine.cs

@@ -157,6 +157,39 @@ namespace SCADA_DAQ.Customer.Machines
         }
         private string _CurrentCycDoc;
 
+        /// <summary>
+        /// 吸盘1中心点坐标
+        /// </summary>
+        public Point Cup1Center = new Point((int)CustomerEnv.SortingMacConfigValue.Cup1OriginOffset.X,
+                                                (int)CustomerEnv.SortingMacConfigValue.Cup1OriginOffset.Y);
+
+        /// <summary>
+        /// 吸盘2中心点坐标
+        /// </summary>
+        public Point Cup3Center = new Point((int)CustomerEnv.SortingMacConfigValue.Cup2OriginOffset.X,
+                                    (int)CustomerEnv.SortingMacConfigValue.Cup2OriginOffset.Y);
+
+
+        /// <summary>
+        /// 旋转1后新坐标
+        /// </summary>
+        public Point CupNewCenter
+        {
+            get { return _CupNewCenter; }
+            set
+            {
+                if (value != _CupNewCenter)
+                {
+                    _CupNewCenter = value;
+                    OnPropertyChanged(nameof(CupNewCenter));
+                }
+            }
+        }
+        private Point _CupNewCenter;
+
+
+
+
 
         /// <summary>
         /// 
@@ -262,13 +295,10 @@ namespace SCADA_DAQ.Customer.Machines
                     CenterY = (double)CurrentLabel.CenterY;
                     BoardInfo.CupCenter = new Point(CenterX, CenterY);
                     //修改前
-                    //var cup1Center = new Point(-140, -155);
-                    //var cup3Center = new Point(135, -155);
+                    //var Cup1Center = new Point(-140, -155);
+                    //var Cup3Center = new Point(135, -155);
                     //修改后
-                    var cup1Center = new Point((int)CustomerEnv.SortingMacConfigValue.Cup1OriginOffset.X,
-                                                (int)CustomerEnv.SortingMacConfigValue.Cup1OriginOffset.Y);
-                    var cup3Center = new Point((int)CustomerEnv.SortingMacConfigValue.Cup2OriginOffset.X,
-                                                (int)CustomerEnv.SortingMacConfigValue.Cup2OriginOffset.Y);
+                    
 
                     if ((CurrentLabel.ActualLength > 550 && CurrentLabel.ActualWidth > 200) ||
                         (CurrentLabel.ActualWidth > 550 && CurrentLabel.ActualLength > 200)
@@ -288,7 +318,7 @@ namespace SCADA_DAQ.Customer.Machines
                             //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 140;
 
                         }
-
+                        CupNewCenter = new Point(0, 0);
                     }
                     else
                     {
@@ -308,17 +338,19 @@ namespace SCADA_DAQ.Customer.Machines
                             {
                                 if (CurrentLabel.ActualLength >= CurrentLabel.ActualWidth)
                                 {
-                                    var cup1NewCenter = new Point(cup1Center.X, cup1Center.Y);  //旋转后的坐标
+                                    var cup1NewCenter = new Point(Cup1Center.X, Cup1Center.Y);  //旋转后的坐标
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup1NewCenter.X, BoardInfo.CupCenter.Y - cup1NewCenter.Y);
                                     BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 180;
+                                    CupNewCenter = cup1NewCenter;
                                     //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 170;
                                 }
                             }
                             else
                             {
                                 BoardInfo.Rotation = 90;
-                                var cup1NewCenter = new Point(cup1Center.Y,-1 * (double)cup1Center.X);  //旋转后的坐标
-                                                                                                         //cup3NewCenter.Offset(100, 32.5);   //补偿夹具尺寸
+                                var cup1NewCenter = new Point(Cup1Center.Y,-1 * (double)Cup1Center.X);  //旋转后的坐标
+                                CupNewCenter = cup1NewCenter;
+                                //cup3NewCenter.Offset(100, 32.5);   //补偿夹具尺寸
                                 BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup1NewCenter.X, BoardInfo.CupCenter.Y - cup1NewCenter.Y);
                                 //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2;
                                 BoardInfo.ReleaseY = CurrentLabel.ActualLength / 2 - 180;
@@ -335,21 +367,26 @@ namespace SCADA_DAQ.Customer.Machines
                                 if (CurrentLabel.ActualLength < CurrentLabel.ActualWidth)
                                 {
                                     BoardInfo.Rotation = -90;
-                                    var cup3NewCenter = new Point(cup3Center.Y * -1,(double)cup3Center.X);  //旋转后的坐标
+                                    var cup3NewCenter = new Point(Cup3Center.Y * -1,(double)Cup3Center.X);  //旋转后的坐标
                                     BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup3NewCenter.X, BoardInfo.CupCenter.Y - cup3NewCenter.Y);
+                                    CupNewCenter = cup3NewCenter;
+
                                 }
                                 //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2;
                                 BoardInfo.ReleaseY = CurrentLabel.ActualLength / 2 - 180;
+
                                 //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 20;
 
 
                             }
                             else
                             {
-                                var cup3NewCenter = new Point(cup3Center.X, (double)cup3Center.Y);  //旋转后的坐标
+                                var cup3NewCenter = new Point(Cup3Center.X, (double)Cup3Center.Y);  //旋转后的坐标
                                 BoardInfo.CupCenter = new Point(BoardInfo.CupCenter.X - cup3NewCenter.X, BoardInfo.CupCenter.Y - cup3NewCenter.Y);
                                 //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 + 500;
                                 BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 30;
+                                CupNewCenter = cup3NewCenter;
+
                                 //BoardInfo.ReleaseY = CurrentLabel.ActualWidth / 2 - 20;
 
                             }
@@ -365,16 +402,17 @@ namespace SCADA_DAQ.Customer.Machines
                     GetListenReg(Tag_PhotographX).WriteObject(null,
                     (float)(CurrentLabel.X > originXOffset ? CurrentLabel.X - originXOffset : 0),
                     (float)(CurrentLabel.Y - cameraOriginy), (short)1);
-                    CurrentLabel.Status = Models.TaskStatus.Excuting;
-                    if (CurrentLabel == _Lbls.Last())
+                    if (CurrentLabel == _Lbls.Where(t=>t.Status == Models.TaskStatus.None).Last())
                     {
                         System.Threading.Thread.Sleep(1000);
                         GetListenReg(Tag_SortFinish).SetBit();
                     }
-                }              
+                    CurrentLabel.Status = Models.TaskStatus.Excuting;
+
+                }
                 else
                 {
-                    MessageBox.Show("板件已经分拣完成！！！");
+                    MessageBox.Show("板件已经分拣完成！！！"); 
                 }
 
                 reg.ResetBit();
@@ -398,6 +436,7 @@ namespace SCADA_DAQ.Customer.Machines
                             {
                                 _lbl = JsonHelper.JsonDeserialize<LabelModel>(_strContent);  //获取标签位置
                                 log.Info($"相机计算的偏差值为:X={_lbl.X},Y={_lbl.Y},R={_lbl.R}");
+                                _lbl.X += CustomerEnv.SortingMacConfigValue.XCameraOffset;
                             }
                             else
                             {
@@ -421,17 +460,18 @@ namespace SCADA_DAQ.Customer.Machines
                             if (ex.Source == "Newtonsoft.Json")
                             {
                                 var path = ((JsonReaderException)ex).Path;
-                                if (MessageBox.Show($"相机数据中属性“{path}”数据错误 \n 是否继续？", "相机数据", MessageBoxButton.YesNo) == MessageBoxResult.No)
-                                {
-                                    isCancel = true;
-                                    CurrentLabel.Status = Models.TaskStatus.None;
-                                    GetListenReg(Tag_Reset).SetBit();
-                                }
-                                else
-                                {
-                                    _lbl.ID = CurrentLabel.ID;
+                                _lbl.ID = CurrentLabel.ID;
 
+                                if (!CustomerEnv.SortingMacConfigValue.IsCameraFailForceRun)
+                                {
+                                    if (MessageBox.Show($"相机数据中属性“{path}”数据错误 \n 是否继续？", "相机数据", MessageBoxButton.YesNo) == MessageBoxResult.No)
+                                    {
+                                        isCancel = true;
+                                        CurrentLabel.Status = Models.TaskStatus.None;
+                                        GetListenReg(Tag_Reset).SetBit();
+                                    }
                                 }
+                                
                             }
 
 
@@ -462,7 +502,28 @@ namespace SCADA_DAQ.Customer.Machines
 
                         var moveX = (float)((double)_lbl.X + BoardInfo.CupCenter.X);
                         moveX = moveX > originXOffset ? moveX - originXOffset : 0;
-                        var moveY = (float)((double)_lbl.Y + BoardInfo.CupCenter.Y);                       
+                        var moveY = (float)((double)_lbl.Y + BoardInfo.CupCenter.Y);
+                        var xOffset = 0d;
+                        var yOffset = 0d;
+
+                        if (BoardInfo.CupIndex == 1 || BoardInfo.CupIndex == 3)
+                        {
+                            var angle = 2 * Math.PI / 360 * (double)_lbl.R * -1;
+                            //var angle = (double)_lbl.R * -1;
+
+                            //90°旋转为顺时针，-90为逆时针
+                            //逆时针计算公式:x1 = xcos()-ysin(),y1=xsin()+ycos();
+                            //顺时针计算公式：将上述的角度改成负数
+
+                            //var b = 90 - Math.Abs((double)_lbl.R);
+                            //var cupCenter = BoardInfo.CupIndex == 1 ? Cup1Center : Cup3Center;
+                            xOffset = CupNewCenter.X - (CupNewCenter.X * Math.Cos(angle) - CupNewCenter.Y * Math.Sin(angle));
+                            yOffset = CupNewCenter.Y - (CupNewCenter.X * Math.Sin(angle) + CupNewCenter.Y * Math.Cos(angle));
+                        }
+                        
+
+                        //var xoffset = Math.Sin(a) * (double)CurrentLabel.ActualLength;
+                        //var yoffset = Math.Sin(angle) * (double)CurrentLabel.ActualWidth;
                         if (moveX < GetListenReg(Tag_XMaxLimitPos).ScaleValue && moveY < 2800)
                         {
                             if (Math.Max(CurrentLabel.ActualLength, CurrentLabel.ActualWidth) >= 1500)
@@ -474,8 +535,8 @@ namespace SCADA_DAQ.Customer.Machines
                                 releaseXOffset -= 200;
                             }
                             GetListenReg(Tag_CaptureX).WriteObject(null,
-                            moveX,  //D1512
-                            moveY,  //D1514
+                            moveX + (float)xOffset,  //D1512
+                            moveY + (float)yOffset,  //D1514
                             (float)rotation,     //D1516
                             (short)1, // D1518
                             (short)BoardInfo.CupIndex,  // D1519.

SCADA_DAQ/Customer/Models/BoardInfoQueryModel.cs

@@ -0,0 +1,46 @@
+using DBNames;
+using SCADA.CommonLib;
+using SCADA.CommonLib.CommonModel;
+using SCADA.CommonLib.Data.DIL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SCADA_DAQ.Customer.Models
+{
+    public class BoardInfoQueryModel : BaseQuery
+    {
+        public BoardInfoQueryModel() : base(Env.DAL.App_Hold_BoardInfo)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [AutoViewProperty("生产时间", Icon = "CalendarRange")]
+        [Query("CreateTime_Dt")]
+        public DateRange StartTime { get; set; } = new DateRange(Env.Schedual);
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [AutoViewProperty("产品条码", Icon = "BarcodeScan")]
+        [Query(T_Col_Name.App_Hold_BoardInfo.BoardID_Str)]
+        public string Barcode
+        {
+            get { return _Barcode; }
+            set
+            {
+                if (value != _Barcode)
+                {
+                    _Barcode = value;
+                    OnPropertyChanged(nameof(Barcode));
+                }
+            }
+        }
+        private string _Barcode;
+    }
+}

SCADA_DAQ/Customer/Models/SortingModel/SortingMacSettingModel.cs

@@ -172,6 +172,28 @@ namespace SCADA_DAQ.Customer.Models.SortingModel
         private string _CycFilePath;
 
 
+        /// <summary>
+        /// 拍照失败是否强制执行
+        /// </summary>
+        /// 
+        [AutoViewProperty("拍照失败是否强制执行", Icon = "CameraRetake")]
+
+        public bool IsCameraFailForceRun
+        {
+            get { return _IsCameraFailForceRun; }
+            set
+            {
+                if (value != _IsCameraFailForceRun)
+                {
+                    _IsCameraFailForceRun = value;
+                    OnPropertyChanged(nameof(IsCameraFailForceRun));
+                }
+            }
+        }
+        private bool _IsCameraFailForceRun;
+
+
+
 
 
 

SCADA_DAQ/Customer/Service/ScannerService.cs

@@ -73,9 +73,9 @@ namespace SCADA_DAQ.Customer.Service
             var width = 66;
             //var a = Math.Min(66m,100m) / Math.Max(66m,100m);
             //var a = Env.DAL.App_Hold_BoardInfo.GetData<BoardTaskModel>();
-                                                        //try
-                                                        //{
-                                                        //    _tcpComm = new TcpComm("192.168.23.81",60000);
+            //try
+            //{
+            //    _tcpComm = new TcpComm("192.168.23.81",60000);
 
             //}
             //catch (Exception)
@@ -109,7 +109,8 @@ namespace SCADA_DAQ.Customer.Service
             var barcode = e.Barcode;
             Plc1.GetListenReg(SortingDeliveryMachine.Tag_CodeMatch).WriteReg(0);
 
-            var barcodeTask = BoardTasks.Where(t => t.BoardID == barcode).FirstOrDefault();
+            //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)
             {

SCADA_DAQ/Customer/UctFrmBoardInfoQuery.cs

@@ -0,0 +1,26 @@
+using SCADA.CommonCtrl.WpfControl;
+using SCADA_DAQ.Customer.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SCADA_DAQ.Customer
+{
+
+    [UctMenu("板件信息查询", Icon = "查询")]
+
+    public class UctFrmBoardInfoQuery : CommonQueryFrm<BoardInfoQueryModel,BoardTaskModel>
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// 
+
+        public UctFrmBoardInfoQuery()
+        {
+            DAL = Env.DAL;
+        }
+    }
+}

SCADA_DAQ/Customer/Views/Menu/UctFrmGantry/UctFrmGantryMain.xaml.cs

@@ -39,8 +39,8 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmGantry
             MainGantry.LeftGantry.DataContext = _PLC1;
             MainGantry.RightGantry.DataContext = _PLC4;
             AutoBtn.DataContext = _PLC1.GetListenReg(LongMen1.Tag_AutoMode);
-            ManualBtn.DataContext = _PLC1.GetListenReg(LongMen1.Tag_ManualMode);
-            OriginBtn.DataContext = _PLC1.GetListenReg(LongMen1.Tag_OriginMode);
+            //ManualBtn.DataContext = _PLC1.GetListenReg(LongMen1.Tag_ManualMode);
+            //OriginBtn.DataContext = _PLC1.GetListenReg(LongMen1.Tag_OriginMode);
             for (int i = 0; i < 10; i++)
             {
                 ((Rectangle)(ViceGantry.LeftGantry.Valves.Children[i])).DataContext = _PLC2.GetListenReg($"CupValve{i + 1}");

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

@@ -268,13 +268,19 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmSorting
 
                     });
                 }
+                else if (reg == plc.GetListenReg(SortMachine.Tag_ManualStart))
+                {
+                    plc.GetListenReg(SortMachine.Tag_SingleModeSort).WriteReg(CustomerEnv.SortingMacConfigValue.IsConnectToCuttingMac == false ? 1 : 0);
+                    reg.WriteReg(1);
+
+                }
                 else
                 {
                     reg.WriteReg(1);
                 }
             }
         }
-
+         
         private void PauseBtn_Click(object sender, RoutedEventArgs e)
         {
             var btn = sender as IconButton;

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

@@ -59,7 +59,7 @@ namespace SCADA_DAQ.Customer.Views.Menu.UctFrmSorting
                 SortMachine.Tag_Y1ManualRev,
                 SortMachine.Tag_ZManualFwd,
                 SortMachine.Tag_ZManualRev,
-                  SortMachine.Tag_AManualFwd,
+                SortMachine.Tag_AManualFwd,
                 SortMachine.Tag_AManualRev,
             };
             string[] manualSetting = new string[]

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

@@ -274,12 +274,12 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_D117="D117";
 			
-		/// <summary>寄存器:D118【D118】
+		/// <summary>寄存器:D118【BarCodeNoRead】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:</para> 
 		/// </summary>
-		public const string @Tag_D118="D118";
+		public const string @Tag_BarCodeNoRead="BarCodeNoRead";
 			
 		/// <summary>寄存器:D119【D119】
 		/// <para>单位:</para> 
@@ -505,300 +505,384 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_D150="D150";
 			
-		/// <summary>寄存器:D171【BarCodeNoRead】
+		/// <summary>寄存器:D171【D171】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:</para> 
 		/// </summary>
-		public const string @Tag_BarCodeNoRead="BarCodeNoRead";
+		public const string @Tag_D171="D171";
+			
+		/// <summary>寄存器:D510.0【XManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:X轴使能</para> 
+		/// </summary>
+		public const string @Tag_XManualPowerBtn="XManualPowerBtn";
+			
+		/// <summary>寄存器:D520.0【ZManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Z轴使能</para> 
+		/// </summary>
+		public const string @Tag_ZManualPowerBtn="ZManualPowerBtn";
+			
+		/// <summary>寄存器:D530.0【AManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A轴使能</para> 
+		/// </summary>
+		public const string @Tag_AManualPowerBtn="AManualPowerBtn";
+			
+		/// <summary>寄存器:D540.0【F1ManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:推手1轴使能</para> 
+		/// </summary>
+		public const string @Tag_F1ManualPowerBtn="F1ManualPowerBtn";
+			
+		/// <summary>寄存器:D550.0【F2ManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:推手2轴使能</para> 
+		/// </summary>
+		public const string @Tag_F2ManualPowerBtn="F2ManualPowerBtn";
+			
+		/// <summary>寄存器:D560.0【SManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:输送轴使能</para> 
+		/// </summary>
+		public const string @Tag_SManualPowerBtn="SManualPowerBtn";
 			
-		/// <summary>寄存器:M1014【XManualFwdBtn】
+		/// <summary>寄存器:D510.3【XManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_XManualFwdBtn="XManualFwdBtn";
 			
-		/// <summary>寄存器:M1015【XManualRevBtn】
+		/// <summary>寄存器:D510.4【XManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_XManualRevBtn="XManualRevBtn";
 			
-		/// <summary>寄存器:M1012【ZManualFwdBtn】
+		/// <summary>寄存器:D520.3【ZManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_ZManualFwdBtn="ZManualFwdBtn";
 			
-		/// <summary>寄存器:M1013【ZManualRevBtn】
+		/// <summary>寄存器:D520.4【ZManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_ZManualRevBtn="ZManualRevBtn";
 			
-		/// <summary>寄存器:M1010【AManualFwdBtn】
+		/// <summary>寄存器:D530.3【AManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_AManualFwdBtn="AManualFwdBtn";
 			
-		/// <summary>寄存器:M1011【AManualRevBtn】
+		/// <summary>寄存器:D530.4【AManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_AManualRevBtn="AManualRevBtn";
 			
-		/// <summary>寄存器:M1016【GantryDelivery1ManFwdBtn】
+		/// <summary>寄存器:M502【GantryDelivery1ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送1手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M1017【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M1【GantryDelivery1ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送1手动反转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
 			
-		/// <summary>寄存器:M1018【GantryDelivery2ManFwdBtn】
+		/// <summary>寄存器:M503【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M1019【GantryDelivery2ManRevBtn】
+		/// <summary>寄存器:M2【GantryDelivery2ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送2手动反转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
 			
-		/// <summary>寄存器:M1050【GantryDelivery3ManFwdBtn】
+		/// <summary>寄存器:M504【GantryDelivery3ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
 			
-		/// <summary>寄存器:M1051【GantryDelivery3ManRevBtn】
+		/// <summary>寄存器:M3【GantryDelivery3ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送3手动反转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManRevBtn="GantryDelivery3ManRevBtn";
 			
-		/// <summary>寄存器:M1052【GantryDelivery4ManFwdBtn】
+		/// <summary>寄存器:M505【GantryDelivery4ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
 			
-		/// <summary>寄存器:M1053【GantryDelivery4ManRevBtn】
+		/// <summary>寄存器:M98【GantryDelivery4ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送4手动反转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManRevBtn="GantryDelivery4ManRevBtn";
 			
-		/// <summary>寄存器:M1030【GantryVacuumValve1Btn】
+		/// <summary>寄存器:M430【GantryVacuumValve1Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀1打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve1Btn="GantryVacuumValve1Btn";
 			
-		/// <summary>寄存器:M1031【GantryVacuumValve2Btn】
+		/// <summary>寄存器:M431【GantryVacuumValve2Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀2打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve2Btn="GantryVacuumValve2Btn";
 			
-		/// <summary>寄存器:M1032【GantryVacuumValve3Btn】
+		/// <summary>寄存器:M432【GantryVacuumValve3Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀3打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve3Btn="GantryVacuumValve3Btn";
 			
-		/// <summary>寄存器:M1033【GantryVacuumValve4Btn】
+		/// <summary>寄存器:M433【GantryVacuumValve4Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀4打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve4Btn="GantryVacuumValve4Btn";
 			
-		/// <summary>寄存器:M1034【GantryVacuumValve5Btn】
+		/// <summary>寄存器:M434【GantryVacuumValve5Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀5打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve5Btn="GantryVacuumValve5Btn";
 			
-		/// <summary>寄存器:M1035【GantryVacuumValve6Btn】
+		/// <summary>寄存器:M435【GantryVacuumValve6Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀6打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve6Btn="GantryVacuumValve6Btn";
 			
-		/// <summary>寄存器:M1036【GantryVacuumValve7Btn】
+		/// <summary>寄存器:M436【GantryVacuumValve7Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀7打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve7Btn="GantryVacuumValve7Btn";
 			
-		/// <summary>寄存器:M1037【GantryVacuumValve8Btn】
+		/// <summary>寄存器:M437【GantryVacuumValve8Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀8打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve8Btn="GantryVacuumValve8Btn";
 			
-		/// <summary>寄存器:M1038【GantryVacuumValve9Btn】
+		/// <summary>寄存器:M438【GantryVacuumValve9Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀9打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve9Btn="GantryVacuumValve9Btn";
 			
-		/// <summary>寄存器:M1039【GantryDestructionValveBtn】
+		/// <summary>寄存器:M470【GantryVacuumValve10Btn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:真空阀全打开</para> 
+		/// </summary>
+		public const string @Tag_GantryVacuumValve10Btn="GantryVacuumValve10Btn";
+			
+		/// <summary>寄存器:M439【GantryDestructionValveBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:破坏阀打开</para> 
 		/// </summary>
 		public const string @Tag_GantryDestructionValveBtn="GantryDestructionValveBtn";
 			
-		/// <summary>寄存器:M1054【Side-thrustCylinder】
+		/// <summary>寄存器:M401【Side-thrustCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:侧推气缸打开</para> 
 		/// </summary>
 		public const string @Tag_Side_thrustCylinder="Side-thrustCylinder";
 			
-		/// <summary>寄存器:M1055【ReleaseCylinder】
+		/// <summary>寄存器:M402【ReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:放行气缸</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder="ReleaseCylinder";
 			
-		/// <summary>寄存器:M1056【ScanDeliveryManFwdBtn】
+		/// <summary>寄存器:M501【ScanDeliveryManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:扫码滚筒手动正转</para> 
 		/// </summary>
 		public const string @Tag_ScanDeliveryManFwdBtn="ScanDeliveryManFwdBtn";
 			
-		/// <summary>寄存器:M1057【ScanDeliveryManRevBtn】
+		/// <summary>寄存器:M507【ScanDeliveryManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:扫码滚筒手动反转</para> 
+		/// <para>备注:侧边皮带手动正转</para> 
 		/// </summary>
 		public const string @Tag_ScanDeliveryManRevBtn="ScanDeliveryManRevBtn";
 			
-		/// <summary>寄存器:M1058【DiagonalDeliveryManFwdBtn】
+		/// <summary>寄存器:M506【DiagonalDeliveryManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:斜辊手动正转</para> 
+		/// <para>备注:斜辊1手动正转</para> 
 		/// </summary>
 		public const string @Tag_DiagonalDeliveryManFwdBtn="DiagonalDeliveryManFwdBtn";
 			
-		/// <summary>寄存器:M1059【DiagonalDeliveryManRevBtn】
+		/// <summary>寄存器:M508【DiagonalDeliveryManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:斜辊手动反转</para> 
+		/// <para>备注:斜辊2手动正转</para> 
 		/// </summary>
 		public const string @Tag_DiagonalDeliveryManRevBtn="DiagonalDeliveryManRevBtn";
 			
-		/// <summary>寄存器:M1060【ScanReleaseCylinder】
+		/// <summary>寄存器:M424【ScanReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:扫码放行气缸</para> 
+		/// <para>备注:进料挡板气缸</para> 
 		/// </summary>
 		public const string @Tag_ScanReleaseCylinder="ScanReleaseCylinder";
 			
-		/// <summary>寄存器:M344【PushDownCylinder1】
+		/// <summary>寄存器:M408【PushDownCylinder1】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手下压气缸1</para> 
 		/// </summary>
 		public const string @Tag_PushDownCylinder1="PushDownCylinder1";
 			
-		/// <summary>寄存器:M346【PushDownCylinder2】
+		/// <summary>寄存器:M410【PushDownCylinder2】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手下压气缸2</para> 
 		/// </summary>
 		public const string @Tag_PushDownCylinder2="PushDownCylinder2";
 			
-		/// <summary>寄存器:M314【PushDeliveryServoFwdBtn】
+		/// <summary>寄存器:D560.3【PushDeliveryServoFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手输送伺服正转</para> 
 		/// </summary>
 		public const string @Tag_PushDeliveryServoFwdBtn="PushDeliveryServoFwdBtn";
 			
-		/// <summary>寄存器:M315【PushDeliveryServoRevBtn】
+		/// <summary>寄存器:D560.4【PushDeliveryServoRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手输送伺服反转</para> 
 		/// </summary>
 		public const string @Tag_PushDeliveryServoRevBtn="PushDeliveryServoRevBtn";
 			
-		/// <summary>寄存器:M310【PushServo1FwdBtn】
+		/// <summary>寄存器:D540.3【PushServo1FwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手1伺服正转</para> 
 		/// </summary>
 		public const string @Tag_PushServo1FwdBtn="PushServo1FwdBtn";
 			
-		/// <summary>寄存器:M311【PushServo1RevBtn】
+		/// <summary>寄存器:D540.4【PushServo1RevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手1伺服反转</para> 
 		/// </summary>
 		public const string @Tag_PushServo1RevBtn="PushServo1RevBtn";
 			
-		/// <summary>寄存器:M312【PushServo2FwdBtn】
+		/// <summary>寄存器:D550.3【PushServo2FwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手2伺服正转</para> 
 		/// </summary>
 		public const string @Tag_PushServo2FwdBtn="PushServo2FwdBtn";
 			
-		/// <summary>寄存器:M313【PushServo2RevBtn】
+		/// <summary>寄存器:D550.4【PushServo2RevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手2伺服反转</para> 
 		/// </summary>
 		public const string @Tag_PushServo2RevBtn="PushServo2RevBtn";
 			
-		/// <summary>寄存器:M345【PushLaunchCylinder1】
+		/// <summary>寄存器:M542【PushServo4RevBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1压轮正转</para> 
+		/// </summary>
+		public const string @Tag_PushServo4RevBtn="PushServo4RevBtn";
+			
+		/// <summary>寄存器:M543【PushServo5RevBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1压轮反转</para> 
+		/// </summary>
+		public const string @Tag_PushServo5RevBtn="PushServo5RevBtn";
+			
+		/// <summary>寄存器:M409【PushLaunchCylinder1】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手1压紧轮推出气缸</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder1="PushLaunchCylinder1";
 			
-		/// <summary>寄存器:M347【PushLaunchCylinder2】
+		/// <summary>寄存器:M411【PushLaunchCylinder2】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手2压紧轮推出气缸</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder2="PushLaunchCylinder2";
 			
+		/// <summary>寄存器:M406【PushLaunchCylinder3】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</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> 
+		/// </summary>
+		public const string @Tag_PushLaunchCylinder4="PushLaunchCylinder4";
+			
+		/// <summary>寄存器:M412【PushLaunchCylinder5】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1阻挡气缸</para> 
+		/// </summary>
+		public const string @Tag_PushLaunchCylinder5="PushLaunchCylinder5";
+			
 		/// <summary>寄存器:D1020【XAutoRunSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
@@ -841,21 +925,21 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_RAutoRunAccTime="RAutoRunAccTime";
 			
-		/// <summary>寄存器:D0【XCurrentPos】
+		/// <summary>寄存器:D712【XCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:X轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_XCurrentPos="XCurrentPos";
 			
-		/// <summary>寄存器:D2【ZCurrentPos】
+		/// <summary>寄存器:D722【ZCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_ZCurrentPos="ZCurrentPos";
 			
-		/// <summary>寄存器:D4【RCurrentPos】
+		/// <summary>寄存器:D732【RCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:R轴当前位置</para> 
@@ -932,47 +1016,306 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_CupValve10="CupValve10";
 			
-		/// <summary>寄存器:M1003【AutoMode】
+		/// <summary>寄存器:M1000【AutoMode】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:自动模式</para> 
+		/// <para>备注:手自动切换</para> 
 		/// </summary>
 		public const string @Tag_AutoMode="AutoMode";
 			
-		/// <summary>寄存器:M1004【ManualMode】
+		/// <summary>寄存器:M1001【AlarmReset】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:手动模式</para> 
+		/// <para>备注:报警复位</para> 
 		/// </summary>
-		public const string @Tag_ManualMode="ManualMode";
+		public const string @Tag_AlarmReset="AlarmReset";
 			
-		/// <summary>寄存器:M1005【OriginMode】
+		/// <summary>寄存器:M1002【Suspend】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:原点模式</para> 
+		/// <para>备注:暂停</para> 
 		/// </summary>
-		public const string @Tag_OriginMode="OriginMode";
+		public const string @Tag_Suspend="Suspend";
 			
-		/// <summary>寄存器:D1000【XManualSpeed】
+		/// <summary>寄存器:M1011【M1011】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门1复位完成</para> 
+		/// </summary>
+		public const string @Tag_M1011="M1011";
+			
+		/// <summary>寄存器:M1012【M1012】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门2复位完成</para> 
+		/// </summary>
+		public const string @Tag_M1012="M1012";
+			
+		/// <summary>寄存器:M1013【M1013】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门3复位完成</para> 
+		/// </summary>
+		public const string @Tag_M1013="M1013";
+			
+		/// <summary>寄存器:M1014【M1014】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:龙门4复位完成</para> 
+		/// </summary>
+		public const string @Tag_M1014="M1014";
+			
+		/// <summary>寄存器:M1015【M1015】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1已启动</para> 
+		/// </summary>
+		public const string @Tag_M1015="M1015";
+			
+		/// <summary>寄存器:M1016【M1016】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2已启动</para> 
+		/// </summary>
+		public const string @Tag_M1016="M1016";
+			
+		/// <summary>寄存器:M1017【M1017】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边1故障</para> 
+		/// </summary>
+		public const string @Tag_M1017="M1017";
+			
+		/// <summary>寄存器:M1018【M1018】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2故障</para> 
+		/// </summary>
+		public const string @Tag_M1018="M1018";
+			
+		/// <summary>寄存器:M1019【M1019】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:主急停按下</para> 
+		/// </summary>
+		public const string @Tag_M1019="M1019";
+			
+		/// <summary>寄存器:M1020【M1020】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:副急停按下</para> 
+		/// </summary>
+		public const string @Tag_M1020="M1020";
+			
+		/// <summary>寄存器:D512【XManualSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:X轴手动速度</para> 
 		/// </summary>
 		public const string @Tag_XManualSpeed="XManualSpeed";
 			
-		/// <summary>寄存器:D1004【YManualSpeed】
+		/// <summary>寄存器:D522【YManualSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴手动速度</para> 
 		/// </summary>
 		public const string @Tag_YManualSpeed="YManualSpeed";
 			
-		/// <summary>寄存器:D1008【AManualSpeed】
+		/// <summary>寄存器:D532【AManualSpeed】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:A轴手动速度</para> 
 		/// </summary>
 		public const string @Tag_AManualSpeed="AManualSpeed";
+			
+		/// <summary>寄存器:D542【T1ManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:靠边1轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_T1ManualSpeed="T1ManualSpeed";
+			
+		/// <summary>寄存器:D552【T3ManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:靠边2轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_T3ManualSpeed="T3ManualSpeed";
+			
+		/// <summary>寄存器:D562【T2ManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:封边1输送手动速度</para> 
+		/// </summary>
+		public const string @Tag_T2ManualSpeed="T2ManualSpeed";
+			
+		/// <summary>寄存器:M425【M425】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:中转台1气缸</para> 
+		/// </summary>
+		public const string @Tag_M425="M425";
+			
+		/// <summary>寄存器:M426【M426】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:中转台2气缸</para> 
+		/// </summary>
+		public const string @Tag_M426="M426";
+			
+		/// <summary>寄存器:M427【M427】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:出口靠边皮带气缸</para> 
+		/// </summary>
+		public const string @Tag_M427="M427";
+			
+		/// <summary>寄存器:M428【M428】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:NG挡板</para> 
+		/// </summary>
+		public const string @Tag_M428="M428";
+			
+		/// <summary>寄存器:M544【M544】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒1反转</para> 
+		/// </summary>
+		public const string @Tag_M544="M544";
+			
+		/// <summary>寄存器:M545【M545】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒2反转</para> 
+		/// </summary>
+		public const string @Tag_M545="M545";
+			
+		/// <summary>寄存器:M546【M546】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒3反转</para> 
+		/// </summary>
+		public const string @Tag_M546="M546";
+			
+		/// <summary>寄存器:M547【M547】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒4反转</para> 
+		/// </summary>
+		public const string @Tag_M547="M547";
+			
+		/// <summary>寄存器:M548【M548】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒5反转</para> 
+		/// </summary>
+		public const string @Tag_M548="M548";
+			
+		/// <summary>寄存器:M549【M549】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒6反转</para> 
+		/// </summary>
+		public const string @Tag_M549="M549";
+			
+		/// <summary>寄存器:M550【M550】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒7反转</para> 
+		/// </summary>
+		public const string @Tag_M550="M550";
+			
+		/// <summary>寄存器:M551【M551】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒8反转</para> 
+		/// </summary>
+		public const string @Tag_M551="M551";
+			
+		/// <summary>寄存器:M552【M552】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒9反转</para> 
+		/// </summary>
+		public const string @Tag_M552="M552";
+			
+		/// <summary>寄存器:M510【M510】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒1正转</para> 
+		/// </summary>
+		public const string @Tag_M510="M510";
+			
+		/// <summary>寄存器:M511【M511】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒2正转</para> 
+		/// </summary>
+		public const string @Tag_M511="M511";
+			
+		/// <summary>寄存器:M512【M512】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒3正转</para> 
+		/// </summary>
+		public const string @Tag_M512="M512";
+			
+		/// <summary>寄存器:M531【M531】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒4正转</para> 
+		/// </summary>
+		public const string @Tag_M531="M531";
+			
+		/// <summary>寄存器:M524【M524】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒9正转</para> 
+		/// </summary>
+		public const string @Tag_M524="M524";
+			
+		/// <summary>寄存器:M525【M525】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道皮带9正转</para> 
+		/// </summary>
+		public const string @Tag_M525="M525";
+			
+		/// <summary>寄存器:M526【M526】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道废料皮带正转</para> 
+		/// </summary>
+		public const string @Tag_M526="M526";
+			
+		/// <summary>寄存器:M527【M527】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒8正转</para> 
+		/// </summary>
+		public const string @Tag_M527="M527";
+			
+		/// <summary>寄存器:M528【M528】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒7正转</para> 
+		/// </summary>
+		public const string @Tag_M528="M528";
+			
+		/// <summary>寄存器:M529【M529】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒6正转</para> 
+		/// </summary>
+		public const string @Tag_M529="M529";
+			
+		/// <summary>寄存器:M530【M530】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:通道滚筒5正转</para> 
+		/// </summary>
+		public const string @Tag_M530="M530";
 						
 	}
 }

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

@@ -316,94 +316,115 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_BoardAngle="BoardAngle";
 			
-		/// <summary>寄存器:M1104【XManualFwdBtn】
+		/// <summary>寄存器:D570.0【XManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:X轴使能</para> 
+		/// </summary>
+		public const string @Tag_XManualPowerBtn="XManualPowerBtn";
+			
+		/// <summary>寄存器:D580.0【ZManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Z轴使能</para> 
+		/// </summary>
+		public const string @Tag_ZManualPowerBtn="ZManualPowerBtn";
+			
+		/// <summary>寄存器:D590.0【AManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A轴使能</para> 
+		/// </summary>
+		public const string @Tag_AManualPowerBtn="AManualPowerBtn";
+			
+		/// <summary>寄存器:D570.3【XManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_XManualFwdBtn="XManualFwdBtn";
 			
-		/// <summary>寄存器:M1105【XManualRevBtn】
+		/// <summary>寄存器:D570.4【XManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_XManualRevBtn="XManualRevBtn";
 			
-		/// <summary>寄存器:M1102【ZManualFwdBtn】
+		/// <summary>寄存器:D580.3【ZManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_ZManualFwdBtn="ZManualFwdBtn";
 			
-		/// <summary>寄存器:M1103【ZManualRevBtn】
+		/// <summary>寄存器:D580.4【ZManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_ZManualRevBtn="ZManualRevBtn";
 			
-		/// <summary>寄存器:M1100【AManualFwdBtn】
+		/// <summary>寄存器:D590.3【AManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_AManualFwdBtn="AManualFwdBtn";
 			
-		/// <summary>寄存器:M1101【AManualRevBtn】
+		/// <summary>寄存器:D590.4【AManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_AManualRevBtn="AManualRevBtn";
 			
-		/// <summary>寄存器:M1106【GantryDelivery1ManFwdBtn】
+		/// <summary>寄存器:M517【GantryDelivery1ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送1手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M1107【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M518【GantryDelivery1ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送1手动反转</para> 
+		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
 			
-		/// <summary>寄存器:M1108【GantryDelivery2ManFwdBtn】
+		/// <summary>寄存器:M519【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送2手动正转</para> 
+		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M1109【GantryDelivery2ManRevBtn】
+		/// <summary>寄存器:M520【GantryDelivery2ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送2手动反转</para> 
+		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
 			
-		/// <summary>寄存器:M1110【GantryDelivery3ManFwdBtn】
+		/// <summary>寄存器:M522【GantryDelivery3ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送3手动正转</para> 
+		/// <para>备注:龙门输送5手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
 			
-		/// <summary>寄存器:M1111【GantryDelivery3ManRevBtn】
+		/// <summary>寄存器:M521【GantryDelivery3ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送3手动反转</para> 
+		/// <para>备注:龙门输送6手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManRevBtn="GantryDelivery3ManRevBtn";
 			
-		/// <summary>寄存器:M1112【GantryDelivery4ManFwdBtn】
+		/// <summary>寄存器:M523【GantryDelivery4ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送4手动正转</para> 
+		/// <para>备注:龙门输送7手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
 			
@@ -414,90 +435,104 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManRevBtn="GantryDelivery4ManRevBtn";
 			
-		/// <summary>寄存器:M1130【GantryVacuumValve1Btn】
+		/// <summary>寄存器:M440【GantryVacuumValve1Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀1打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve1Btn="GantryVacuumValve1Btn";
 			
-		/// <summary>寄存器:M1131【GantryVacuumValve2Btn】
+		/// <summary>寄存器:M441【GantryVacuumValve2Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀2打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve2Btn="GantryVacuumValve2Btn";
 			
-		/// <summary>寄存器:M1132【GantryVacuumValve3Btn】
+		/// <summary>寄存器:M442【GantryVacuumValve3Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀3打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve3Btn="GantryVacuumValve3Btn";
 			
-		/// <summary>寄存器:M1133【GantryVacuumValve4Btn】
+		/// <summary>寄存器:M443【GantryVacuumValve4Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀4打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve4Btn="GantryVacuumValve4Btn";
 			
-		/// <summary>寄存器:M1134【GantryVacuumValve5Btn】
+		/// <summary>寄存器:M444【GantryVacuumValve5Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀5打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve5Btn="GantryVacuumValve5Btn";
 			
-		/// <summary>寄存器:M1135【GantryVacuumValve6Btn】
+		/// <summary>寄存器:M445【GantryVacuumValve6Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀6打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve6Btn="GantryVacuumValve6Btn";
 			
-		/// <summary>寄存器:M1136【GantryVacuumValve7Btn】
+		/// <summary>寄存器:M446【GantryVacuumValve7Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀7打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve7Btn="GantryVacuumValve7Btn";
 			
-		/// <summary>寄存器:M1137【GantryVacuumValve8Btn】
+		/// <summary>寄存器:M447【GantryVacuumValve8Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀8打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve8Btn="GantryVacuumValve8Btn";
 			
-		/// <summary>寄存器:M1138【GantryVacuumValve9Btn】
+		/// <summary>寄存器:M448【GantryVacuumValve9Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀9打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve9Btn="GantryVacuumValve9Btn";
 			
-		/// <summary>寄存器:M1139【GantryDestructionValveBtn】
+		/// <summary>寄存器:M471【GantryVacuumValve10Btn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:真空阀全打开</para> 
+		/// </summary>
+		public const string @Tag_GantryVacuumValve10Btn="GantryVacuumValve10Btn";
+			
+		/// <summary>寄存器:M449【GantryDestructionValveBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:破坏阀打开</para> 
 		/// </summary>
 		public const string @Tag_GantryDestructionValveBtn="GantryDestructionValveBtn";
 			
-		/// <summary>寄存器:M1140【Side-thrustCylinder】
+		/// <summary>寄存器:M403【Side-thrustCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:侧推气缸打开</para> 
 		/// </summary>
 		public const string @Tag_Side_thrustCylinder="Side-thrustCylinder";
 			
-		/// <summary>寄存器:M1126【ReleaseCylinder】
+		/// <summary>寄存器:M404【ReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:放行气缸</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder="ReleaseCylinder";
 			
+		/// <summary>寄存器:M405【ReleaseCylinder1】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:放行皮带升降</para> 
+		/// </summary>
+		public const string @Tag_ReleaseCylinder1="ReleaseCylinder1";
+			
 		/// <summary>寄存器:Y55【E-Stop】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
@@ -505,21 +540,21 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_E_Stop="E-Stop";
 			
-		/// <summary>寄存器:D12【XCurrentPos】
+		/// <summary>寄存器:D772【XCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:X轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_XCurrentPos="XCurrentPos";
 			
-		/// <summary>寄存器:D14【ZCurrentPos】
+		/// <summary>寄存器:D782【ZCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_ZCurrentPos="ZCurrentPos";
 			
-		/// <summary>寄存器:D16【RCurrentPos】
+		/// <summary>寄存器:D792【RCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:R轴当前位置</para> 
@@ -595,6 +630,27 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:吸盘电磁阀10</para> 
 		/// </summary>
 		public const string @Tag_CupValve10="CupValve10";
+			
+		/// <summary>寄存器:D572【XManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:X轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_XManualSpeed="XManualSpeed";
+			
+		/// <summary>寄存器:D582【ZManulaSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:Z轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_ZManulaSpeed="ZManulaSpeed";
+			
+		/// <summary>寄存器:D592【AManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:A轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_AManualSpeed="AManualSpeed";
 						
 	}
 }

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

@@ -239,94 +239,136 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_BoardAngle="BoardAngle";
 			
-		/// <summary>寄存器:M1124【XManualFwdBtn】
+		/// <summary>寄存器:D610.0【XManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:X轴使能</para> 
+		/// </summary>
+		public const string @Tag_XManualPowerBtn="XManualPowerBtn";
+			
+		/// <summary>寄存器:D620.0【ZManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Z轴使能</para> 
+		/// </summary>
+		public const string @Tag_ZManualPowerBtn="ZManualPowerBtn";
+			
+		/// <summary>寄存器:D630.0【AManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A轴使能</para> 
+		/// </summary>
+		public const string @Tag_AManualPowerBtn="AManualPowerBtn";
+			
+		/// <summary>寄存器:D640.0【T1ManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:靠边1轴使能</para> 
+		/// </summary>
+		public const string @Tag_T1ManualPowerBtn="T1ManualPowerBtn";
+			
+		/// <summary>寄存器:D650.0【T2ManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:靠边2轴使能</para> 
+		/// </summary>
+		public const string @Tag_T2ManualPowerBtn="T2ManualPowerBtn";
+			
+		/// <summary>寄存器:D660.0【SManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:输送轴使能</para> 
+		/// </summary>
+		public const string @Tag_SManualPowerBtn="SManualPowerBtn";
+			
+		/// <summary>寄存器:D610.3【XManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_XManualFwdBtn="XManualFwdBtn";
 			
-		/// <summary>寄存器:M1125【XManualRevBtn】
+		/// <summary>寄存器:D610.4【XManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_XManualRevBtn="XManualRevBtn";
 			
-		/// <summary>寄存器:M1122【ZManualFwdBtn】
+		/// <summary>寄存器:D620.3【ZManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_ZManualFwdBtn="ZManualFwdBtn";
 			
-		/// <summary>寄存器:M1123【ZManualRevBtn】
+		/// <summary>寄存器:D620.4【ZManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_ZManualRevBtn="ZManualRevBtn";
 			
-		/// <summary>寄存器:M1120【AManualFwdBtn】
+		/// <summary>寄存器:D630.3【AManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_AManualFwdBtn="AManualFwdBtn";
 			
-		/// <summary>寄存器:M1121【AManualRevBtn】
+		/// <summary>寄存器:D630.4【AManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_AManualRevBtn="AManualRevBtn";
 			
-		/// <summary>寄存器:M1207【GantryDelivery1ManFwdBtn】
+		/// <summary>寄存器:M539【GantryDelivery1ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送1手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M1208【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M538【GantryDelivery1ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送1手动反转</para> 
+		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
 			
-		/// <summary>寄存器:M1209【GantryDelivery2ManFwdBtn】
+		/// <summary>寄存器:M536【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送2手动正转</para> 
+		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M1210【GantryDelivery2ManRevBtn】
+		/// <summary>寄存器:M537【GantryDelivery2ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送2手动反转</para> 
+		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
 			
-		/// <summary>寄存器:M1211【GantryDelivery3ManFwdBtn】
+		/// <summary>寄存器:M534【GantryDelivery3ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送3手动正转</para> 
+		/// <para>备注:侧皮带手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManFwdBtn="GantryDelivery3ManFwdBtn";
 			
-		/// <summary>寄存器:M1212【GantryDelivery3ManRevBtn】
+		/// <summary>寄存器:M1020【GantryDelivery3ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送3手动反转</para> 
+		/// <para>备注:龙门输送6手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery3ManRevBtn="GantryDelivery3ManRevBtn";
 			
-		/// <summary>寄存器:M1213【GantryDelivery4ManFwdBtn】
+		/// <summary>寄存器:M1021【GantryDelivery4ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送4手动正转</para> 
+		/// <para>备注:龙门输送7手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManFwdBtn="GantryDelivery4ManFwdBtn";
 			
@@ -337,175 +379,196 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManRevBtn="GantryDelivery4ManRevBtn";
 			
-		/// <summary>寄存器:M1140【GantryVacuumValve1Btn】
+		/// <summary>寄存器:M450【GantryVacuumValve1Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀1打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve1Btn="GantryVacuumValve1Btn";
 			
-		/// <summary>寄存器:M1141【GantryVacuumValve2Btn】
+		/// <summary>寄存器:M451【GantryVacuumValve2Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀2打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve2Btn="GantryVacuumValve2Btn";
 			
-		/// <summary>寄存器:M1142【GantryVacuumValve3Btn】
+		/// <summary>寄存器:M452【GantryVacuumValve3Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀3打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve3Btn="GantryVacuumValve3Btn";
 			
-		/// <summary>寄存器:M1143【GantryVacuumValve4Btn】
+		/// <summary>寄存器:M453【GantryVacuumValve4Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀4打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve4Btn="GantryVacuumValve4Btn";
 			
-		/// <summary>寄存器:M1144【GantryVacuumValve5Btn】
+		/// <summary>寄存器:M454【GantryVacuumValve5Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀5打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve5Btn="GantryVacuumValve5Btn";
 			
-		/// <summary>寄存器:M1145【GantryVacuumValve6Btn】
+		/// <summary>寄存器:M455【GantryVacuumValve6Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀6打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve6Btn="GantryVacuumValve6Btn";
 			
-		/// <summary>寄存器:M1146【GantryVacuumValve7Btn】
+		/// <summary>寄存器:M456【GantryVacuumValve7Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀7打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve7Btn="GantryVacuumValve7Btn";
 			
-		/// <summary>寄存器:M1147【GantryVacuumValve8Btn】
+		/// <summary>寄存器:M457【GantryVacuumValve8Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀8打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve8Btn="GantryVacuumValve8Btn";
 			
-		/// <summary>寄存器:M1148【GantryVacuumValve9Btn】
+		/// <summary>寄存器:M458【GantryVacuumValve9Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀9打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve9Btn="GantryVacuumValve9Btn";
 			
-		/// <summary>寄存器:M1149【GantryDestructionValveBtn】
+		/// <summary>寄存器:M472【GantryVacuumValve10Btn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:真空阀全打开</para> 
+		/// </summary>
+		public const string @Tag_GantryVacuumValve10Btn="GantryVacuumValve10Btn";
+			
+		/// <summary>寄存器:M459【GantryDestructionValveBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:破坏阀打开</para> 
 		/// </summary>
 		public const string @Tag_GantryDestructionValveBtn="GantryDestructionValveBtn";
 			
-		/// <summary>寄存器:M1225【Side-thrustCylinder】
+		/// <summary>寄存器:M413【Side-thrustCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:侧推气缸打开</para> 
 		/// </summary>
 		public const string @Tag_Side_thrustCylinder="Side-thrustCylinder";
 			
-		/// <summary>寄存器:M1226【ReleaseCylinder】
+		/// <summary>寄存器:M414【ReleaseCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:放行气缸</para> 
 		/// </summary>
 		public const string @Tag_ReleaseCylinder="ReleaseCylinder";
 			
-		/// <summary>寄存器:M1227【DiagonalDeliveryManFwdBtn】
+		/// <summary>寄存器:M533【DiagonalDeliveryManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:斜辊手动正转</para> 
+		/// <para>备注:斜辊1手动正转</para> 
 		/// </summary>
 		public const string @Tag_DiagonalDeliveryManFwdBtn="DiagonalDeliveryManFwdBtn";
 			
-		/// <summary>寄存器:M1228【DiagonalDeliveryManRevBtn】
+		/// <summary>寄存器:M535【DiagonalDeliveryManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:斜辊手动反转</para> 
+		/// <para>备注:斜辊2手动正转</para> 
 		/// </summary>
 		public const string @Tag_DiagonalDeliveryManRevBtn="DiagonalDeliveryManRevBtn";
 			
-		/// <summary>寄存器:M1229【ScanReleaseCylinder】
+		/// <summary>寄存器:M416【M416】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2压轮气缸1</para> 
+		/// </summary>
+		public const string @Tag_M416="M416";
+			
+		/// <summary>寄存器:M417【M417】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2压轮气缸2</para> 
+		/// </summary>
+		public const string @Tag_M417="M417";
+			
+		/// <summary>寄存器:M422【M422】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:扫码放行气缸</para> 
+		/// <para>备注:封边2阻挡气缸</para> 
 		/// </summary>
-		public const string @Tag_ScanReleaseCylinder="ScanReleaseCylinder";
+		public const string @Tag_M422="M422";
 			
-		/// <summary>寄存器:M644【PushDownCylinder1】
+		/// <summary>寄存器:M418【PushDownCylinder1】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手下压气缸1</para> 
 		/// </summary>
 		public const string @Tag_PushDownCylinder1="PushDownCylinder1";
 			
-		/// <summary>寄存器:M646【PushDownCylinder2】
+		/// <summary>寄存器:M420【PushDownCylinder2】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手下压气缸2</para> 
 		/// </summary>
 		public const string @Tag_PushDownCylinder2="PushDownCylinder2";
 			
-		/// <summary>寄存器:M614【PushDeliveryServoFwdBtn】
+		/// <summary>寄存器:D660.3【PushDeliveryServoFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手输送伺服正转</para> 
 		/// </summary>
 		public const string @Tag_PushDeliveryServoFwdBtn="PushDeliveryServoFwdBtn";
 			
-		/// <summary>寄存器:M615【PushDeliveryServoRevBtn】
+		/// <summary>寄存器:D660.4【PushDeliveryServoRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手输送伺服反转</para> 
 		/// </summary>
 		public const string @Tag_PushDeliveryServoRevBtn="PushDeliveryServoRevBtn";
 			
-		/// <summary>寄存器:M610【PushServo1FwdBtn】
+		/// <summary>寄存器:D640.3【PushServo1FwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手1伺服正转</para> 
 		/// </summary>
 		public const string @Tag_PushServo1FwdBtn="PushServo1FwdBtn";
 			
-		/// <summary>寄存器:M611【PushServo1RevBtn】
+		/// <summary>寄存器:D640.4【PushServo1RevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手1伺服反转</para> 
 		/// </summary>
 		public const string @Tag_PushServo1RevBtn="PushServo1RevBtn";
 			
-		/// <summary>寄存器:M612【PushServo2FwdBtn】
+		/// <summary>寄存器:D650.3【PushServo2FwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手2伺服正转</para> 
 		/// </summary>
 		public const string @Tag_PushServo2FwdBtn="PushServo2FwdBtn";
 			
-		/// <summary>寄存器:M613【PushServo2RevBtn】
+		/// <summary>寄存器:D650.4【PushServo2RevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手2伺服反转</para> 
 		/// </summary>
 		public const string @Tag_PushServo2RevBtn="PushServo2RevBtn";
 			
-		/// <summary>寄存器:M645【PushLaunchCylinder1】
+		/// <summary>寄存器:M419【PushLaunchCylinder1】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手1压紧轮推出气缸</para> 
 		/// </summary>
 		public const string @Tag_PushLaunchCylinder1="PushLaunchCylinder1";
 			
-		/// <summary>寄存器:M647【PushLaunchCylinder2】
+		/// <summary>寄存器:M421【PushLaunchCylinder2】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:推手2压紧轮推出气缸</para> 
@@ -519,21 +582,21 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_E_Stop="E-Stop";
 			
-		/// <summary>寄存器:D18【XCurrentPos】
+		/// <summary>寄存器:D812【XCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:X轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_XCurrentPos="XCurrentPos";
 			
-		/// <summary>寄存器:D20【ZCurrentPos】
+		/// <summary>寄存器:D822【ZCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_ZCurrentPos="ZCurrentPos";
 			
-		/// <summary>寄存器:D22【RCurrentPos】
+		/// <summary>寄存器:D832【RCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:R轴当前位置</para> 
@@ -609,6 +672,62 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:吸盘电磁阀10</para> 
 		/// </summary>
 		public const string @Tag_CupValve10="CupValve10";
+			
+		/// <summary>寄存器:D612【XManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:X轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_XManualSpeed="XManualSpeed";
+			
+		/// <summary>寄存器:D622【ZManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:Z轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_ZManualSpeed="ZManualSpeed";
+			
+		/// <summary>寄存器:D632【AManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:A轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_AManualSpeed="AManualSpeed";
+			
+		/// <summary>寄存器:D642【T1ManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:靠边1轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_T1ManualSpeed="T1ManualSpeed";
+			
+		/// <summary>寄存器:D652【T2ManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:靠边2轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_T2ManualSpeed="T2ManualSpeed";
+			
+		/// <summary>寄存器:D662【SManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:输送轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_SManualSpeed="SManualSpeed";
+			
+		/// <summary>寄存器:M540【M540】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2压轮正转</para> 
+		/// </summary>
+		public const string @Tag_M540="M540";
+			
+		/// <summary>寄存器:M541【M541】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:封边2压轮反转</para> 
+		/// </summary>
+		public const string @Tag_M541="M541";
 						
 	}
 }

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

@@ -232,73 +232,94 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_BoardAngle="BoardAngle";
 			
-		/// <summary>寄存器:M1024【XManualFwdBtn】
+		/// <summary>寄存器:D670.0【XManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:X轴使能</para> 
+		/// </summary>
+		public const string @Tag_XManualPowerBtn="XManualPowerBtn";
+			
+		/// <summary>寄存器:D680.0【ZManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:Z轴使能</para> 
+		/// </summary>
+		public const string @Tag_ZManualPowerBtn="ZManualPowerBtn";
+			
+		/// <summary>寄存器:D690.0【AManualPowerBtn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:A轴使能</para> 
+		/// </summary>
+		public const string @Tag_AManualPowerBtn="AManualPowerBtn";
+			
+		/// <summary>寄存器:D670.3【XManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_XManualFwdBtn="XManualFwdBtn";
 			
-		/// <summary>寄存器:M1025【XManualRevBtn】
+		/// <summary>寄存器:D670.4【XManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:X轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_XManualRevBtn="XManualRevBtn";
 			
-		/// <summary>寄存器:M1022【ZManualFwdBtn】
+		/// <summary>寄存器:D680.3【ZManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_ZManualFwdBtn="ZManualFwdBtn";
 			
-		/// <summary>寄存器:M1023【ZManualRevBtn】
+		/// <summary>寄存器:D680.4【ZManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:Z轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_ZManualRevBtn="ZManualRevBtn";
 			
-		/// <summary>寄存器:M1020【AManualFwdBtn】
+		/// <summary>寄存器:D690.3【AManualFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动正转</para> 
 		/// </summary>
 		public const string @Tag_AManualFwdBtn="AManualFwdBtn";
 			
-		/// <summary>寄存器:M1021【AManualRevBtn】
+		/// <summary>寄存器:D690.4【AManualRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:A轴手动反转</para> 
 		/// </summary>
 		public const string @Tag_AManualRevBtn="AManualRevBtn";
 			
-		/// <summary>寄存器:M1307【GantryDelivery1ManFwdBtn】
+		/// <summary>寄存器:M516【GantryDelivery1ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:龙门输送1手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManFwdBtn="GantryDelivery1ManFwdBtn";
 			
-		/// <summary>寄存器:M1308【GantryDelivery1ManRevBtn】
+		/// <summary>寄存器:M515【GantryDelivery1ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送1手动反转</para> 
+		/// <para>备注:龙门输送2手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery1ManRevBtn="GantryDelivery1ManRevBtn";
 			
-		/// <summary>寄存器:M1309【GantryDelivery2ManFwdBtn】
+		/// <summary>寄存器:M514【GantryDelivery2ManFwdBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送2手动正转</para> 
+		/// <para>备注:龙门输送3手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManFwdBtn="GantryDelivery2ManFwdBtn";
 			
-		/// <summary>寄存器:M1310【GantryDelivery2ManRevBtn】
+		/// <summary>寄存器:M513【GantryDelivery2ManRevBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
-		/// <para>备注:龙门输送2手动反转</para> 
+		/// <para>备注:龙门输送4手动正转</para> 
 		/// </summary>
 		public const string @Tag_GantryDelivery2ManRevBtn="GantryDelivery2ManRevBtn";
 			
@@ -330,77 +351,84 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_GantryDelivery4ManRevBtn="GantryDelivery4ManRevBtn";
 			
-		/// <summary>寄存器:M1040【GantryVacuumValve1Btn】
+		/// <summary>寄存器:M460【GantryVacuumValve1Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀1打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve1Btn="GantryVacuumValve1Btn";
 			
-		/// <summary>寄存器:M1041【GantryVacuumValve2Btn】
+		/// <summary>寄存器:M461【GantryVacuumValve2Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀2打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve2Btn="GantryVacuumValve2Btn";
 			
-		/// <summary>寄存器:M1042【GantryVacuumValve3Btn】
+		/// <summary>寄存器:M462【GantryVacuumValve3Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀3打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve3Btn="GantryVacuumValve3Btn";
 			
-		/// <summary>寄存器:M1043【GantryVacuumValve4Btn】
+		/// <summary>寄存器:M463【GantryVacuumValve4Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀4打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve4Btn="GantryVacuumValve4Btn";
 			
-		/// <summary>寄存器:M1044【GantryVacuumValve5Btn】
+		/// <summary>寄存器:M464【GantryVacuumValve5Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀5打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve5Btn="GantryVacuumValve5Btn";
 			
-		/// <summary>寄存器:M1045【GantryVacuumValve6Btn】
+		/// <summary>寄存器:M465【GantryVacuumValve6Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀6打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve6Btn="GantryVacuumValve6Btn";
 			
-		/// <summary>寄存器:M1046【GantryVacuumValve7Btn】
+		/// <summary>寄存器:M466【GantryVacuumValve7Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀7打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve7Btn="GantryVacuumValve7Btn";
 			
-		/// <summary>寄存器:M1047【GantryVacuumValve8Btn】
+		/// <summary>寄存器:M467【GantryVacuumValve8Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀8打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve8Btn="GantryVacuumValve8Btn";
 			
-		/// <summary>寄存器:M1048【GantryVacuumValve9Btn】
+		/// <summary>寄存器:M468【GantryVacuumValve9Btn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:真空阀9打开</para> 
 		/// </summary>
 		public const string @Tag_GantryVacuumValve9Btn="GantryVacuumValve9Btn";
 			
-		/// <summary>寄存器:M1049【GantryDestructionValveBtn】
+		/// <summary>寄存器:M473【GantryVacuumValve10Btn】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:真空阀全打开</para> 
+		/// </summary>
+		public const string @Tag_GantryVacuumValve10Btn="GantryVacuumValve10Btn";
+			
+		/// <summary>寄存器:M469【GantryDestructionValveBtn】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:破坏阀打开</para> 
 		/// </summary>
 		public const string @Tag_GantryDestructionValveBtn="GantryDestructionValveBtn";
 			
-		/// <summary>寄存器:M1061【Side-thrustCylinder】
+		/// <summary>寄存器:M415【Side-thrustCylinder】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Default</para> 
 		/// <para>备注:侧推气缸打开</para> 
@@ -421,21 +449,21 @@ namespace SCADA_DAQ.Customer.Machines
 		/// </summary>
 		public const string @Tag_NotAllowOriginIn="NotAllowOriginIn";
 			
-		/// <summary>寄存器:D6【XCurrentPos】
+		/// <summary>寄存器:D872【XCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:X轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_XCurrentPos="XCurrentPos";
 			
-		/// <summary>寄存器:D8【ZCurrentPos】
+		/// <summary>寄存器:D882【ZCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:Z轴当前位置</para> 
 		/// </summary>
 		public const string @Tag_ZCurrentPos="ZCurrentPos";
 			
-		/// <summary>寄存器:D10【RCurrentPos】
+		/// <summary>寄存器:D892【RCurrentPos】
 		/// <para>单位:</para> 
 		/// <para>缩放:1 类型: Float</para> 
 		/// <para>备注:R轴当前位置</para> 
@@ -511,6 +539,27 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:吸盘电磁阀10</para> 
 		/// </summary>
 		public const string @Tag_CupValve10="CupValve10";
+			
+		/// <summary>寄存器:D672【XManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:X轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_XManualSpeed="XManualSpeed";
+			
+		/// <summary>寄存器:D682【ZManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:Z轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_ZManualSpeed="ZManualSpeed";
+			
+		/// <summary>寄存器:D692【AManualSpeed】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Float</para> 
+		/// <para>备注:A轴手动速度</para> 
+		/// </summary>
+		public const string @Tag_AManualSpeed="AManualSpeed";
 						
 	}
 }

SCADA_DAQ/Machines/SortMachine_分拣机.cs

@@ -1246,6 +1246,20 @@ namespace SCADA_DAQ.Customer.Machines
 		/// <para>备注:急停报警</para> 
 		/// </summary>
 		public const string @Tag_M1017="M1017";
+			
+		/// <summary>寄存器:M1018【M1018】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:清料卡料报警</para> 
+		/// </summary>
+		public const string @Tag_M1018="M1018";
+			
+		/// <summary>寄存器:M1019【SingleModeSort】
+		/// <para>单位:</para> 
+		/// <para>缩放:1 类型: Default</para> 
+		/// <para>备注:单机时解析文件</para> 
+		/// </summary>
+		public const string @Tag_SingleModeSort="SingleModeSort";
 						
 	}
 }