Parcourir la source

完成逻辑代码:
1,主界面产品选择变更时写入产品型号;
2,主界面数据定时1s更新;
3,压力机界面数据实时更新,单击写入按钮时执行写入。

Deyauo il y a 1 mois
Parent
commit
d678ee10da

BIN
.vs/监测软件/v17/.suo


BIN
BaseLib/obj/Debug/BaseLib.Properties.Resources.resources


BIN
BaseLib/obj/Debug/BaseLib.csproj.AssemblyReference.cache


BIN
BaseLib/obj/Debug/BaseLib.dll


BIN
BaseLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 17 - 17
LHY-WD-BC_MES/FrmMain.Designer.cs

@@ -33,6 +33,7 @@
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.splitContainerMain = new System.Windows.Forms.SplitContainer();
             this.panelMain = new System.Windows.Forms.Panel();
+            this.lblCurrentNo = new Sunny.UI.UILabel();
             this.btn称重 = new Sunny.UI.UISymbolButton();
             this.btnConfig = new Sunny.UI.UISymbolButton();
             this.btnCommunicate = new Sunny.UI.UISymbolButton();
@@ -42,7 +43,6 @@
             this.btnM03 = new Sunny.UI.UISymbolButton();
             this.btnM01M02 = new Sunny.UI.UISymbolButton();
             this.btnHome = new Sunny.UI.UISymbolButton();
-            this.lblCurrentNo = new Sunny.UI.UILabel();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerMain)).BeginInit();
             this.splitContainerMain.Panel1.SuspendLayout();
             this.splitContainerMain.Panel2.SuspendLayout();
@@ -76,8 +76,8 @@
             this.splitContainerMain.Panel2.Controls.Add(this.btnM03);
             this.splitContainerMain.Panel2.Controls.Add(this.btnM01M02);
             this.splitContainerMain.Panel2.Controls.Add(this.btnHome);
-            this.splitContainerMain.Size = new System.Drawing.Size(1920, 1005);
-            this.splitContainerMain.SplitterDistance = 940;
+            this.splitContainerMain.Size = new System.Drawing.Size(1920, 997);
+            this.splitContainerMain.SplitterDistance = 932;
             this.splitContainerMain.TabIndex = 2;
             // 
             // panelMain
@@ -85,9 +85,21 @@
             this.panelMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelMain.Location = new System.Drawing.Point(0, 0);
             this.panelMain.Name = "panelMain";
-            this.panelMain.Size = new System.Drawing.Size(1920, 940);
+            this.panelMain.Size = new System.Drawing.Size(1920, 932);
             this.panelMain.TabIndex = 0;
             // 
+            // lblCurrentNo
+            // 
+            this.lblCurrentNo.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lblCurrentNo.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblCurrentNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.lblCurrentNo.Location = new System.Drawing.Point(1746, 0);
+            this.lblCurrentNo.Name = "lblCurrentNo";
+            this.lblCurrentNo.Size = new System.Drawing.Size(174, 61);
+            this.lblCurrentNo.TabIndex = 9;
+            this.lblCurrentNo.Text = "当前配方号:";
+            this.lblCurrentNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // btn称重
             // 
             this.btn称重.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -223,22 +235,10 @@
             this.btnHome.TipsFont = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.btnHome.Click += new System.EventHandler(this.btnWinFrmOpen);
             // 
-            // lblCurrentNo
-            // 
-            this.lblCurrentNo.Dock = System.Windows.Forms.DockStyle.Right;
-            this.lblCurrentNo.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblCurrentNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.lblCurrentNo.Location = new System.Drawing.Point(1746, 0);
-            this.lblCurrentNo.Name = "lblCurrentNo";
-            this.lblCurrentNo.Size = new System.Drawing.Size(174, 61);
-            this.lblCurrentNo.TabIndex = 9;
-            this.lblCurrentNo.Text = "当前配方号:";
-            this.lblCurrentNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // FrmMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(1920, 1040);
+            this.ClientSize = new System.Drawing.Size(1920, 1032);
             this.Controls.Add(this.splitContainerMain);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximumSize = new System.Drawing.Size(1920, 1080);

+ 89 - 56
LHY-WD-BC_MES/Windows/FrmFirstWindow.Designer.cs

@@ -31,9 +31,6 @@
             this.components = new System.ComponentModel.Container();
             this.splitContainerMain = new System.Windows.Forms.SplitContainer();
             this.tableLayoutPanelUp = new System.Windows.Forms.TableLayoutPanel();
-            this.uchmiM01M02 = new HRT_Measure.UCHMI();
-            this.uchmiM03 = new HRT_Measure.UCHMI();
-            this.uchmiM04M05 = new HRT_Measure.UCHMI();
             this.tableLayoutPanelBottom = new System.Windows.Forms.TableLayoutPanel();
             this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
             this.label4 = new System.Windows.Forms.Label();
@@ -56,7 +53,7 @@
             this.txt主缸当前流量设定 = new Sunny.UI.UITextBox();
             this.uiLabel11 = new Sunny.UI.UILabel();
             this.uiLabel10 = new Sunny.UI.UILabel();
-            this.txt作提示 = new Sunny.UI.UITextBox();
+            this.txt作提示 = new Sunny.UI.UITextBox();
             this.txt当前动作 = new Sunny.UI.UITextBox();
             this.btnClearPressure = new Sunny.UI.UISymbolButton();
             this.label16 = new System.Windows.Forms.Label();
@@ -110,6 +107,11 @@
             this.txtA料仓5当前重量 = new Sunny.UI.UITextBox();
             this.uiLabel12 = new Sunny.UI.UILabel();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.uiLabel17 = new Sunny.UI.UILabel();
+            this.txt当前模式提示 = new Sunny.UI.UITextBox();
+            this.uchmiM01M02 = new HRT_Measure.UCHMI();
+            this.uchmiM03 = new HRT_Measure.UCHMI();
+            this.uchmiM04M05 = new HRT_Measure.UCHMI();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerMain)).BeginInit();
             this.splitContainerMain.Panel1.SuspendLayout();
             this.splitContainerMain.Panel2.SuspendLayout();
@@ -161,33 +163,6 @@
             this.tableLayoutPanelUp.Size = new System.Drawing.Size(1904, 384);
             this.tableLayoutPanelUp.TabIndex = 0;
             // 
-            // uchmiM01M02
-            // 
-            this.uchmiM01M02.DisplayLabel = "上料房 称重房";
-            this.uchmiM01M02.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.uchmiM01M02.Location = new System.Drawing.Point(3, 3);
-            this.uchmiM01M02.Name = "uchmiM01M02";
-            this.uchmiM01M02.Size = new System.Drawing.Size(628, 378);
-            this.uchmiM01M02.TabIndex = 0;
-            // 
-            // uchmiM03
-            // 
-            this.uchmiM03.DisplayLabel = "压机房";
-            this.uchmiM03.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.uchmiM03.Location = new System.Drawing.Point(637, 3);
-            this.uchmiM03.Name = "uchmiM03";
-            this.uchmiM03.Size = new System.Drawing.Size(628, 378);
-            this.uchmiM03.TabIndex = 1;
-            // 
-            // uchmiM04M05
-            // 
-            this.uchmiM04M05.DisplayLabel = "检测房 装箱房";
-            this.uchmiM04M05.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.uchmiM04M05.Location = new System.Drawing.Point(1271, 3);
-            this.uchmiM04M05.Name = "uchmiM04M05";
-            this.uchmiM04M05.Size = new System.Drawing.Size(630, 378);
-            this.uchmiM04M05.TabIndex = 2;
-            // 
             // tableLayoutPanelBottom
             // 
             this.tableLayoutPanelBottom.ColumnCount = 3;
@@ -358,6 +333,8 @@
             // grbPressure
             // 
             this.grbPressure.BackColor = System.Drawing.Color.Transparent;
+            this.grbPressure.Controls.Add(this.uiLabel17);
+            this.grbPressure.Controls.Add(this.txt当前模式提示);
             this.grbPressure.Controls.Add(this.label20);
             this.grbPressure.Controls.Add(this.cob产品型号选择);
             this.grbPressure.Controls.Add(this.label5);
@@ -368,7 +345,7 @@
             this.grbPressure.Controls.Add(this.txt主缸当前流量设定);
             this.grbPressure.Controls.Add(this.uiLabel11);
             this.grbPressure.Controls.Add(this.uiLabel10);
-            this.grbPressure.Controls.Add(this.txt作提示);
+            this.grbPressure.Controls.Add(this.txt作提示);
             this.grbPressure.Controls.Add(this.txt当前动作);
             this.grbPressure.Controls.Add(this.btnClearPressure);
             this.grbPressure.Controls.Add(this.label16);
@@ -438,6 +415,7 @@
             this.cob产品型号选择.TabIndex = 213;
             this.cob产品型号选择.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.cob产品型号选择.Watermark = "";
+            this.cob产品型号选择.SelectedIndexChanged += new System.EventHandler(this.cob产品型号选择_SelectedIndexChanged);
             // 
             // label5
             // 
@@ -519,40 +497,40 @@
             // 
             // uiLabel11
             // 
-            this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel11.ForeColor = System.Drawing.Color.Green;
-            this.uiLabel11.Location = new System.Drawing.Point(16, 413);
+            this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel11.ForeColor = System.Drawing.Color.Blue;
+            this.uiLabel11.Location = new System.Drawing.Point(16, 411);
             this.uiLabel11.Name = "uiLabel11";
             this.uiLabel11.Size = new System.Drawing.Size(110, 41);
             this.uiLabel11.TabIndex = 206;
-            this.uiLabel11.Text = "作提示";
-            this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiLabel11.Text = "作提示";
+            this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // uiLabel10
             // 
-            this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel10.ForeColor = System.Drawing.Color.Blue;
             this.uiLabel10.Location = new System.Drawing.Point(16, 355);
             this.uiLabel10.Name = "uiLabel10";
             this.uiLabel10.Size = new System.Drawing.Size(110, 41);
             this.uiLabel10.TabIndex = 205;
             this.uiLabel10.Text = "当前动作";
-            this.uiLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // txt作提示
-            // 
-            this.txt作提示.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txt作提示.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
-            this.txt动作提示.Location = new System.Drawing.Point(159, 409);
-            this.txt作提示.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txt作提示.MinimumSize = new System.Drawing.Size(1, 16);
-            this.txt动作提示.Name = "txt动作提示";
-            this.txt作提示.Padding = new System.Windows.Forms.Padding(5);
-            this.txt作提示.ShowText = false;
-            this.txt作提示.Size = new System.Drawing.Size(399, 48);
-            this.txt作提示.TabIndex = 204;
-            this.txt作提示.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.txt作提示.Watermark = "";
+            this.uiLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // txt作提示
+            // 
+            this.txt作提示.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.txt作提示.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
+            this.txt操作提示.Location = new System.Drawing.Point(159, 407);
+            this.txt作提示.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txt作提示.MinimumSize = new System.Drawing.Size(1, 16);
+            this.txt操作提示.Name = "txt操作提示";
+            this.txt作提示.Padding = new System.Windows.Forms.Padding(5);
+            this.txt作提示.ShowText = false;
+            this.txt作提示.Size = new System.Drawing.Size(399, 48);
+            this.txt作提示.TabIndex = 204;
+            this.txt作提示.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.txt作提示.Watermark = "";
             // 
             // txt当前动作
             // 
@@ -1347,6 +1325,59 @@
             // 
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // uiLabel17
+            // 
+            this.uiLabel17.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel17.ForeColor = System.Drawing.Color.Blue;
+            this.uiLabel17.Location = new System.Drawing.Point(16, 467);
+            this.uiLabel17.Name = "uiLabel17";
+            this.uiLabel17.Size = new System.Drawing.Size(136, 41);
+            this.uiLabel17.TabIndex = 216;
+            this.uiLabel17.Text = "当前模式提示";
+            this.uiLabel17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // txt当前模式提示
+            // 
+            this.txt当前模式提示.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.txt当前模式提示.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
+            this.txt当前模式提示.Location = new System.Drawing.Point(159, 463);
+            this.txt当前模式提示.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txt当前模式提示.MinimumSize = new System.Drawing.Size(1, 16);
+            this.txt当前模式提示.Name = "txt当前模式提示";
+            this.txt当前模式提示.Padding = new System.Windows.Forms.Padding(5);
+            this.txt当前模式提示.ShowText = false;
+            this.txt当前模式提示.Size = new System.Drawing.Size(399, 48);
+            this.txt当前模式提示.TabIndex = 215;
+            this.txt当前模式提示.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.txt当前模式提示.Watermark = "";
+            // 
+            // uchmiM01M02
+            // 
+            this.uchmiM01M02.DisplayLabel = "上料房 称重房";
+            this.uchmiM01M02.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.uchmiM01M02.Location = new System.Drawing.Point(3, 3);
+            this.uchmiM01M02.Name = "uchmiM01M02";
+            this.uchmiM01M02.Size = new System.Drawing.Size(628, 378);
+            this.uchmiM01M02.TabIndex = 0;
+            // 
+            // uchmiM03
+            // 
+            this.uchmiM03.DisplayLabel = "压机房";
+            this.uchmiM03.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.uchmiM03.Location = new System.Drawing.Point(637, 3);
+            this.uchmiM03.Name = "uchmiM03";
+            this.uchmiM03.Size = new System.Drawing.Size(628, 378);
+            this.uchmiM03.TabIndex = 1;
+            // 
+            // uchmiM04M05
+            // 
+            this.uchmiM04M05.DisplayLabel = "检测房 装箱房";
+            this.uchmiM04M05.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.uchmiM04M05.Location = new System.Drawing.Point(1271, 3);
+            this.uchmiM04M05.Name = "uchmiM04M05";
+            this.uchmiM04M05.Size = new System.Drawing.Size(630, 378);
+            this.uchmiM04M05.TabIndex = 2;
+            // 
             // FrmFirstWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1450,7 +1481,7 @@
         private System.Windows.Forms.Timer timer1;
         private Sunny.UI.UILabel uiLabel11;
         private Sunny.UI.UILabel uiLabel10;
-        private Sunny.UI.UITextBox txt作提示;
+        private Sunny.UI.UITextBox txt作提示;
         private Sunny.UI.UITextBox txt当前动作;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
@@ -1460,5 +1491,7 @@
         private Sunny.UI.UITextBox txt主缸当前流量设定;
         private System.Windows.Forms.Label label20;
         private Sunny.UI.UIComboBox cob产品型号选择;
+        private Sunny.UI.UILabel uiLabel17;
+        private Sunny.UI.UITextBox txt当前模式提示;
     }
 }

+ 83 - 68
LHY-WD-BC_MES/Windows/FrmFirstWindow.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Xml.Linq;
 
 namespace HRT_Measure
 {
@@ -122,145 +123,152 @@ namespace HRT_Measure
                                 switch (Convert.ToInt32(ReadPLCHelp.dictPressure[name].value))
                                 {
                                     case 0:
-                                        ((UITextBox)item).Text = "静止";
+                                        ((UITextBox)item).Text = "尚未进入自动流程";
                                         break;
                                     case 1:
-                                        ((UITextBox)item).Text = "主缸保压";
+                                        ((UITextBox)item).Text = "快顶";
                                         break;
                                     case 2:
-                                        ((UITextBox)item).Text = "主缸快速顶出";
+                                        ((UITextBox)item).Text = "慢顶";
+                                        break;
+                                    case 3:
+                                        ((UITextBox)item).Text = "保压";
                                         break;
                                     case 4:
-                                        ((UITextBox)item).Text = "主缸慢速顶出";
+                                        ((UITextBox)item).Text = "泄压";
                                         break;
                                     case 5:
-                                        ((UITextBox)item).Text = "主缸泄压";
-                                        break;
-                                    case 6:
-                                        ((UITextBox)item).Text = "主缸慢速退回";
-                                        break;
-                                    case 7:
-                                        ((UITextBox)item).Text = "主缸快速退回";
-                                        break;
-                                    case 8:
-                                        ((UITextBox)item).Text = "主缸减速退回";
-                                        break;
-                                    case 3:
-                                    case 9:
-                                    case 10:
-                                    case 11:
-                                        ((UITextBox)item).Text = "";
+                                        ((UITextBox)item).Text = "下降";
                                         break;
                                 }
                             }
-                            else if (name == "作提示")
+                            else if (name == "操作提示")
                             {
                                 switch (Convert.ToInt32(ReadPLCHelp.dictPressure[name].value))
                                 {
-                                    case 0:
-                                        ((UITextBox)item).Text = "允许动作";
-                                        break;
                                     case 1:
-                                        ((UITextBox)item).Text = "主缸上限位";
+                                        ((UITextBox)item).Text = "调整,请给出命令";
                                         break;
                                     case 2:
-                                        ((UITextBox)item).Text = "主缸压力达成";
+                                        ((UITextBox)item).Text = "调整,油缸已经上升到位";
                                         break;
                                     case 3:
-                                        ((UITextBox)item).Text = "前光栅保护";
+                                        ((UITextBox)item).Text = "调整,油缸已经下降到位";
                                         break;
                                     case 4:
-                                        ((UITextBox)item).Text = "后光栅保护";
+                                        ((UITextBox)item).Text = "手动,请给出命令";
                                         break;
                                     case 5:
-                                        ((UITextBox)item).Text = "主缸下限位";
+                                        ((UITextBox)item).Text = "手动,油缸已经上升到位";
                                         break;
                                     case 6:
-                                        ((UITextBox)item).Text = "顶缸上限位";
+                                        ((UITextBox)item).Text = "手动,油缸已经下降到位";
                                         break;
                                     case 7:
-                                        ((UITextBox)item).Text = "顶缸下限位";
+                                        ((UITextBox)item).Text = "本地自动,步骤0,请把油缸退到下极限";
                                         break;
                                     case 8:
-                                        ((UITextBox)item).Text = "主缸未置下限位";
+                                        ((UITextBox)item).Text = "本地自动,步骤0,请按下双手启动按钮";
                                         break;
                                     case 9:
-                                        ((UITextBox)item).Text = "伺服未启动";
+                                        ((UITextBox)item).Text = "本地自动,步骤1,等待到达慢顶位置";
                                         break;
                                     case 10:
-                                        ((UITextBox)item).Text = "顶缸未置上限位";
+                                        ((UITextBox)item).Text = "本地自动,步骤2,等待到达压力/位置上限";
                                         break;
                                     case 11:
-                                        ((UITextBox)item).Text = "顶缸未置下限位";
+                                        ((UITextBox)item).Text = "本地自动,步骤3,等待保压计时完成";
                                         break;
                                     case 12:
-                                        ((UITextBox)item).Text = "工件计数达成";
+                                        ((UITextBox)item).Text = "本地自动,步骤4,等待泄压计时完成";
                                         break;
                                     case 13:
-                                        ((UITextBox)item).Text = "静止";
+                                        ((UITextBox)item).Text = "本地自动,步骤5,等待油缸到达下极限位置";
                                         break;
                                     case 14:
-                                        ((UITextBox)item).Text = "伺服停止";
-                                        break;
-                                    case 15:
-                                        ((UITextBox)item).Text = "主伺服报警";
-                                        break;
-                                    case 16:
-                                        ((UITextBox)item).Text = "副伺服报警";
-                                        break;
-                                    case 17:
-                                        ((UITextBox)item).Text = "液位低报警";
-                                        break;
-                                    case 18:
-                                        ((UITextBox)item).Text = "油温需冷却";
-                                        break;
-                                    case 19:
-                                        ((UITextBox)item).Text = "油温超高停机";
+                                        ((UITextBox)item).Text = "本地自动,已暂停";
                                         break;
                                     case 20:
-                                        ((UITextBox)item).Text = "润滑油位不足";
+                                        ((UITextBox)item).Text = "联机自动,步骤0,请手动把油缸退到下极限";
                                         break;
                                     case 21:
-                                        ((UITextBox)item).Text = "地坑漏油报警";
+                                        ((UITextBox)item).Text = "联机自动,步骤0,等待PLC给出第1次顶出命令";
                                         break;
                                     case 22:
-                                        ((UITextBox)item).Text = "锁紧完成";
+                                        ((UITextBox)item).Text = "联机自动,步骤0,型号2,等待PLC给出第2次顶出命令";
                                         break;
                                     case 23:
-                                        ((UITextBox)item).Text = "松锁完成";
+                                        ((UITextBox)item).Text = "联机自动,步骤0,等待PLC给出第2次顶出命令";
                                         break;
                                     case 24:
-                                        ((UITextBox)item).Text = "锁紧缸未松锁";
+                                        ((UITextBox)item).Text = "联机自动,步骤0,型号2,等待PLC给出第3次顶出命令";
                                         break;
                                     case 25:
-                                        ((UITextBox)item).Text = "松锁未置上极限";
+                                        ((UITextBox)item).Text = "联机自动,步骤1,等待到达慢顶位置";
                                         break;
                                     case 26:
-                                        ((UITextBox)item).Text = "未置上极限";
+                                        ((UITextBox)item).Text = "联机自动,步骤2,等待到达压力/位置上限";
                                         break;
                                     case 27:
-                                        ((UITextBox)item).Text = "锁紧缸未锁紧";
+                                        ((UITextBox)item).Text = "联机自动,步骤3,等待保压计时完成";
                                         break;
                                     case 28:
-                                        ((UITextBox)item).Text = "顶缸未置下极限";
+                                        ((UITextBox)item).Text = "联机自动,步骤4,等待PLC给出下降命令";
                                         break;
                                     case 29:
-                                        ((UITextBox)item).Text = "移动台未贴合";
+                                        ((UITextBox)item).Text = "联机自动,步骤4,等待泄压计时完成";
                                         break;
                                     case 30:
-                                        ((UITextBox)item).Text = "移动台未夹紧";
+                                        ((UITextBox)item).Text = "联机自动,步骤5,等待油缸到达下极限位置";
                                         break;
                                     case 31:
-                                        ((UITextBox)item).Text = "移动台未进到位";
+                                        ((UITextBox)item).Text = "联机自动,已暂停";
+                                        break;
+                                    case 40:
+                                        ((UITextBox)item).Text = "联机自动,已暂停";
+                                        break;
+                                    case 41:
+                                        ((UITextBox)item).Text = "请选择合法的操作模式";
                                         break;
-                                    case 32:
-                                        ((UITextBox)item).Text = "安全撑未移出";
+                                    default:
+                                        ((UITextBox)item).Text = "";
                                         break;
                                 }
                             }
+                            else if (name == "当前模式提示")
+                            {
+                                switch (Convert.ToInt32(ReadPLCHelp.dictPressure[name].value))
+                                {
+                                    case 0:
+                                        ((UITextBox)item).Text = "无模式";
+                                        break;
+                                    case 1:
+                                        ((UITextBox)item).Text = "调整模式";
+                                        break;
+                                    case 2:
+                                        ((UITextBox)item).Text = "手动模式";
+                                        break;
+                                    case 3:
+                                        ((UITextBox)item).Text = "半自动模式";
+                                        break;
+                                    case 4:
+                                        ((UITextBox)item).Text = "联机模式";
+                                        break;
+                                    default:
+                                        ((UITextBox)item).Text = "";
+                                        break;
+                                }
+                            }
+                            else if (name == "当前产品型号")
+                            {
+                                string model = ReadPLCHelp.dictPressure[name].value;
+                                if (model == "0")
+                                    ((UITextBox)item).Text = "型号非法";
+                                else
+                                    ((UITextBox)item).Text = "产品型号" + model;
+                            }
                             else
                             {
-                                //name = name.Remove(0, 3);
                                 ((UITextBox)item).Text = ReadPLCHelp.dictPressure[name].value;
                             }
                         }
@@ -302,5 +310,12 @@ namespace HRT_Measure
             {
             }
         }
+
+        private void cob产品型号选择_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string name = "当前产品型号";
+            int strValue = cob产品型号选择.SelectedIndex + 1;
+            ProgramHelp.Instance.comm压机.WriteShort(ReadPLCHelp.dictPressure[name].Address, Convert.ToInt16(Convert.ToSingle(strValue) / ReadPLCHelp.dictPressure[name].Scale), out string str);
+        }
     }
 }

Fichier diff supprimé car celui-ci est trop grand
+ 820 - 948
LHY-WD-BC_MES/Windows/FrmPressure.Designer.cs


+ 33 - 5
LHY-WD-BC_MES/Windows/FrmPressure.cs

@@ -42,7 +42,8 @@ namespace HRT_Measure
                     Thread.Sleep(1000);
                     continue;
                 }
-                foreach(var txt in uiTitlePanel压机.Controls)
+                TabPage targetTab = tbp油缸自动参数设定.SelectedTab; // 获取当前选中的TabPage
+                foreach (var txt in targetTab.Controls)
                 {
                     if (txt is UITextBox)
                     {
@@ -50,7 +51,15 @@ namespace HRT_Measure
                         ((UITextBox)txt).BeginInvoke(new Action(() => { ((UITextBox)txt).Text = ReadPLCHelp.dictPressure[name].value; }));
                         
                     }
+                }
+                foreach (var txt in gpb伺服电机参数设定.Controls)
+                {
+                    if (txt is UITextBox)
+                    {
+                        string name = ((UITextBox)txt).Name.Remove(0, 3);
+                        ((UITextBox)txt).BeginInvoke(new Action(() => { ((UITextBox)txt).Text = ReadPLCHelp.dictPressure[name].value; }));
 
+                    }
                 }
                 Thread.Sleep(100);
             }
@@ -68,16 +77,35 @@ namespace HRT_Measure
                 var btn = (UISymbolButton)sender;
                 string name = btn.Name.Remove(0, 3);
                 string strValue = "";
-                foreach (var ctl in uiTitlePanel压机.Controls)
+
+                if (btn.Parent is UIGroupBox) //伺服电机参数设定
                 {
-                    if (ctl is UITextBox)
+                    foreach (var ctl in gpb伺服电机参数设定.Controls)
                     {
-                        if (((UITextBox)ctl).Name == $"txt{name}")
+                        if (ctl is UITextBox)
                         {
-                            strValue = ((UITextBox)ctl).Text;
+                            if (((UITextBox)ctl).Name == $"txt{name}")
+                            {
+                                strValue = ((UITextBox)ctl).Text;
+                            }
                         }
                     }
                 }
+                else //油缸自动参数设定
+                {
+                    TabPage targetTab = tbp油缸自动参数设定.SelectedTab; // 获取当前选中的TabPage
+                    foreach (var ctl in targetTab.Controls)
+                    {
+                        if (ctl is UITextBox)
+                        {
+                            if (((UITextBox)ctl).Name == $"txt{name}")
+                            {
+                                strValue = ((UITextBox)ctl).Text;
+                            }
+                        }
+                    }
+                }
+
                 switch (ReadPLCHelp.dictPressure[name].type)
                 {
                     case "short":

BIN
LHY-WD-BC_MES/bin/Debug/BaseLib.dll


BIN
LHY-WD-BC_MES/bin/Debug/药环压制设备线体外数据监控系统.exe


BIN
LHY-WD-BC_MES/bin/Debug/药环压制设备线体外数据监控系统.pdb


BIN
LHY-WD-BC_MES/obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
LHY-WD-BC_MES/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


BIN
LHY-WD-BC_MES/obj/Debug/监测软件.csproj.AssemblyReference.cache


+ 8 - 8
LHY-WD-BC_MES/obj/Debug/监测软件.csproj.FileListAbsolute.txt

@@ -979,14 +979,6 @@ C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\Newtonsoft.Json.dll
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\SunnyUI.Common.dll
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\SunnyUI.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\ThoughtWorks.QRCode.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\ICSharpCode.SharpZipLib.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\MySql.Data.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OOXML.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXml4Net.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXmlFormats.dll
-C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\BaseLib.pdb
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\Newtonsoft.Json.xml
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\监测软件.csproj.AssemblyReference.cache
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmMain.resources
@@ -1012,3 +1004,11 @@ C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\监测软件.csproj.CopyComplete
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\药环压制设备线体外数据监控系统.exe
 C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\药环压制设备线体外数据监控系统.pdb
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\ThoughtWorks.QRCode.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\ICSharpCode.SharpZipLib.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\MySql.Data.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OOXML.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXml4Net.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXmlFormats.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\BaseLib.pdb

BIN
LHY-WD-BC_MES/obj/Debug/监测软件.csproj.GenerateResource.cache


BIN
LHY-WD-BC_MES/obj/Debug/药环压制设备线体外数据监控系统.exe


BIN
LHY-WD-BC_MES/obj/Debug/药环压制设备线体外数据监控系统.pdb


+ 100 - 57
LHY-WD-BC_MES/山西/ReadPLCHelp.cs

@@ -62,61 +62,104 @@ namespace HRT_Measure
             listPressureStr.Clear();
             #region MyRegion
 
-            listPressureStr.Add("主缸位置,D5,short,0.1");
-            listPressureStr.Add("位置修正值,D235,short,0.1");
-            listPressureStr.Add("主缸压力,D4,short,0.1");
-            //listPressureStr.Add("位置应用值,D5,short");
-            listPressureStr.Add("当前动作,D10,short,1");
-            listPressureStr.Add("动作提示,D11,short,1");
-            listPressureStr.Add("设定1压力,D12,short,0.1");
-            listPressureStr.Add("设定1流量,D13,short,1");
-
-            listPressureStr.Add("顶缸位移,D106,short,0.1");
-            listPressureStr.Add("主缸速度,D125,short,0.1");
-            listPressureStr.Add("顶缸速度,D127,short,0.1");
-
-            listPressureStr.Add("设定1压力模拟量,D130,short,1");
-            listPressureStr.Add("设定1流量模拟量,D134,short,1");
-            listPressureStr.Add("保压倒计时,D180,short,1");
-            listPressureStr.Add("泄压倒计时,D185,short,1");
-            listPressureStr.Add("主缸压力设定,D200,short,0.1");
-            listPressureStr.Add("泄压延时设置,D202,short,0.1");
-            listPressureStr.Add("保压延时设定,D203,short,0.1");
-            listPressureStr.Add("顶出停止位置设定,D206,short,0.1");
-            listPressureStr.Add("快退减速位置设定,D207,short,0.1");
-            listPressureStr.Add("慢速顶出位置设定,D209,short,0.1");
-            listPressureStr.Add("快速退回位置设定,D210,short,0.1");
-            listPressureStr.Add("退回停止位置设定,D211,short,0.1");
-
-            listPressureStr.Add("快上压力,D220,short,0.1");
-            listPressureStr.Add("快上流量,D221,short,1");
-            listPressureStr.Add("慢上压力,D222,short,0.1");
-            listPressureStr.Add("慢上流量,D223,short,1");
-
-
-            listPressureStr.Add("减退压力,D224,short,0.1");
-            listPressureStr.Add("减退流量,D225,short,1");
-            listPressureStr.Add("慢退压力,D226,short,0.1");
-            listPressureStr.Add("慢退流量,D227,short,1");
-            listPressureStr.Add("快退压力,D228,short,0.1");
-            listPressureStr.Add("快退流量,D229,short,1");
-            //listPressureStr.Add("位置修正值,D235,short,0.1");
-            listPressureStr.Add("位置应用值,D245,short,0.1");
-            listPressureStr.Add("工件计数,D400,short,1");
-            listPressureStr.Add("设定计数,D401,short,1");
-
-            listPressureStr.Add("第一次压力,D284,short,0.1");
-            listPressureStr.Add("第二次压力,D262,short,0.1");
-            listPressureStr.Add("第三次压力,D264,short,0.1");
-            listPressureStr.Add("第一次保压时间,D266,short,0.1");
-            listPressureStr.Add("第二次保压时间,D268,short,0.1");
-            listPressureStr.Add("第三次保压时间,D270,short,0.1");
-            listPressureStr.Add("第一次顶出停止位置,D272,short,0.1");
-            listPressureStr.Add("第二次顶出停止位置,D274,short,0.1");
-            listPressureStr.Add("第三次顶出停止位置,D276,short,0.1");
-            listPressureStr.Add("第一次顶出减速位置,D278,short,0.1");
-            listPressureStr.Add("第二次顶出减速位置,D280,short,0.1");
-            listPressureStr.Add("第三次顶出减速位置,D282,short,0.1");
+            listPressureStr.Add("当前产品型号, D1000, short, 1");
+            listPressureStr.Add("主缸当前压力设定,D78,short,0.1");
+            listPressureStr.Add("主缸当前流量设定,D80,short,1");
+            listPressureStr.Add("主缸当前位置,D62,short,0.1");
+            listPressureStr.Add("主缸当前压力,D34,short,0.1");
+            listPressureStr.Add("工件计数,D90,short,1");
+            listPressureStr.Add("当前动作,D100,short,1");
+            listPressureStr.Add("操作提示,D1,short,1");
+            listPressureStr.Add("当前模式提示,D3,short,1");
+
+            listPressureStr.Add("步骤1油缸压力设定1,D220,short,0.1");
+            listPressureStr.Add("步骤1油缸保压时间设定1,D221,short,0.1");
+            listPressureStr.Add("步骤2油缸压力设定1,D222,short,0.1");
+            listPressureStr.Add("步骤2油缸保压时间设定1,D223,short,0.1");
+            listPressureStr.Add("步骤3油缸压力设定1,D224,short,0.1");
+            listPressureStr.Add("步骤3油缸保压时间设定1,D225,short,0.1");
+            listPressureStr.Add("步骤1停止顶出位置设定1,D300,short,0.1");
+            listPressureStr.Add("步骤1减速顶出位置设定1,D301,short,0.1");
+            listPressureStr.Add("步骤2停止顶出位置设定1,D302,short,0.1");
+            listPressureStr.Add("步骤2减速顶出位置设定1,D303,short,0.1");
+            listPressureStr.Add("步骤3停止顶出位置设定1,D304,short,0.1");
+            listPressureStr.Add("步骤3减速顶出位置设定1,D305,short,0.1");
+
+            listPressureStr.Add("步骤1油缸压力设定2,D226,short,0.1");
+            listPressureStr.Add("步骤1油缸保压时间设定2,D227,short,0.1");
+            listPressureStr.Add("步骤2油缸压力设定2,D228,short,0.1");
+            listPressureStr.Add("步骤2油缸保压时间设定2,D229,short,0.1");
+            listPressureStr.Add("步骤3油缸压力设定2,D230,short,0.1");
+            listPressureStr.Add("步骤3油缸保压时间设定2,D231,short,0.1");
+            listPressureStr.Add("步骤1停止顶出位置设定2,D306,short,0.1");
+            listPressureStr.Add("步骤1减速顶出位置设定2,D307,short,0.1");
+            listPressureStr.Add("步骤2停止顶出位置设定2,D308,short,0.1");
+            listPressureStr.Add("步骤2减速顶出位置设定2,D309,short,0.1");
+            listPressureStr.Add("步骤3停止顶出位置设定2,D310,short,0.1");
+            listPressureStr.Add("步骤3减速顶出位置设定2,D311,short,0.1");
+
+            listPressureStr.Add("步骤1油缸压力设定3,D232,short,0.1");
+            listPressureStr.Add("步骤1油缸保压时间设定3,D233,short,0.1");
+            listPressureStr.Add("步骤2油缸压力设定3,D234,short,0.1");
+            listPressureStr.Add("步骤2油缸保压时间设定3,D235,short,0.1");
+            listPressureStr.Add("步骤3油缸压力设定3,D236,short,0.1");
+            listPressureStr.Add("步骤3油缸保压时间设定3,D237,short,0.1");
+            listPressureStr.Add("步骤1停止顶出位置设定3,D312,short,0.1");
+            listPressureStr.Add("步骤1减速顶出位置设定3,D313,short,0.1");
+            listPressureStr.Add("步骤2停止顶出位置设定3,D314,short,0.1");
+            listPressureStr.Add("步骤2减速顶出位置设定3,D315,short,0.1");
+            listPressureStr.Add("步骤3停止顶出位置设定3,D316,short,0.1");
+            listPressureStr.Add("步骤3减速顶出位置设定3,D317,short,0.1");
+
+            listPressureStr.Add("步骤1油缸压力设定4,D238,short,0.1");
+            listPressureStr.Add("步骤1油缸保压时间设定4,D239,short,0.1");
+            listPressureStr.Add("步骤2油缸压力设定4,D240,short,0.1");
+            listPressureStr.Add("步骤2油缸保压时间设定4,D241,short,0.1");
+            listPressureStr.Add("步骤3油缸压力设定4,D242,short,0.1");
+            listPressureStr.Add("步骤3油缸保压时间设定4,D243,short,0.1");
+            listPressureStr.Add("步骤1停止顶出位置设定4,D318,short,0.1");
+            listPressureStr.Add("步骤1减速顶出位置设定4,D319,short,0.1");
+            listPressureStr.Add("步骤2停止顶出位置设定4,D320,short,0.1");
+            listPressureStr.Add("步骤2减速顶出位置设定4,D321,short,0.1");
+            listPressureStr.Add("步骤3停止顶出位置设定4,D322,short,0.1");
+            listPressureStr.Add("步骤3减速顶出位置设定4,D323,short,0.1");
+
+            listPressureStr.Add("步骤1油缸压力设定5,D244,short,0.1");
+            listPressureStr.Add("步骤1油缸保压时间设定5,D245,short,0.1");
+            listPressureStr.Add("步骤2油缸压力设定5,D246,short,0.1");
+            listPressureStr.Add("步骤2油缸保压时间设定5,D247,short,0.1");
+            listPressureStr.Add("步骤3油缸压力设定5,D248,short,0.1");
+            listPressureStr.Add("步骤3油缸保压时间设定5,D249,short,0.1");
+            listPressureStr.Add("步骤1停止顶出位置设定5,D324,short,0.1");
+            listPressureStr.Add("步骤1减速顶出位置设定5,D325,short,0.1");
+            listPressureStr.Add("步骤2停止顶出位置设定5,D326,short,0.1");
+            listPressureStr.Add("步骤2减速顶出位置设定5,D327,short,0.1");
+            listPressureStr.Add("步骤3停止顶出位置设定5,D328,short,0.1");
+            listPressureStr.Add("步骤3减速顶出位置设定5,D329,short,0.1");
+
+            listPressureStr.Add("步骤1油缸压力设定6,D250,short,0.1");
+            listPressureStr.Add("步骤1油缸保压时间设定6,D251,short,0.1");
+            listPressureStr.Add("步骤2油缸压力设定6,D252,short,0.1");
+            listPressureStr.Add("步骤2油缸保压时间设定6,D253,short,0.1");
+            listPressureStr.Add("步骤3油缸压力设定6,D254,short,0.1");
+            listPressureStr.Add("步骤3油缸保压时间设定6,D255,short,0.1");
+            listPressureStr.Add("步骤1停止顶出位置设定6,D330,short,0.1");
+            listPressureStr.Add("步骤1减速顶出位置设定6,D331,short,0.1");
+            listPressureStr.Add("步骤2停止顶出位置设定6,D332,short,0.1");
+            listPressureStr.Add("步骤2减速顶出位置设定6,D333,short,0.1");
+            listPressureStr.Add("步骤3停止顶出位置设定6,D334,short,0.1");
+            listPressureStr.Add("步骤3减速顶出位置设定6,D335,short,0.1");
+
+            listPressureStr.Add("快顶压力设定值,D340,short,0.1");
+            listPressureStr.Add("快顶流量设定值,D341,short,1");
+            listPressureStr.Add("慢顶压力设定值,D342,short,0.1");
+            listPressureStr.Add("慢顶流量设定值,D343,short,1");
+            listPressureStr.Add("慢退压力设定值,D344,short,0.1");
+            listPressureStr.Add("慢退流量设定值,D345,short,1");
+            listPressureStr.Add("快退压力设定值,D346,short,0.1");
+            listPressureStr.Add("快退流量设定值,D347,short,1");
+            listPressureStr.Add("空载压力设置,D348,short,0.1");
+            listPressureStr.Add("空载流量设置,D349,short,1");
 
             #endregion
 
@@ -813,11 +856,11 @@ namespace HRT_Measure
                         {
                             ProgramHelp.Instance.comm压机.ReadShort(item.Value.Address, out  svalue, out  str);
                             item.Value.value = (svalue * item.Value.Scale).ToString();
-                            if(item.Value.Name == "主缸位置")
+                            if(item.Value.Name == "主缸当前位置")
                             {
                                 str主缸当前位置 = item.Value.value;
                             }
-                            if (item.Value.Name == "主缸压力")
+                            if (item.Value.Name == "主缸当前压力")
                             {
                                 str主缸当前压力 = item.Value.value;
                             }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff