Skip to content

李娜 / RC1271-DUOStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8b174bb9 由 LN
选项

界面 调整

1 个父辈 2c839675
内嵌 并排
正在显示 23 个修改的文件 包含 991 行增加 和 907 行删除
source/Common/Setting_Init.cs
......@@ -103,5 +103,7 @@ namespace OnlineStore.Common
public static string CodeCount = "CodeCount";
public static string AutoShelfInstore = "AutoShelfInstore";
public static string UseDoor = "UseDoor";
public static string InoutDefaultPosition = "InoutDefaultPosition";
}
}
source/DUOStore/App.config
......@@ -60,6 +60,8 @@
<add key="UseDoor" value="1" />
<add key="Agv_Log_Open" value="1" />
<add key="AutoShelfInstore" value="1" />
<!--进出轴位置-->
<add key ="InoutDefaultPosition" value ="3000"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/DUOStore/FrmAxisMove.Designer.cs
......@@ -28,22 +28,29 @@ namespace OnlineStore.DUOStore
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisMove));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupInout = new System.Windows.Forms.GroupBox();
this.txtInOutP2 = new System.Windows.Forms.TextBox();
this.txtInOutP1 = new System.Windows.Forms.TextBox();
this.btnSaveP = new System.Windows.Forms.Button();
this.txtUpdownP6 = new System.Windows.Forms.TextBox();
this.btnUpdownP6 = new System.Windows.Forms.Button();
this.txtUpdownP5 = new System.Windows.Forms.TextBox();
this.btnUpdownP5 = new System.Windows.Forms.Button();
this.txtUpdownP4 = new System.Windows.Forms.TextBox();
this.btnUpdownP4 = new System.Windows.Forms.Button();
this.txtUpdownP1 = new System.Windows.Forms.TextBox();
this.txtUpdownP2 = new System.Windows.Forms.TextBox();
this.txtMiddleP1 = new System.Windows.Forms.TextBox();
this.txtBatchP1 = new System.Windows.Forms.TextBox();
this.txtBatchP2 = new System.Windows.Forms.TextBox();
this.txtMiddleP2 = new System.Windows.Forms.TextBox();
this.btnInOutP2 = new System.Windows.Forms.Button();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.btnUpdownP1 = new System.Windows.Forms.Button();
this.btnUpdownP2 = new System.Windows.Forms.Button();
this.btnMiddleP1 = new System.Windows.Forms.Button();
this.btnBatchP1 = new System.Windows.Forms.Button();
this.btnBatchP2 = new System.Windows.Forms.Button();
this.btnMiddleP2 = new System.Windows.Forms.Button();
this.txtInoutP11 = new System.Windows.Forms.TextBox();
this.btnInoutP11 = new System.Windows.Forms.Button();
this.txtMiddleP11 = new System.Windows.Forms.TextBox();
this.btnMiddleP11 = new System.Windows.Forms.Button();
this.txtUpdownP3 = new System.Windows.Forms.TextBox();
this.btnUpdownP3 = new System.Windows.Forms.Button();
this.txtMiddleP3 = new System.Windows.Forms.TextBox();
this.btnMiddleP3 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
......@@ -57,61 +64,179 @@ namespace OnlineStore.DUOStore
//
// groupInout
//
this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupInout.Controls.Add(this.txtInOutP2);
this.groupInout.Controls.Add(this.txtInOutP1);
this.groupInout.Controls.Add(this.btnSaveP);
this.groupInout.Controls.Add(this.txtUpdownP6);
this.groupInout.Controls.Add(this.btnUpdownP6);
this.groupInout.Controls.Add(this.txtUpdownP5);
this.groupInout.Controls.Add(this.btnUpdownP5);
this.groupInout.Controls.Add(this.txtUpdownP4);
this.groupInout.Controls.Add(this.btnUpdownP4);
this.groupInout.Controls.Add(this.txtUpdownP1);
this.groupInout.Controls.Add(this.txtUpdownP2);
this.groupInout.Controls.Add(this.txtMiddleP1);
this.groupInout.Controls.Add(this.txtBatchP1);
this.groupInout.Controls.Add(this.txtBatchP2);
this.groupInout.Controls.Add(this.txtMiddleP2);
this.groupInout.Controls.Add(this.btnInOutP2);
this.groupInout.Controls.Add(this.btnInOutP1);
this.groupInout.Controls.Add(this.btnUpdownP1);
this.groupInout.Controls.Add(this.btnUpdownP2);
this.groupInout.Controls.Add(this.btnMiddleP1);
this.groupInout.Controls.Add(this.btnBatchP1);
this.groupInout.Controls.Add(this.btnBatchP2);
this.groupInout.Controls.Add(this.btnMiddleP2);
this.groupInout.Controls.Add(this.txtInoutP11);
this.groupInout.Controls.Add(this.btnInoutP11);
this.groupInout.Controls.Add(this.txtMiddleP11);
this.groupInout.Controls.Add(this.btnMiddleP11);
this.groupInout.Controls.Add(this.txtUpdownP3);
this.groupInout.Controls.Add(this.btnUpdownP3);
this.groupInout.Controls.Add(this.txtMiddleP3);
this.groupInout.Controls.Add(this.btnMiddleP3);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 377);
this.groupInout.Location = new System.Drawing.Point(12, 317);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(734, 164);
this.groupInout.Size = new System.Drawing.Size(734, 299);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "提升机构位置信息";
//
// txtInOutP2
//
this.txtInOutP2.AcceptsReturn = true;
this.txtInOutP2.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(635, 30);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(89, 23);
this.txtInOutP2.TabIndex = 306;
this.txtInOutP2.Text = "999999";
//
// txtInOutP1
//
this.txtInOutP1.AcceptsReturn = true;
this.txtInOutP1.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(634, 69);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(89, 23);
this.txtInOutP1.TabIndex = 304;
this.txtInOutP1.Text = "999999";
// btnSaveP
//
this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveP.Location = new System.Drawing.Point(51, 244);
this.btnSaveP.Name = "btnSaveP";
this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.btnSaveP.TabIndex = 313;
this.btnSaveP.Text = "保存位置";
this.btnSaveP.UseVisualStyleBackColor = true;
this.btnSaveP.Click += new System.EventHandler(this.btnSaveP_Click);
//
// txtUpdownP6
//
this.txtUpdownP6.AcceptsReturn = true;
this.txtUpdownP6.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP6.Location = new System.Drawing.Point(602, 223);
this.txtUpdownP6.MaxLength = 0;
this.txtUpdownP6.Name = "txtUpdownP6";
this.txtUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP6.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP6.TabIndex = 312;
this.txtUpdownP6.Text = "999999";
//
// btnUpdownP6
//
this.btnUpdownP6.AutoSize = true;
this.btnUpdownP6.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP6.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP6.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP6.Location = new System.Drawing.Point(382, 218);
this.btnUpdownP6.Name = "btnUpdownP6";
this.btnUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP6.Size = new System.Drawing.Size(205, 33);
this.btnUpdownP6.TabIndex = 311;
this.btnUpdownP6.Text = "T3_升降轴_右侧料仓取放料高点P6:";
this.btnUpdownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP6.UseVisualStyleBackColor = false;
this.btnUpdownP6.Click += new System.EventHandler(this.btnUpdownP6_Click);
//
// txtUpdownP5
//
this.txtUpdownP5.AcceptsReturn = true;
this.txtUpdownP5.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP5.Location = new System.Drawing.Point(602, 185);
this.txtUpdownP5.MaxLength = 0;
this.txtUpdownP5.Name = "txtUpdownP5";
this.txtUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP5.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP5.TabIndex = 310;
this.txtUpdownP5.Text = "999999";
//
// btnUpdownP5
//
this.btnUpdownP5.AutoSize = true;
this.btnUpdownP5.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP5.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP5.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP5.Location = new System.Drawing.Point(382, 180);
this.btnUpdownP5.Name = "btnUpdownP5";
this.btnUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP5.Size = new System.Drawing.Size(205, 33);
this.btnUpdownP5.TabIndex = 309;
this.btnUpdownP5.Text = "T3_升降轴_右侧料仓取放料低点P5:";
this.btnUpdownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP5.UseVisualStyleBackColor = false;
this.btnUpdownP5.Click += new System.EventHandler(this.btnUpdownP5_Click);
//
// txtUpdownP4
//
this.txtUpdownP4.AcceptsReturn = true;
this.txtUpdownP4.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP4.Location = new System.Drawing.Point(602, 147);
this.txtUpdownP4.MaxLength = 0;
this.txtUpdownP4.Name = "txtUpdownP4";
this.txtUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP4.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP4.TabIndex = 308;
this.txtUpdownP4.Text = "999999";
//
// btnUpdownP4
//
this.btnUpdownP4.AutoSize = true;
this.btnUpdownP4.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP4.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP4.Location = new System.Drawing.Point(382, 142);
this.btnUpdownP4.Name = "btnUpdownP4";
this.btnUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP4.Size = new System.Drawing.Size(205, 33);
this.btnUpdownP4.TabIndex = 307;
this.btnUpdownP4.Text = "T3_升降轴_左侧料仓取放料高点P4";
this.btnUpdownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP4.UseVisualStyleBackColor = false;
this.btnUpdownP4.Click += new System.EventHandler(this.btnUpdownP4_Click);
//
// txtUpdownP1
//
this.txtUpdownP1.AcceptsReturn = true;
this.txtUpdownP1.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP1.Location = new System.Drawing.Point(603, 33);
this.txtUpdownP1.MaxLength = 20;
this.txtUpdownP1.Name = "txtUpdownP1";
this.txtUpdownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP1.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP1.TabIndex = 306;
this.txtUpdownP1.Text = "999999";
//
// txtUpdownP2
//
this.txtUpdownP2.AcceptsReturn = true;
this.txtUpdownP2.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(602, 71);
this.txtUpdownP2.MaxLength = 20;
this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP2.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP2.TabIndex = 304;
this.txtUpdownP2.Text = "999999";
//
// txtMiddleP1
//
......@@ -120,7 +245,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(392, 30);
this.txtMiddleP1.Location = new System.Drawing.Point(222, 119);
this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -135,7 +260,7 @@ namespace OnlineStore.DUOStore
this.txtBatchP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP1.Location = new System.Drawing.Point(150, 30);
this.txtBatchP1.Location = new System.Drawing.Point(222, 34);
this.txtBatchP1.MaxLength = 20;
this.txtBatchP1.Name = "txtBatchP1";
this.txtBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -150,7 +275,7 @@ namespace OnlineStore.DUOStore
this.txtBatchP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP2.Location = new System.Drawing.Point(150, 67);
this.txtBatchP2.Location = new System.Drawing.Point(222, 73);
this.txtBatchP2.MaxLength = 20;
this.txtBatchP2.Name = "txtBatchP2";
this.txtBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -165,7 +290,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(391, 67);
this.txtMiddleP2.Location = new System.Drawing.Point(222, 158);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -173,41 +298,43 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.TabIndex = 286;
this.txtMiddleP2.Text = "999999";
//
// btnInOutP2
//
this.btnInOutP2.AutoSize = true;
this.btnInOutP2.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(491, 25);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
this.btnInOutP2.TabIndex = 305;
this.btnInOutP2.Text = "进出轴取料点P2:";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = false;
//
// btnInOutP1
//
this.btnInOutP1.AutoSize = true;
this.btnInOutP1.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(491, 64);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
this.btnInOutP1.TabIndex = 303;
this.btnInOutP1.Text = "进出轴待机点P1:";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.UseVisualStyleBackColor = false;
// btnUpdownP1
//
this.btnUpdownP1.AutoSize = true;
this.btnUpdownP1.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP1.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP1.Location = new System.Drawing.Point(382, 28);
this.btnUpdownP1.Name = "btnUpdownP1";
this.btnUpdownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP1.Size = new System.Drawing.Size(205, 33);
this.btnUpdownP1.TabIndex = 305;
this.btnUpdownP1.Text = "T3_升降轴_料串取放料低点P1:";
this.btnUpdownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP1.UseVisualStyleBackColor = false;
this.btnUpdownP1.Click += new System.EventHandler(this.btnUpdownP1_Click);
//
// btnUpdownP2
//
this.btnUpdownP2.AutoSize = true;
this.btnUpdownP2.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(382, 66);
this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(205, 33);
this.btnUpdownP2.TabIndex = 303;
this.btnUpdownP2.Text = "T3_升降轴_料串取放料高点P2:";
this.btnUpdownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.UseVisualStyleBackColor = false;
this.btnUpdownP2.Click += new System.EventHandler(this.btnUpdownP2_Click);
//
// btnMiddleP1
//
......@@ -218,14 +345,15 @@ namespace OnlineStore.DUOStore
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(248, 25);
this.btnMiddleP1.Location = new System.Drawing.Point(15, 113);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP1.Size = new System.Drawing.Size(193, 33);
this.btnMiddleP1.TabIndex = 301;
this.btnMiddleP1.Text = "旋转轴待机点P1:";
this.btnMiddleP1.Text = "T2_旋转轴待机点/取放料点P1:";
this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.UseVisualStyleBackColor = false;
this.btnMiddleP1.Click += new System.EventHandler(this.btnMiddleP1_Click);
//
// btnBatchP1
//
......@@ -236,14 +364,15 @@ namespace OnlineStore.DUOStore
this.btnBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP1.ForeColor = System.Drawing.Color.Red;
this.btnBatchP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP1.Location = new System.Drawing.Point(6, 25);
this.btnBatchP1.Location = new System.Drawing.Point(15, 28);
this.btnBatchP1.Name = "btnBatchP1";
this.btnBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP1.Size = new System.Drawing.Size(140, 33);
this.btnBatchP1.Size = new System.Drawing.Size(193, 33);
this.btnBatchP1.TabIndex = 293;
this.btnBatchP1.Text = "升降轴入料口低点P1:";
this.btnBatchP1.Text = "T1_提升轴待机点P1:";
this.btnBatchP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP1.UseVisualStyleBackColor = false;
this.btnBatchP1.Click += new System.EventHandler(this.btnBatchP1_Click);
//
// btnBatchP2
//
......@@ -254,14 +383,15 @@ namespace OnlineStore.DUOStore
this.btnBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP2.ForeColor = System.Drawing.Color.Red;
this.btnBatchP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP2.Location = new System.Drawing.Point(6, 62);
this.btnBatchP2.Location = new System.Drawing.Point(15, 67);
this.btnBatchP2.Name = "btnBatchP2";
this.btnBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP2.Size = new System.Drawing.Size(140, 33);
this.btnBatchP2.Size = new System.Drawing.Size(193, 33);
this.btnBatchP2.TabIndex = 295;
this.btnBatchP2.Text = "升降轴入料口高点P2:";
this.btnBatchP2.Text = "T1_提升轴上升目标点P2:";
this.btnBatchP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP2.UseVisualStyleBackColor = false;
this.btnBatchP2.Click += new System.EventHandler(this.btnBatchP2_Click);
//
// btnMiddleP2
//
......@@ -271,108 +401,113 @@ namespace OnlineStore.DUOStore
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(248, 62);
this.btnMiddleP2.Location = new System.Drawing.Point(15, 152);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP2.Size = new System.Drawing.Size(193, 33);
this.btnMiddleP2.TabIndex = 285;
this.btnMiddleP2.Text = "旋转轴库位点P2:";
this.btnMiddleP2.Text = "T2_旋转轴_左侧料仓取放料点P2:";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP2.UseVisualStyleBackColor = false;
//
// txtInoutP11
//
this.txtInoutP11.AcceptsReturn = true;
this.txtInoutP11.BackColor = System.Drawing.SystemColors.Window;
this.txtInoutP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(634, 108);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutP11.Size = new System.Drawing.Size(89, 23);
this.txtInoutP11.TabIndex = 227;
this.txtInoutP11.Text = "999999";
//
// btnInoutP11
//
this.btnInoutP11.AutoSize = true;
this.btnInoutP11.BackColor = System.Drawing.SystemColors.Control;
this.btnInoutP11.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInoutP11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(491, 103);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(140, 33);
this.btnInoutP11.TabIndex = 226;
this.btnInoutP11.Text = "进出轴出料口点P11:";
this.btnInoutP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.UseVisualStyleBackColor = false;
//
// txtMiddleP11
//
this.txtMiddleP11.AcceptsReturn = true;
this.txtMiddleP11.BackColor = System.Drawing.SystemColors.Window;
this.txtMiddleP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP11.Location = new System.Drawing.Point(391, 106);
this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP11.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP11.TabIndex = 225;
this.txtMiddleP11.Text = "999999";
//
// btnMiddleP11
//
this.btnMiddleP11.AutoSize = true;
this.btnMiddleP11.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleP11.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMiddleP11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.Location = new System.Drawing.Point(248, 101);
this.btnMiddleP11.Name = "btnMiddleP11";
this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP11.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP11.TabIndex = 224;
this.btnMiddleP11.Text = "旋转轴出料口点P11:";
this.btnMiddleP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.UseVisualStyleBackColor = false;
this.btnMiddleP2.Click += new System.EventHandler(this.btnMiddleP2_Click);
//
// txtUpdownP3
//
this.txtUpdownP3.AcceptsReturn = true;
this.txtUpdownP3.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(602, 109);
this.txtUpdownP3.MaxLength = 0;
this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP3.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP3.TabIndex = 227;
this.txtUpdownP3.Text = "999999";
//
// btnUpdownP3
//
this.btnUpdownP3.AutoSize = true;
this.btnUpdownP3.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP3.Location = new System.Drawing.Point(382, 104);
this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(205, 33);
this.btnUpdownP3.TabIndex = 226;
this.btnUpdownP3.Text = "T3_升降轴_左侧料仓取放料低点P3:";
this.btnUpdownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP3.UseVisualStyleBackColor = false;
this.btnUpdownP3.Click += new System.EventHandler(this.btnUpdownP3_Click);
//
// txtMiddleP3
//
this.txtMiddleP3.AcceptsReturn = true;
this.txtMiddleP3.BackColor = System.Drawing.SystemColors.Window;
this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP3.Location = new System.Drawing.Point(222, 197);
this.txtMiddleP3.MaxLength = 0;
this.txtMiddleP3.Name = "txtMiddleP3";
this.txtMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP3.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP3.TabIndex = 225;
this.txtMiddleP3.Text = "999999";
//
// btnMiddleP3
//
this.btnMiddleP3.AutoSize = true;
this.btnMiddleP3.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMiddleP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP3.Location = new System.Drawing.Point(15, 191);
this.btnMiddleP3.Name = "btnMiddleP3";
this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP3.Size = new System.Drawing.Size(193, 33);
this.btnMiddleP3.TabIndex = 224;
this.btnMiddleP3.Text = "T2_旋转轴_右侧料仓取放料点P3:";
this.btnMiddleP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP3.UseVisualStyleBackColor = false;
this.btnMiddleP3.Click += new System.EventHandler(this.btnMiddleP3_Click);
//
// axisMoveControl1
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 316);
this.axisMoveControl1.Size = new System.Drawing.Size(735, 312);
this.axisMoveControl1.TabIndex = 274;
//
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(148, 320);
this.btnAxisOff.Location = new System.Drawing.Point(752, 57);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
this.btnAxisOff.Text = "料仓运转OFF";
this.btnAxisOff.Text = "关闭所有伺服";
this.btnAxisOff.UseVisualStyleBackColor = true;
this.btnAxisOff.Click += new System.EventHandler(this.btnAxisOff_Click);
//
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(18, 320);
this.btnAxisOn.Location = new System.Drawing.Point(752, 12);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
this.btnAxisOn.Text = "料仓运转ON";
this.btnAxisOn.Text = "打开所有伺服";
this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.btnAxisOn_Click);
//
// FrmAxisMove
//
......@@ -400,18 +535,17 @@ namespace OnlineStore.DUOStore
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.GroupBox groupInout;
public System.Windows.Forms.TextBox txtInoutP11;
public System.Windows.Forms.Button btnInoutP11;
public System.Windows.Forms.TextBox txtMiddleP11;
public System.Windows.Forms.Button btnMiddleP11;
public System.Windows.Forms.TextBox txtInOutP2;
public System.Windows.Forms.TextBox txtInOutP1;
public System.Windows.Forms.TextBox txtUpdownP3;
public System.Windows.Forms.Button btnUpdownP3;
public System.Windows.Forms.TextBox txtMiddleP3;
public System.Windows.Forms.Button btnMiddleP3;
public System.Windows.Forms.TextBox txtUpdownP1;
public System.Windows.Forms.TextBox txtUpdownP2;
public System.Windows.Forms.TextBox txtMiddleP1;
public System.Windows.Forms.TextBox txtBatchP1;
public System.Windows.Forms.TextBox txtBatchP2;
public System.Windows.Forms.TextBox txtMiddleP2;
public System.Windows.Forms.Button btnInOutP2;
public System.Windows.Forms.Button btnInOutP1;
public System.Windows.Forms.Button btnUpdownP1;
public System.Windows.Forms.Button btnMiddleP1;
public System.Windows.Forms.Button btnBatchP1;
public System.Windows.Forms.Button btnBatchP2;
......@@ -419,6 +553,14 @@ namespace OnlineStore.DUOStore
private AxisMoveControl axisMoveControl1;
private System.Windows.Forms.Button btnAxisOff;
private System.Windows.Forms.Button btnAxisOn;
public System.Windows.Forms.TextBox txtUpdownP6;
public System.Windows.Forms.Button btnUpdownP6;
public System.Windows.Forms.TextBox txtUpdownP5;
public System.Windows.Forms.Button btnUpdownP5;
public System.Windows.Forms.TextBox txtUpdownP4;
public System.Windows.Forms.Button btnUpdownP4;
public System.Windows.Forms.Button btnUpdownP2;
private System.Windows.Forms.Button btnSaveP;
}
}
source/DUOStore/FrmAxisMove.cs
......@@ -23,7 +23,7 @@ using UserFromControl;
namespace OnlineStore.DUOStore
{
public partial class FrmAxisMove : FrmBase
{
{
public FrmAxisMove()
{
Control.CheckForIllegalCrossThreadCalls = false;
......@@ -34,32 +34,149 @@ namespace OnlineStore.DUOStore
private bool LoadOk = false;
private void FrmTest_Load(object sender, EventArgs e)
{
}
{
axisMoveControl1.LoadData(null, new AxisBean[] { StoreManager.Store.T1_BatchAxis, StoreManager.Store.T2_MiddleAxis, StoreManager.Store.T3_UpdownAxis });
LoadPostion();
}
private void LoadPostion()
{
txtBatchP1.Text = StoreManager.Store.Config.BatchAxis_P1.ToString();
txtBatchP2.Text = StoreManager.Store.Config.BatchAxis_P2.ToString();
txtMiddleP1.Text = StoreManager.Store.Config.MiddleAxis_P1.ToString();
txtMiddleP3.Text = StoreManager.Store.Config.MiddleAxis_P3.ToString();
txtMiddleP2.Text = StoreManager.Store.Config.MiddleAxis_P2.ToString();
txtUpdownP1.Text = StoreManager.Store.Config.UpdownAxis_P1.ToString();
txtUpdownP2.Text = StoreManager.Store.Config.UpdownAxis_P2.ToString();
txtUpdownP3.Text = StoreManager.Store.Config.UpdownAxis_P3.ToString();
txtUpdownP4.Text = StoreManager.Store.Config.UpdownAxis_P4.ToString();
txtUpdownP5.Text = StoreManager.Store.Config.UpdownAxis_P5.ToString();
txtUpdownP6.Text = StoreManager.Store.Config.UpdownAxis_P6.ToString();
}
internal void DebugStatus(bool isDebug)
{
axisMoveControl1.Enabled = isDebug;
groupInout.Enabled = isDebug;
}
#endregion
private void timer1_Tick(object sender, EventArgs e)
{
if (!this.Visible)
{
return;
}
}
private void LoadPostion()
{
private void AxisABSMove(AxisBean moveAxis, TextBox txtValue, int targetSpeed)
{
int targetPosition = FormUtil.GetIntValue(txtValue);
moveAxis.Config.TargetPosition = targetPosition;
moveAxis.AbsMove(null, targetPosition, targetSpeed);
}
private void btnBatchP1_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T1_BatchAxis, txtBatchP1, StoreManager.Store.Config.BatchAxis_P1Speed);
}
private void btnBatchP2_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T1_BatchAxis, txtBatchP2, StoreManager.Store.Config.BatchAxis_P2Speed);
}
private void btnMiddleP1_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T2_MiddleAxis, txtMiddleP1, StoreManager.Store.Config.MiddleAxis_P1Speed);
}
private void btnMiddleP2_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T2_MiddleAxis, txtMiddleP2, StoreManager.Store.Config.MiddleAxis_P2Speed);
}
private void btnMiddleP3_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T2_MiddleAxis, txtMiddleP3, StoreManager.Store.Config.MiddleAxis_P3Speed);
}
private void btnUpdownP1_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP1, StoreManager.Store.Config.UpdownAxis_P1Speed);
}
private void btnUpdownP2_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP2, StoreManager.Store.Config.UpdownAxis_P2Speed);
}
private void btnUpdownP3_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP3, StoreManager.Store.Config.UpdownAxis_P3Speed);
}
private void btnUpdownP4_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP4, StoreManager.Store.Config.UpdownAxis_P4Speed);
}
private void btnUpdownP5_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP5, StoreManager.Store.Config.UpdownAxis_P5Speed);
}
private void btnUpdownP6_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP6, StoreManager.Store.Config.UpdownAxis_P6Speed);
}
private void btnSavePosition_Click(object sender, EventArgs e)
private void btnSaveP_Click(object sender, EventArgs e)
{
Store_Config config = StoreManager.Config;
config.BatchAxis_P1 = FormUtil.GetIntValue(txtBatchP1);
config.BatchAxis_P2 = FormUtil.GetIntValue(txtBatchP2);
config.MiddleAxis_P1 = FormUtil.GetIntValue(txtMiddleP1);
config.MiddleAxis_P2 = FormUtil.GetIntValue(txtMiddleP2);
config.MiddleAxis_P3 = FormUtil.GetIntValue(txtMiddleP3);
config.UpdownAxis_P1 = FormUtil.GetIntValue(txtUpdownP1);
config.UpdownAxis_P2 = FormUtil.GetIntValue(txtUpdownP2);
config.UpdownAxis_P3 = FormUtil.GetIntValue(txtUpdownP3);
config.UpdownAxis_P4 = FormUtil.GetIntValue(txtUpdownP4);
config.UpdownAxis_P5 = FormUtil.GetIntValue(txtUpdownP5);
config.UpdownAxis_P6 = FormUtil.GetIntValue(txtUpdownP6);
bool result = StoreManager.UpdateStoreConfig(config);
if (result)
{
MessageBox.Show("保存成功");
}
else
{
MessageBox.Show("保存失败");
}
}
private void btnAxisOn_Click(object sender, EventArgs e)
{
btnAxisOn.Enabled = false;
LogUtil.info( " 点击： " + btnAxisOn.Text);
StoreManager.Store.OpenAllAxis();
btnAxisOn.Enabled = true;
}
private void btnAxisOff_Click(object sender, EventArgs e)
{
btnAxisOff.Enabled = false;
LogUtil.info(" 点击： " + btnAxisOff.Text);
StoreManager.Store.CloseAllAxis();
btnAxisOff.Enabled = true;
}
}
}
source/DUOStore/FrmBox.Designer.cs
......@@ -141,7 +141,7 @@ namespace OnlineStore.DUOStore
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 11;
this.btnAxisOff.Text = "料仓运转OFF";
this.btnAxisOff.Text = "关闭所有伺服";
this.btnAxisOff.UseVisualStyleBackColor = true;
this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
//
......@@ -152,14 +152,14 @@ namespace OnlineStore.DUOStore
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 10;
this.btnAxisOn.Text = "料仓运转ON";
this.btnAxisOn.Text = "打开所有伺服";
this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
//
// btnAxisP
//
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(232, 422);
this.btnAxisP.Location = new System.Drawing.Point(229, 420);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(128, 39);
this.btnAxisP.TabIndex = 8;
......@@ -210,7 +210,7 @@ namespace OnlineStore.DUOStore
this.tabControl1.Location = new System.Drawing.Point(239, 112);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(744, 506);
this.tabControl1.Size = new System.Drawing.Size(844, 506);
this.tabControl1.TabIndex = 272;
//
// tabPage4
......@@ -221,7 +221,7 @@ namespace OnlineStore.DUOStore
this.tabPage4.Controls.Add(this.groupInout);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(736, 473);
this.tabPage4.Size = new System.Drawing.Size(836, 473);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = " 库位信息 ";
this.tabPage4.UseVisualStyleBackColor = true;
......@@ -230,7 +230,7 @@ namespace OnlineStore.DUOStore
//
this.btnDoorDown.BackColor = System.Drawing.Color.White;
this.btnDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorDown.Location = new System.Drawing.Point(119, 422);
this.btnDoorDown.Location = new System.Drawing.Point(116, 420);
this.btnDoorDown.Name = "btnDoorDown";
this.btnDoorDown.Size = new System.Drawing.Size(107, 39);
this.btnDoorDown.TabIndex = 272;
......@@ -242,7 +242,7 @@ namespace OnlineStore.DUOStore
//
this.btnDoorUp.BackColor = System.Drawing.Color.White;
this.btnDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorUp.Location = new System.Drawing.Point(6, 422);
this.btnDoorUp.Location = new System.Drawing.Point(3, 420);
this.btnDoorUp.Name = "btnDoorUp";
this.btnDoorUp.Size = new System.Drawing.Size(107, 39);
this.btnDoorUp.TabIndex = 271;
......@@ -303,7 +303,7 @@ namespace OnlineStore.DUOStore
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(6, 3);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(722, 415);
this.groupInout.Size = new System.Drawing.Size(822, 404);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -327,7 +327,7 @@ namespace OnlineStore.DUOStore
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(150, 371);
this.txtComP1.Location = new System.Drawing.Point(392, 267);
this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -342,7 +342,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(392, 297);
this.txtInOutP2.Location = new System.Drawing.Point(672, 223);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -357,7 +357,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(149, 297);
this.txtInOutP1.Location = new System.Drawing.Point(672, 149);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -372,7 +372,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(150, 260);
this.txtMiddleP1.Location = new System.Drawing.Point(150, 267);
this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -417,7 +417,7 @@ namespace OnlineStore.DUOStore
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(391, 334);
this.txtComP3.Location = new System.Drawing.Point(391, 342);
this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -432,7 +432,7 @@ namespace OnlineStore.DUOStore
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(391, 371);
this.txtComP2.Location = new System.Drawing.Point(391, 305);
this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -447,7 +447,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(150, 334);
this.txtInOutP3.Location = new System.Drawing.Point(672, 186);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -462,7 +462,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(391, 260);
this.txtMiddleP2.Location = new System.Drawing.Point(149, 306);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -539,7 +539,7 @@ namespace OnlineStore.DUOStore
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(6, 366);
this.btnComP1.Location = new System.Drawing.Point(248, 262);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(140, 33);
......@@ -558,12 +558,12 @@ namespace OnlineStore.DUOStore
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(248, 292);
this.btnInOutP2.Location = new System.Drawing.Point(502, 218);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
this.btnInOutP2.Size = new System.Drawing.Size(164, 33);
this.btnInOutP2.TabIndex = 305;
this.btnInOutP2.Text = "进出轴取料点P2:";
this.btnInOutP2.Text = "进出轴入料口取放料点P2:";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = false;
this.btnInOutP2.Click += new System.EventHandler(this.btnInOutP2_Click);
......@@ -577,10 +577,10 @@ namespace OnlineStore.DUOStore
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(6, 292);
this.btnInOutP1.Location = new System.Drawing.Point(502, 144);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
this.btnInOutP1.Size = new System.Drawing.Size(164, 33);
this.btnInOutP1.TabIndex = 303;
this.btnInOutP1.Text = "进出轴待机点P1:";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -596,12 +596,12 @@ namespace OnlineStore.DUOStore
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(6, 255);
this.btnMiddleP1.Location = new System.Drawing.Point(6, 262);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP1.TabIndex = 301;
this.btnMiddleP1.Text = "旋转轴待机点P1:";
this.btnMiddleP1.Text = "旋转轴待机/入料口P1:";
this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.UseVisualStyleBackColor = false;
this.btnMiddleP1.Click += new System.EventHandler(this.btnMiddleP1_Click);
......@@ -652,7 +652,7 @@ namespace OnlineStore.DUOStore
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(248, 329);
this.btnComP3.Location = new System.Drawing.Point(248, 337);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(140, 33);
......@@ -670,7 +670,7 @@ namespace OnlineStore.DUOStore
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(248, 366);
this.btnComP2.Location = new System.Drawing.Point(248, 300);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(140, 33);
......@@ -688,12 +688,12 @@ namespace OnlineStore.DUOStore
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(6, 329);
this.btnInOutP3.Location = new System.Drawing.Point(502, 181);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(140, 33);
this.btnInOutP3.Size = new System.Drawing.Size(164, 33);
this.btnInOutP3.TabIndex = 287;
this.btnInOutP3.Text = "进出轴取料点P3:";
this.btnInOutP3.Text = "进出轴库位取放料点P3:";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = false;
this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
......@@ -706,7 +706,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(248, 255);
this.btnMiddleP2.Location = new System.Drawing.Point(6, 301);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
......@@ -835,11 +835,11 @@ namespace OnlineStore.DUOStore
this.txtInoutP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(640, 297);
this.txtInoutP11.Location = new System.Drawing.Point(672, 260);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutP11.Size = new System.Drawing.Size(77, 23);
this.txtInoutP11.Size = new System.Drawing.Size(89, 23);
this.txtInoutP11.TabIndex = 227;
this.txtInoutP11.Text = "999999";
//
......@@ -852,12 +852,12 @@ namespace OnlineStore.DUOStore
this.btnInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(497, 292);
this.btnInoutP11.Location = new System.Drawing.Point(502, 255);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(140, 33);
this.btnInoutP11.Size = new System.Drawing.Size(164, 33);
this.btnInoutP11.TabIndex = 226;
this.btnInoutP11.Text = "进出轴出料口点P11:";
this.btnInoutP11.Text = "进出轴出料口取放料点P11:";
this.btnInoutP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.UseVisualStyleBackColor = false;
this.btnInoutP11.Click += new System.EventHandler(this.btnInoutP11_Click);
......@@ -888,11 +888,11 @@ namespace OnlineStore.DUOStore
this.txtMiddleP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP11.Location = new System.Drawing.Point(640, 260);
this.txtMiddleP11.Location = new System.Drawing.Point(149, 345);
this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP11.Size = new System.Drawing.Size(77, 23);
this.txtMiddleP11.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP11.TabIndex = 225;
this.txtMiddleP11.Text = "999999";
//
......@@ -924,7 +924,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.Location = new System.Drawing.Point(497, 255);
this.btnMiddleP11.Location = new System.Drawing.Point(6, 340);
this.btnMiddleP11.Name = "btnMiddleP11";
this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP11.Size = new System.Drawing.Size(140, 33);
......@@ -950,7 +950,7 @@ namespace OnlineStore.DUOStore
this.btnSavePosition.BackColor = System.Drawing.Color.White;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(538, 355);
this.btnSavePosition.Location = new System.Drawing.Point(538, 65);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(128, 39);
this.btnSavePosition.TabIndex = 217;
......@@ -1036,7 +1036,7 @@ namespace OnlineStore.DUOStore
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(736, 473);
this.tabPage1.Size = new System.Drawing.Size(836, 473);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服/温湿度 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -1054,7 +1054,7 @@ namespace OnlineStore.DUOStore
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Location = new System.Drawing.Point(13, 318);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(527, 138);
this.groupBox7.Size = new System.Drawing.Size(437, 138);
this.groupBox7.TabIndex = 272;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温控器调试";
......@@ -1168,7 +1168,7 @@ namespace OnlineStore.DUOStore
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(149, 506);
this.chbDebug.Location = new System.Drawing.Point(143, 510);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
......@@ -1192,7 +1192,7 @@ namespace OnlineStore.DUOStore
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(-254, 593);
this.lblTemp.Location = new System.Drawing.Point(-154, 593);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
......@@ -1262,7 +1262,7 @@ namespace OnlineStore.DUOStore
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(5, 2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(975, 105);
this.groupBox3.Size = new System.Drawing.Size(1075, 105);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
......@@ -1286,7 +1286,7 @@ namespace OnlineStore.DUOStore
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(407, 14);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(562, 84);
this.lblWarnMsg.Size = new System.Drawing.Size(662, 84);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -1305,7 +1305,7 @@ namespace OnlineStore.DUOStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(984, 623);
this.ClientSize = new System.Drawing.Size(1084, 623);
this.Controls.Add(this.chbDebug);
this.Controls.Add(this.lblMoveInfo);
this.Controls.Add(this.groupBox4);
......
source/DUOStore/FrmBox.cs
......@@ -50,7 +50,7 @@ namespace OnlineStore.DUOStore
}
// this.groupBox3.Text = "设备[" + BoxBean.CID + "]状态";
this.Text = BoxBean.Name;
axisMoveControl1.LoadData(new AxisBean[] { });
axisMoveControl1.LoadData(BoxBean, new AxisBean[] {BoxBean.MiddleAxis,BoxBean.UpdownAxis,BoxBean.InoutAxis,BoxBean.ComAxis });
ACBoxPosition acPosition = null;
if (BoxBean.PositionNumList.Count > 0)
{
......@@ -119,11 +119,11 @@ namespace OnlineStore.DUOStore
lblWarnMsg.Text = BoxBean.GetWarnMsg();
lblMoveInfo.Text = BoxBean.GetMoveStr();
if (BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.InStore))
if (BoxBean.MoveInfo.MoveType.Equals(MoveType.InStore))
{
lblMoveEquipInfo.Text = "入库：" + BoxBean.MoveInfo.MoveParam.ToStr();
}
else if (BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
else if (BoxBean.MoveInfo.MoveType.Equals(MoveType.OutStore))
{
lblMoveEquipInfo.Text = "出库：" + BoxBean.MoveInfo.MoveParam.ToStr();
}
......@@ -146,7 +146,7 @@ namespace OnlineStore.DUOStore
if (btnSotreReset.Enabled == false)
{
if ((BoxBean.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || BoxBean.storeRunStatus.Equals(StoreRunStatus.Reset))
&& BoxBean.alarmType.Equals(StoreAlarmType.None))
&& BoxBean.alarmType.Equals(AlarmType.None))
{
}
else
......@@ -160,7 +160,7 @@ namespace OnlineStore.DUOStore
else
{
if ((BoxBean.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || BoxBean.storeRunStatus.Equals(StoreRunStatus.Reset))
&& BoxBean.alarmType.Equals(StoreAlarmType.None))
&& BoxBean.alarmType.Equals(AlarmType.None))
{
if (btnStoreStart.Enabled)
{
......@@ -625,16 +625,16 @@ namespace OnlineStore.DUOStore
private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
{
this.Enabled = false;
BoxBean.RunAxis(false);
this.Enabled = true;
LogUtil.info("料仓运转ON完成");
btnAxisOn.Enabled = false;
LogUtil.info(BoxBean.Name + "点击：" + btnAxisOn.Text);
BoxBean.OpenAllAxis(false);
btnAxisOn.Enabled = true;
}
private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e)
{
BoxBean.CloseAllAxis();
LogUtil.info("料仓运转OFF完成");
LogUtil.info(BoxBean.Name + "点击：" + btnAxisOff.Text);
BoxBean.CloseAllAxis();
}
......
source/DUOStore/FrmIOStatus.Designer.cs
......@@ -100,7 +100,7 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(524, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(323, 565);
this.groupBox1.Size = new System.Drawing.Size(323, 544);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......
source/DUOStore/FrmStore.Designer.cs
......@@ -85,7 +85,7 @@
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1003, 675);
this.tabControl1.Size = new System.Drawing.Size(1303, 675);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
......@@ -102,7 +102,7 @@
this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(995, 642);
this.tabPage1.Size = new System.Drawing.Size(1295, 642);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 日志信息 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -121,7 +121,7 @@
this.chbDoorCanMove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDoorCanMove.AutoSize = true;
this.chbDoorCanMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDoorCanMove.Location = new System.Drawing.Point(832, 101);
this.chbDoorCanMove.Location = new System.Drawing.Point(1132, 101);
this.chbDoorCanMove.Name = "chbDoorCanMove";
this.chbDoorCanMove.Size = new System.Drawing.Size(126, 24);
this.chbDoorCanMove.TabIndex = 197;
......@@ -134,7 +134,7 @@
this.chbUseBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbUseBuzzer.AutoSize = true;
this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseBuzzer.Location = new System.Drawing.Point(832, 54);
this.chbUseBuzzer.Location = new System.Drawing.Point(1132, 54);
this.chbUseBuzzer.Name = "chbUseBuzzer";
this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbUseBuzzer.TabIndex = 195;
......@@ -147,7 +147,7 @@
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(832, 151);
this.chkDebug.Location = new System.Drawing.Point(1132, 151);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(132, 24);
this.chkDebug.TabIndex = 194;
......@@ -160,7 +160,7 @@
this.chbAutoRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(832, 13);
this.chbAutoRun.Location = new System.Drawing.Point(1132, 13);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94;
......@@ -173,7 +173,7 @@
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(832, 202);
this.btnCopyLog.Location = new System.Drawing.Point(1132, 202);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191;
......@@ -186,7 +186,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(832, 243);
this.btnClearLog.Location = new System.Drawing.Point(1132, 243);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190;
......@@ -202,7 +202,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(3, 3);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(810, 635);
this.logBox.Size = new System.Drawing.Size(1110, 635);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -216,7 +216,7 @@
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(526, 4);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(475, 72);
this.lblWarnMsg.Size = new System.Drawing.Size(775, 72);
this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -230,7 +230,7 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1008, 29);
this.menuStrip1.Size = new System.Drawing.Size(1308, 29);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -253,54 +253,54 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -320,38 +320,38 @@
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(160, 26);
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "启用调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
//
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
//
// 帮助ToolStripMenuItem
//
......@@ -364,7 +364,7 @@
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -415,7 +415,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1008, 729);
this.ClientSize = new System.Drawing.Size(1308, 729);
this.Controls.Add(this.lblWarnMsg);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.tabControl1);
......
source/DUOStore/FrmStore.cs
......@@ -451,9 +451,13 @@ namespace OnlineStore.DUOStore
{
FrmBox frm = (FrmBox)con;
frm.DebugStatus(isopen);
find = true;
} else if(con is FrmAxisMove)
{
FrmAxisMove frm = (FrmAxisMove)con;
frm.DebugStatus(isopen);
find = true;
break;
}
}
}
}
if (find)
......
source/DUOStore/useControl/AxisMoveControl.cs
......@@ -18,7 +18,7 @@ namespace OnlineStore.DUOStore
public partial class AxisMoveControl : UserControl
{
private List<AxisBean> axisList = new List<AxisBean>();
// private EquipBase equipBase = null;
private BoxBean boxBean = null;
private string PortName = "";
private int SlvAddr = 0;
......@@ -26,8 +26,9 @@ namespace OnlineStore.DUOStore
{
InitializeComponent();
}
public void LoadData(params AxisBean[] moveAxis)
public void LoadData(BoxBean box, params AxisBean[] moveAxis)
{
this.boxBean = box;
axisList = new List<AxisBean>(moveAxis);
if (axisList.Count > 0)
......@@ -52,23 +53,26 @@ namespace OnlineStore.DUOStore
private bool CanMove()
{
////如果是取料升降轴，取料旋转轴，如果进出轴不在待机点，不能运动
//if (RobotManager.robot.inputEquip.UpdownAxis.Config.IsSameAxis(PortName, SlvAddr)
// || (RobotManager.robot.inputEquip.MiddleAxis.Config.IsSameAxis(PortName, SlvAddr)))
//{
// int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InoutDefaultPosition);
// int currValue = RobotManager.robot.inputEquip.InOutAxis.GetAclPosition();
// if (currValue <= InOutDefaultPosition)
// {
// return true;
// }
// MessageBox.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Error);
// return false;
//}
//else
//{
// return true;
//}
//如果是取料升降轴，取料旋转轴，如果进出轴不在待机点，不能运动
if (boxBean != null)
{
if (boxBean.Config.UpDown_Axis.IsSameAxis(PortName, SlvAddr)
|| (boxBean.Config.Middle_Axis.IsSameAxis(PortName, SlvAddr)))
{
int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InoutDefaultPosition);
int currValue = boxBean.InoutAxis.GetAclPosition();
if (currValue <= InOutDefaultPosition)
{
return true;
}
MessageBox.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
else
{
return true;
}
}
return true;
}
private void btnOpenAxis_Click(object sender, EventArgs e)
......
source/DUOStore/记录.txt
 // 机器状态 顶灯显示
// 绿 黄 红
//机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭
//机器出入库中 闪 闪 灭
//温湿度超限报警中 亮 闪 灭
//温湿度超限报警中超过30分钟 亮 闪 闪
//机器未启动 灭 灭 灭
//机器设备故障(非温湿度)报警 亮 灭 闪
新建分支RC1250-ACPackingStore，作为佳世达流水线单台包装料料仓软件
同一个客户端有两个box软件。
位置重定义：
旋转轴（轴1）P1 ：待机原位点/NG料口位置
新增料架位置配置：
旋转轴位置P101：料架库位旋转轴位置
升降轴低点P101：料架库位升降轴低点
升降轴高点P102：料架库位升降轴高点
进出轴位置P101：料架库位进出轴位置
20191220点位配置修改：
NG门口位置 升降轴（轴2）P11-NG放料低点 UpDownAxis_P11
升降轴（轴2）P12-NG放料高点缓冲点 UpDownAxis_P12
旋转轴（轴1）P11-NG放料点 MiddleAxis_P11
进出轴（轴3）P11-NG放料点 InOutAxis_P11_Position
待机点/扫码点 升降轴（轴2）P1待机点/扫码放料低点 UpDownAxis_P1
升降轴（轴2）P2扫码放料高点缓冲点 UpDownAxis_P2
旋转轴（轴1）P1待机点/扫码放料点 MiddleAxis_P1
进出轴（轴3）P1待机点 InOutAxis_P1_Position
进出轴（轴3）P2-扫码放料点 InOutAxis_P2_Position
压紧轴（轴4）P1待机点 CompAxis_P1_Position
压紧轴（轴4）P3压紧前点 CompAxis_P3_Position
压紧轴（轴4）P4目标压紧点 CompAxis_P4_Position
压紧轴（轴4）压紧确认信号收到之后下降的位置 CompAxis_Down_Position
压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#） CompAxis_P2_List
料架位置 旋转轴位置P101
升降轴低点P101
升降轴高点P102
进出轴位置P101
20191220移门操作修改：移门到位后需要马上关闭DO.
扫码入库逻辑修改，先去扫码库位点，放下料盘后扫码，扫码后再把料盘拿走。
20200113需要修改：
出库时如果当前料架不是指定的料架，需要把料架送出，然后通知agv准备指定料架
20200220
agvclien增加cancelState的参数设置
BI_03_LineRun超时报警改为40秒
20200221
agv客户端启动时需要设置状态为none。
区分是入库结束出空料架还是出库完成的有料料架，当入库完成出空料架时，mark="0"。
增加AgvClient_EnterShelf事件处理。
20200222
修改：出库时没有给agv发mark
20200223
增加料架的目标位置。
//包装料会发往分盘区, 紧急料区, 包装线区
// urgentReel 这个为true是紧急料 出到紧急料区
// cutReel 为true是分盘料,AGV会拉到到分盘区
//料串会发到分盘区和紧急料区
//两个都为false 包装料默认拉到包装线体, 料串默认拉到紧急料区
20200224
增加agv的cancelState的修改功能。
20200225
出库送料架逻辑修改，出库增加参数：taskCount
20200228
出料料架修改，增加 realRfid ，表示真实的料架号
20200303
httpPost方法增加验证，若ping不同则不再发送。
20200307
shelfLoc问题修改。
20200308
扫码问题优化。
出库未结束时，去掉：检测到料架自动入库功能。
20200310
出库mark参数修改
20200311
扫码修改
20200409修改
压紧轴压紧前点P3-压紧轴压紧点P2的差值，7寸盘和其他的分开配置。
BoxConfig_1.csv 和 BoxConfig_2.csv 需要增加一行配置：
PRO,压紧轴（轴4）七寸盘压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
20200410
修改问题：
料架号不一致，送出料架时料架信息使用上次的。
出库时发现料架对不上，送出料架时发的mark应该用原来的
agv到达时，根据rfid判断是否有料架
20200411
出库时未读到料架号，直接送出料架
紧急料分盘料料架送出逻辑修改。
分盘料/紧急料放上料串或料架时调用
/rest/api/qisda/device/afterPutCut
参数:
cid: 料仓cid,流水线可传入空
barcode : 条码
rfid : RFID
rfidLoc: 料架位置,流水线可传-1
> 返回:
>>` {"code": 0, "msg":"ok", "data":{"cutPackageTask":"0","urgentPackageTask":"20","cutTask":"21","urgentTask":"22"}} `
>>
>> - code: 0为正常,其他为异常,
>> - msg:消息,
>> - data:为包装料仓的空闲仓位数(key为与客户端一致的料仓标识,value为空闲仓位)
>> - cutPackageTask: 表示当前包装仓的分盘任务数
>> - urgentPackageTask: 表示当前包装仓的紧急料任务数
>> - cutTask: 表示流水线分盘任务数
>> - urgentTask: 表示流水线紧急料任务数
20200429
调试模式时不发needEnter
SecMoveInfo
多料仓软件。
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -78,6 +78,7 @@
<Compile Include="duoStore\BoxBean.cs" />
<Compile Include="duoStore\BoxBean_Partial.cs" />
<Compile Include="duoStore\BoxBean_Shelf.cs" />
<Compile Include="duoStore\DUOStoreBean_Partial.cs" />
<Compile Include="duoStore\HoisterCylinder.cs" />
<Compile Include="duoStore\HumitureBean.cs" />
<Compile Include="duoStore\DUOStoreBean.cs" />
......
source/DeviceLibrary/duoStore/BoxBean.cs
......@@ -33,6 +33,12 @@ namespace OnlineStore.DeviceLibrary
private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
private int logType = 1000;
public AxisBean UpdownAxis = null;
public AxisBean MiddleAxis = null;
public AxisBean ComAxis = null;
public AxisBean InoutAxis = null;
public BoxBean(BOX_Config config)
{
Init();
......@@ -67,7 +73,10 @@ namespace OnlineStore.DeviceLibrary
PositionNumList.Add(position.PositionNum);
}
}
InoutAxis = new AxisBean(config.InOut_Axis, Name);
MiddleAxis = new AxisBean(config.Middle_Axis, Name);
UpdownAxis = new AxisBean(config.UpDown_Axis, Name);
ComAxis = new AxisBean(config.Comp_Axis, Name);
mainTimer.Enabled = false;
int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
if (isAuto == 1)
......@@ -90,7 +99,7 @@ namespace OnlineStore.DeviceLibrary
WarnMsg = Name + "收到急停信号，报警急停";
//报警时会关闭所有轴
Alarm(StoreAlarmType.SuddenStop, "1", WarnMsg, StoreMoveType.None);
Alarm(AlarmType.SuddenStop, "1", WarnMsg, MoveType.None);
}
}
}
......@@ -122,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("开始启动，启动时间：" + StartTime.ToString());
AutoInout.StopAuto();
mainTimer.Enabled = false;
alarmType = StoreAlarmType.None;
alarmType = AlarmType.None;
//急停按钮和气压检测需要一起判断
IO_VALUE suddenBtn = IOValue(IO_Type.SuddenStop_BTN);
......@@ -132,7 +141,7 @@ namespace OnlineStore.DeviceLibrary
{
//lastAirValue = airCheck;
lastAirCloseTime = DateTime.Now;
if (!RunAxis(true))
if (!OpenAllAxis(true))
{
return false;
}
......@@ -170,7 +179,7 @@ namespace OnlineStore.DeviceLibrary
public string GetWarnMsg()
{
string msg = WarnMsg;
if (alarmType.Equals(StoreAlarmType.None).Equals(false))
if (alarmType.Equals(AlarmType.None).Equals(false))
{
msg= LastAlarmTime.ToLongTimeString() + " " + WarnMsg + " ";
}
......@@ -194,16 +203,16 @@ namespace OnlineStore.DeviceLibrary
lastPosIdStatus = StoreStatus.ResetMove;
AutoInout.ClearCount();
storeRunStatus = StoreRunStatus.HomeMoving;
MoveInfo.NewMove(StoreMoveType.ReturnHome);
MoveInfo.NewMove(MoveType.ReturnHome);
InoutStartReset();
}
public void MoveToP1()
{
//压紧轴回原点，叉子回到P1,关闭门旋转轴和升降轴回到P1
MoveInfo.NewMove(StoreMoveType.StoreReset);
MoveInfo.NewMove(MoveType.StoreReset);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H54_InOutToP1);
LogInfo("到待机状态，进出轴到P1，判断叉子没有料盘");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
}
public override void Reset(bool isNeedClearAuto = true)
......@@ -216,9 +225,9 @@ namespace OnlineStore.DeviceLibrary
}
storeRunStatus = StoreRunStatus.Reset;
storeStatus = StoreStatus.ResetMove;
MoveInfo.NewMove(StoreMoveType.StoreReset);
MoveInfo.NewMove(MoveType.StoreReset);
if (!RunAxis(true))
if (!OpenAllAxis(true))
{
LogInfo("复位时打开轴失败，需要再次复位，直接报警停止复位");
return;
......@@ -232,7 +241,7 @@ namespace OnlineStore.DeviceLibrary
WarnMsg = "";
isInSuddenDown = false;
isNoAirCheck = false;
alarmType = StoreAlarmType.None;
alarmType = AlarmType.None;
//开始复位动作
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H01_InOutBack);
......@@ -240,8 +249,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo(MoveInfo.MoveType + ": 开始料架入库，线体停止，进出轴先原点返回 ");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
LineStop();
ACAxisHomeMove(Config.InOut_Axis);
InoutAxis.HomeMove(MoveInfo);
}
/// <summary>
/// 复位处理
......@@ -256,176 +264,95 @@ namespace OnlineStore.DeviceLibrary
{
return;
}
//switch (MoveInfo.MoveStep)
//{
// case StoreMoveStep.BOX_H01_InOutBack:
// Thread.Sleep(200);
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H02_TopDown);
// LogInfo(MoveInfo.MoveType + ": 线体停止，进出轴到待机点P1，顶升气缸下降，NG门下降，入料移门关闭");
// LineStop();
// AxisCountClear(Config.InOut_Axis);
// ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// CylinderMove(MoveInfo, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down);
// CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
// DoorBean.StartForward(MoveInfo);
// break;
// case StoreMoveStep.BOX_H02_TopDown:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_LineRun);
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
// {
// LogInfo(MoveInfo.MoveType + ":取料工位有料架，线体停止 ");
// LineStop();
// }
// else
// {
// LogInfo(MoveInfo.MoveType + ":取料工位无料架， 线体先正转3000或等待取料工位有料架");
// LineRun();
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.HIGH));
// MoveInfo.OneWaitCanEndStep = true;
// }
// break;
// case StoreMoveStep.BOX_H03_LineRun:
// LineStop();
// //如果此时轴三还在报警，需要提示错误并等待
// if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
// {
// LogUtil.error(Name + MoveInfo.MoveType + "复位失败: " + Config.InOut_Axis.Explain + "报警");
// WarnMsg = Name + "复位失败: " + Config.InOut_Axis.Explain + "报警";
// Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(Config.InOut_Axis).ToString(), WarnMsg, StoreMoveType.None);
// return;
// }
// //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
// LogInfo(MoveInfo.MoveType + ": 停止线体， 压紧轴，旋转轴，上下轴开始 原点返回");
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H05_OtherAxisBack);
// ACAxisHomeMove(Config.Comp_Axis);
// ACAxisHomeMove(Config.Middle_Axis);
// ACAxisHomeMove(Config.UpDown_Axis);
// break;
// case StoreMoveStep.BOX_H05_OtherAxisBack:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H06_MiddleAxisToP1);
// LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// ACAxisMove(Config.Comp_Axis, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
// break;
// case StoreMoveStep.BOX_H06_MiddleAxisToP1:
// LogInfo(MoveInfo.MoveType + ": 完成");
// MoveEndToRuningStatus();
// break;
// case StoreMoveStep.BOX_H54_InOutToP1:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H55_CompHome);
// LogInfo("到待机状态，压紧轴回原点，关闭舱门");
// ACAxisHomeMove(Config.Comp_Axis);
// break;
// case StoreMoveStep.BOX_H55_CompHome:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H56_OtherAxisToP1);
// LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// ACAxisMove(Config.Comp_Axis, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
// break;
// case StoreMoveStep.BOX_H56_OtherAxisToP1:
// LogInfo("到待机状态完成");
// MoveEndToRuningStatus();
// break;
// default: break;
//}
switch (MoveInfo.MoveStep)
{
case StoreMoveStep.BOX_H01_InOutBack:
Thread.Sleep(200);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H02_TopDown);
LogInfo(MoveInfo.MoveType + ": ，进出轴到待机点P1，关闭仓们");
InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
CylinderMove(MoveInfo, IO_Type.OutDoor_Up, IO_Type.OutDoor_Down);
break;
//case StoreMoveStep.BOX_H02_TopDown:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_LineRun);
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
// {
// LogInfo(MoveInfo.MoveType + ":取料工位有料架，线体停止 ");
// LineStop();
// }
// else
// {
// LogInfo(MoveInfo.MoveType + ":取料工位无料架， 线体先正转3000或等待取料工位有料架");
// LineRun();
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.HIGH));
// MoveInfo.OneWaitCanEndStep = true;
// }
// break;
//case StoreMoveStep.BOX_H03_LineRun:
// LineStop();
// //如果此时轴三还在报警，需要提示错误并等待
// if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
// {
// LogUtil.error(Name + MoveInfo.MoveType + "复位失败: " + Config.InOut_Axis.Explain + "报警");
// WarnMsg = Name + "复位失败: " + Config.InOut_Axis.Explain + "报警";
// Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(Config.InOut_Axis).ToString(), WarnMsg, StoreMoveType.None);
// return;
// }
// //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
// LogInfo(MoveInfo.MoveType + ": 停止线体， 压紧轴，旋转轴，上下轴开始 原点返回");
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H05_OtherAxisBack);
// ACAxisHomeMove(Config.Comp_Axis);
// ACAxisHomeMove(Config.Middle_Axis);
// ACAxisHomeMove(Config.UpDown_Axis);
// break;
//case StoreMoveStep.BOX_H05_OtherAxisBack:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H06_MiddleAxisToP1);
// LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
// break;
//case StoreMoveStep.BOX_H06_MiddleAxisToP1:
// LogInfo(MoveInfo.MoveType + ": 完成");
// MoveEndToRuningStatus();
// break;
//case StoreMoveStep.BOX_H54_InOutToP1:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H55_CompHome);
// LogInfo("到待机状态，压紧轴回原点，关闭舱门");
// ACAxisHomeMove(Config.Comp_Axis);
// break;
//case StoreMoveStep.BOX_H55_CompHome:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H56_OtherAxisToP1);
// LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
// break;
//case StoreMoveStep.BOX_H56_OtherAxisToP1:
// LogInfo("到待机状态完成");
// MoveEndToRuningStatus();
// break;
//default: break;
}
}
#endregion
public bool RunAxis(bool isCheck)
public bool OpenAllAxis(bool isCheck)
{
IOMove(IO_Type.Axis_Run, IO_VALUE.HIGH);
Thread.Sleep(1000);
//打开所有轴
foreach (ConfigMoveAxis moveAxis in moveAxisList)
{
string portName = moveAxis.DeviceName;
short slvAddr = moveAxis.GetAxisValue();
ACServerManager.OpenPort(portName,ConfigAppSettings.GetIntValue(Setting_Init.ACBaudRate));
Thread.Sleep(50);
//初始化串口
//ACServerManager.InitSlvAddr(portName, slvAddr);
if (!IsIntSlvBlock)
{
ACServerManager.InitSlvAddr(portName, slvAddr, moveAxis.TargetSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
Thread.Sleep(100);
}
ACServerManager.AlarmClear(portName, slvAddr);
Thread.Sleep(50);
ACServerManager.ServoOn(portName, slvAddr);
}
Thread.Sleep(1000);
//打开所有轴
if (isCheck)
{
if (!OpenAllAxis())
{
return false;
}
}
IsIntSlvBlock = true;
IOMove(IO_Type.UpdownAxis_Break, IO_VALUE.HIGH);
return true;
}
/// <summary>
/// 打开所有轴
/// </summary>
/// <returns></returns>
private bool OpenAllAxis()
{
//判断轴是否正常
foreach (ConfigMoveAxis axis in moveAxisList)
{
if (ACServerManager.ServerOnStatus(axis.DeviceName, axis.GetAxisValue()))
{
LogInfo("成功打开轴：" + axis.Explain);
}
else
{
//清理报警，再重新打开一次
LogInfo("第一次打开轴" + axis.Explain + "失败，先清理一下报警，再重新打开一次");
ACServerManager.AlarmClear(axis.DeviceName, axis.GetAxisValue());
System.Threading.Thread.Sleep(1200);
ACServerManager.ServoOn(axis.DeviceName, axis.GetAxisValue());
System.Threading.Thread.Sleep(100);
if (ACServerManager.ServerOnStatus(axis.DeviceName, axis.GetAxisValue()))
{
LogInfo("清理报警后重新打卡轴成功：" + axis.Explain);
}
else
{
ACServerManager.ServoOff(axis.DeviceName, axis.GetAxisValue());
int alarmCode = GetAlarmCodeByAxis(axis);
WarnMsg = Name + "打开轴" + axis.Explain + "失败 ";
LogInfo(WarnMsg);
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axis).ToString(), WarnMsg, MoveInfo.MoveType);
return false;
}
}
}
return true;
}
return RunMultiAxis(true, IO_Type.Axis_Run, IO_Type.UpdownAxis_Break, new AxisBean[] { MiddleAxis,UpdownAxis,InoutAxis,ComAxis});
}
public void CloseAllAxis()
{
LogUtil.info(Name + "关闭刹车，关闭伺服");
IOMove(IO_Type.UpdownAxis_Break, IO_VALUE.LOW);
foreach (ConfigMoveAxis axis in moveAxisList)
{
ACServerManager.ServoOff(axis.DeviceName, axis.GetAxisValue());
}
Thread.Sleep(100);
IOMove(IO_Type.Axis_Run, IO_VALUE.LOW);
}
CloseMultiAxis(IO_Type.Axis_Run, IO_Type.UpdownAxis_Break, new AxisBean[] { MiddleAxis, UpdownAxis, InoutAxis, ComAxis });
}
/// <summary>
/// 停止运行
......@@ -446,36 +373,36 @@ namespace OnlineStore.DeviceLibrary
LogInfo(",停止运行，总运行时间：" + span.ToString());
}
public DateTime LastAlarmTime = DateTime.Now;
public override void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
public override void Alarm(AlarmType alarmType, string alarmDetial = "", string alarmMsg = "", MoveType storeMoveType = MoveType.None)
{
if (alarmType.Equals(StoreAlarmType.None).Equals(false))
if (alarmType.Equals(AlarmType.None).Equals(false))
{
LastAlarmTime = DateTime.Now;
}
SaveAlarmInfo(alarmType, alarmDetial, alarmMsg, storeMoveType);
AutoInout.StopAuto();
if (this.alarmType.Equals(alarmType) && alarmType != StoreAlarmType.SuddenStop && alarmType != StoreAlarmType.NoAirCheck)
if (this.alarmType.Equals(alarmType) && alarmType != AlarmType.SuddenStop && alarmType != AlarmType.NoAirCheck)
{
return;
}
LogUtil.error(Name + " 报警，报警类型：" + alarmType);
this.alarmType = alarmType;
if (alarmType.Equals(StoreAlarmType.AxisAlarm) | alarmType.Equals(StoreAlarmType.AxisMoveError))
if (alarmType.Equals(AlarmType.AxisAlarm) | alarmType.Equals(AlarmType.AxisMoveError))
{
LogUtil.error(Name + "轴报警， 停止运动， 打开报警灯");
StopMove();
}
else if (alarmType == StoreAlarmType.SuddenStop)
else if (alarmType == AlarmType.SuddenStop)
{
isInSuddenDown = true;
LogUtil.error(Name + "收到急停信号，停止运动， 打开报警灯 ");
StopMove();
storeStatus = StoreStatus.SuddenStop;
}
else if (alarmType.Equals(StoreAlarmType.NoAirCheck))
else if (alarmType.Equals(AlarmType.NoAirCheck))
{
isNoAirCheck = true;
LogUtil.error(Name + " 未检测到气压信号 ,停止运动， 打开报警灯 ");
......@@ -550,7 +477,7 @@ namespace OnlineStore.DeviceLibrary
WarnMsg = "未检测到气压信号";
preAirValue = IO_VALUE.LOW;
LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
Alarm(StoreAlarmType.NoAirCheck, "2", WarnMsg, StoreMoveType.None);
Alarm(AlarmType.NoAirCheck, "2", WarnMsg, MoveType.None);
return;
}
}
......@@ -615,9 +542,9 @@ namespace OnlineStore.DeviceLibrary
else if (IOValue(IO_Type.Reset_BTN).Equals(IO_VALUE.HIGH))
{
//收到复位信号，若报警直接复位，若不报警且无操作，回到待机点
if (alarmType.Equals(StoreAlarmType.None) && isInSuddenDown.Equals(false) && isNoAirCheck.Equals(false))
if (alarmType.Equals(AlarmType.None) && isInSuddenDown.Equals(false) && isNoAirCheck.Equals(false))
{
if (MoveInfo.MoveType.Equals(StoreMoveType.None))
if (MoveInfo.MoveType.Equals(MoveType.None))
{
LogUtil.info(Name + "收到复位信号，当前无报警，且空闲中，只回到待机点");
MoveToP1();
......@@ -645,7 +572,7 @@ namespace OnlineStore.DeviceLibrary
try
{
DateTime time = DateTime.Now;
if (MoveInfo.MoveType != StoreMoveType.None)
if (MoveInfo.MoveType != MoveType.None)
{
BusyMoveProcess();
ShowTimeLog("BusyMoveProcess");
......@@ -687,7 +614,7 @@ namespace OnlineStore.DeviceLibrary
if (span.TotalSeconds > 1)
{
preIoTimerOutTime = DateTime.Now;
if (!alarmType.Equals(StoreAlarmType.IoSingleTimeOut))
if (!alarmType.Equals(AlarmType.IoSingleTimeOut))
{
return;
}
......@@ -699,7 +626,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.IsInWait == false)
{
LogUtil.info(Name + "之前有IO超时异常【" + alarmInfo.alarmDetail + "】,但是当前已经没有在等待中，清理信号超时异常！");
alarmType = StoreAlarmType.None;
alarmType = AlarmType.None;
WarnMsg = "";
}
}
......@@ -720,7 +647,7 @@ namespace OnlineStore.DeviceLibrary
bool noInStore = true;
if (AutoInout.CurrInOutACount >= StoreManager.Config.Box_ResetACount && noInStore)
{
if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == MoveType.InStore || MoveInfo.MoveType == MoveType.OutStore)
{
// LogInfo("已经累计出入库" + AutoInout.CurrInOutACount + "次，当时当前正在忙碌中暂不复位");
}
......@@ -756,7 +683,7 @@ namespace OnlineStore.DeviceLibrary
private DateTime checkAlarmTime = DateTime.Now;
public bool CheckAxisAlarm()
{
if (alarmType.Equals(StoreAlarmType.AxisAlarm) || alarmType.Equals(StoreAlarmType.AxisMoveError))
if (alarmType.Equals(AlarmType.AxisAlarm) || alarmType.Equals(AlarmType.AxisMoveError))
{
return true;
}
......@@ -777,7 +704,7 @@ namespace OnlineStore.DeviceLibrary
if (ACServerManager.GetAlarmStatus(deviceName, axis) == 1)
{
WarnMsg = Name + " 运动轴" + axisInfo.Explain + "报警";
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), WarnMsg, StoreMoveType.None);
Alarm(AlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), WarnMsg, MoveType.None);
isInAlarm = true;
}
}
......@@ -808,7 +735,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndMove();
storeRunStatus = StoreRunStatus.Runing;
storeStatus = StoreStatus.StoreOnline;
if (alarmType.Equals(StoreAlarmType.None))
if (alarmType.Equals(AlarmType.None))
{
WarnMsg = "";
}
......
source/DeviceLibrary/duoStore/BoxBean_Partial.cs
......@@ -45,17 +45,17 @@ namespace OnlineStore.DeviceLibrary
string msg = "";
if (wait.IsHomeMove)
{
wait.IsEnd = ACHomeMoveIsEnd(wait.AxisInfo, out msg);
wait.IsEnd = AxisBean.HomeMoveIsEnd(MoveInfo, wait.AxisInfo, out msg);
}
else
{
wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
wait.IsEnd = AxisBean.ACAxisMoveIsEnd(MoveInfo, wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
}
if (!msg.Equals(""))
{
isOk = false;
WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, MoveInfo.MoveType);
Alarm(AlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, MoveInfo.MoveType);
break;
}
}
......@@ -77,7 +77,7 @@ namespace OnlineStore.DeviceLibrary
{
ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时";
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType);
Alarm(AlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType);
LogUtil.error(Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", logType + 14);
if (!MoveInfo.OneWaitCanEndStep)
{
......@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary
second = 10;
}
LogUtil.error(WarnMsg, logType + 100, second);
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, MoveInfo.MoveType);
Alarm(AlarmType.IoSingleTimeOut, "", WarnMsg, MoveInfo.MoveType);
}
}
private bool AcInPosition(ConfigMoveAxis axis,int p)
......@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
ACAxisMove(Config.InOut_Axis, InOut_P1, Config.InOutAxis_P1_Speed);
InoutAxis.AbsMove(MoveInfo, InOut_P1, Config.InOutAxis_P1_Speed);
}
//StoreMove.WaitList.Add(WaitResultInfo.WaitAxisOrg(Config.InOut_Axis,IO_VALUE.HIGH));
}
......@@ -236,7 +236,7 @@ namespace OnlineStore.DeviceLibrary
string posId = param != null ? param.PosID : "";
if (isInSuddenDown || isNoAirCheck ||
(!storeRunStatus.Equals(StoreRunStatus.Runing))
|| (!MoveInfo.MoveType.Equals(StoreMoveType.None)))
|| (!MoveInfo.MoveType.Equals(MoveType.None)))
{
LogUtil.error(Name + " 启动出库出错，忙碌或报警中 ，storeStatus=" + storeRunStatus + ",MoveType=" + MoveInfo.MoveType + ",isInSuddenDown=" + isInSuddenDown + ",isNoAirCheck" + isNoAirCheck);
return;
......@@ -250,13 +250,13 @@ namespace OnlineStore.DeviceLibrary
LogInfo(" 启动入库【" + param.ToStr() + "】，压紧点P2【" + param.MoveP.ComPress_P2 + "】压紧前点P3【" + param.MoveP.ComPress_P3 + "】");
storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute;
MoveInfo.NewMove(StoreMoveType.InStore, param);
MoveInfo.NewMove(MoveType.InStore, param);
//新的料架库位
MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
MoveInfo.SingleInstore = true;
InOutStoreLog("料架取料：" + MoveInfo.SLog + " 叉子后退到待机点P1, 重置盘信息");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
ClearLastTrayInfo();
//LastRfidID = "";
}
......@@ -338,8 +338,8 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_51_MoveToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
private void StartSendTray(string str = "扫码失败")
......@@ -347,16 +347,16 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴到NG门口高点P12，旋转轴到NG门口P11");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed);
}
private void StartMoveTrayBack(string str = "料盘不属于该仓库")
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，走到料架位置，旋转轴至P101，升降轴至P102");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P101, Config.MiddleAxis_P11_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P101, Config.MiddleAxis_P11_Speed);
}
protected override void InStoreProcess()
{
......@@ -382,7 +382,7 @@ namespace OnlineStore.DeviceLibrary
// MoveInfo.SingleInstore = false;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到待机点P1, 重置盘信息");
// ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// ClearLastTrayInfo();
// }
// else
......@@ -400,7 +400,7 @@ namespace OnlineStore.DeviceLibrary
// MoveInfo.SingleInstore = false;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到待机点P1, 重置盘信息");
// ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// ClearLastTrayInfo();
// }
// else
......@@ -415,21 +415,21 @@ namespace OnlineStore.DeviceLibrary
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴到P101低点，旋转轴到P101点，压紧轴到压紧前点");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// ACAxisMove(Config.Comp_Axis, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// ComAxis.AbsMove(MoveInfo, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToP101);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子前进到P101点");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToP101))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToP102);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴上升到P102点");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToP102))
//{
......@@ -437,7 +437,7 @@ namespace OnlineStore.DeviceLibrary
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComDownMove);
// InOutStoreLog("单盘入库，料架取料 " + MoveInfo.SLog + "：压紧轴走到压紧点P2： " + MoveInfo.MoveParam.MoveP.ComPress_P2);
// ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
// ComAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
// }
// else
// {
......@@ -461,14 +461,14 @@ namespace OnlineStore.DeviceLibrary
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：检测到Compress_Check，盘高【" + LastHeight + "】，向下压紧 [" + Config.CompAxis_Down_Position + "] 目标 [" + targetP +
// "]记录ComP2[" + targetP + "]ComP3[" + MoveInfo.MoveParam.MoveP.ComPress_P3 + "]");
// ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, targetP, Config.CompAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_16_ComDownMove))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_17_InoutBack);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到扫码点");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.CompAxis_P1_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.CompAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_17_InoutBack))
//{
......@@ -486,29 +486,29 @@ namespace OnlineStore.DeviceLibrary
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_21_ToScanPosition);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到P2,旋转轴到P1");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
// ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
// MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_21_ToScanPosition))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_22_InOutToP2);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴到P2");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_22_InOutToP2))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_23_PutTrayDown);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到扫码低点P1，压紧轴到压紧前点P3");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
// ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_23_PutTrayDown))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_24_InOutToP1);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴返回待机点P1");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.CompAxis_P1_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.CompAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_24_InOutToP1))
//{
......@@ -542,21 +542,21 @@ namespace OnlineStore.DeviceLibrary
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_27_InoutToP2);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴到P2");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_27_InoutToP2))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_28_GetScanPTray);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到扫码高P2，压紧轴到压紧点P2");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
// ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_28_GetScanPTray))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_29_InoutBackP1);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴返回");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_29_InoutBackP1))
//{
......@@ -602,7 +602,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_52_DeviceToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子进入库位中，进出轴到库位P3");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
InoutAxis.AbsMove(MoveInfo, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_52_DeviceToBag))
{
......@@ -617,22 +617,22 @@ namespace OnlineStore.DeviceLibrary
//手动发给服务器状态，防止没有手动
//SendLineStatus(StoreID, posId, StoreStatus.InStoreEnd);
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_53_PutWareToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_54_DeviceBackFromBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子从库位中返回，进出轴到P1");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_54_DeviceBackFromBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_55_GoBack);
InOutStoreLog("入库 " + MoveInfo.SLog + "：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_55_GoBack))
{
......@@ -642,7 +642,7 @@ namespace OnlineStore.DeviceLibrary
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
LogInfo(" 【" + posId + "】单盘入库结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveEndToRuningStatus();
AutoInout.InOutEndProcess(this, StoreMoveType.InStore);
AutoInout.InOutEndProcess(this, MoveType.InStore);
}
else
{
......@@ -665,20 +665,20 @@ namespace OnlineStore.DeviceLibrary
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_73_InoutToNGDoor);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：进出轴到NG料门口位置P11");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P11, Config.InOutAxis_P2_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P11, Config.InOutAxis_P2_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_73_InoutToNGDoor))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_74_UpdownDown);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：升降轴到P11,压紧轴到P3，放下料盘");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P11, Config.UpDownAxis_P2_Speed);
// ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P11, Config.UpDownAxis_P2_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_74_UpdownDown))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_75_InoutToP1);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子后退到P1");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_75_InoutToP1))
//{
......@@ -707,15 +707,15 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
InoutAxis.AbsMove(MoveInfo, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_PutReel)
......@@ -728,7 +728,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
InOutStoreLog("送出料盘结束 " + MoveInfo.SLog + "： 升降轴返回，升降轴到P1，顶升下降,继续循环料架取料盘");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
}
#endregion
......@@ -777,7 +777,7 @@ namespace OnlineStore.DeviceLibrary
if (isInSuddenDown || isNoAirCheck ||
(!storeRunStatus.Equals(StoreRunStatus.Runing))
|| (!MoveInfo.MoveType.Equals(StoreMoveType.None)))
|| (!MoveInfo.MoveType.Equals(MoveType.None)))
{
LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】失败，忙碌或报警中 ，storeStatus：" + storeRunStatus + ",MoveType：" + MoveInfo.MoveType + ",isInSuddenDown：" + isInSuddenDown + ",isNoAirCheck：" + isNoAirCheck);
return false;
......@@ -791,7 +791,7 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.OutStoreExecute;
storeRunStatus = StoreRunStatus.Busy;
MoveInfo.NewMove(StoreMoveType.OutStore, param);
MoveInfo.NewMove(MoveType.OutStore, param);
LogInfo("启动出库【" + param.ToStr() + "】 ");
//出库前shelfPosID需要固定，出库时根据rfid判断是否需要出入料架
MoveInfo.NextMoveStep(StoreMoveStep.SO_01_InoutBack);
......@@ -803,9 +803,9 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_03_ToPosition);
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点) ,顶升上升");
ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
ComAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
}
protected override void OutStoreProcess()
......@@ -888,21 +888,21 @@ namespace OnlineStore.DeviceLibrary
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_04_ToPos);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进入库位中， 进出轴至P3(库位取放料点) ");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_04_ToPos)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_05_GetReel);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
// ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_05_GetReel)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_06_InoutBack);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从库位返回，进出轴至P1(待机点) ");
// //ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
// //InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
// InOutBackToP1(moveP.InOut_P1);
// //把库位的物品放到取到叉子上之后是出仓完成
// string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
......@@ -926,8 +926,8 @@ namespace OnlineStore.DeviceLibrary
// CompressSigTimeOut = false;
// MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102 ");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
// ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
// MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// }
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_08_ToShelfPosition)
......@@ -944,15 +944,15 @@ namespace OnlineStore.DeviceLibrary
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
// ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// taskData = null;
// Task.Factory.StartNew(delegate
......@@ -993,7 +993,7 @@ namespace OnlineStore.DeviceLibrary
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_14_GoBack);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： 升降轴返回，升降轴到P1，顶升下降");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
// //发送消息给流水线
// // SendOutStoreEnd(MoveInfo);
// CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
......
source/DeviceLibrary/duoStore/BoxBean_Shelf.cs
......@@ -249,7 +249,7 @@ namespace OnlineStore.DeviceLibrary
string mark = GetMarkInfo();
string moveName = "送出空料架[" + CurrShelfID + "]";
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
if (MoveInfo.MoveType.Equals(MoveType.OutStore))
{
moveName = "送出[" + CurrShelfID + "][" + mark + "]";
}
......@@ -478,7 +478,7 @@ namespace OnlineStore.DeviceLibrary
}
lineOperation.boxStatus.Add(1, boxStatus);
if (!alarmType.Equals(StoreAlarmType.None))
if (!alarmType.Equals(AlarmType.None))
{
lineOperation.alarmList.Add(alarmInfo);
}
......@@ -579,7 +579,7 @@ namespace OnlineStore.DeviceLibrary
try
{
//判断是否接收过此库位的出库信息
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore) && MoveInfo.MoveParam.PosID.Equals(posId))
if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.MoveParam.PosID.Equals(posId))
{
LogUtil.error(Name + " 出库命令【" + inoutParam.ToStr() + "】重复，正在【" + posId + "】出库中");
continue;
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
......@@ -13,15 +13,9 @@ using System.Threading.Tasks;
using System.Timers;
namespace OnlineStore.DeviceLibrary
{
/// <summary>
/// 流水线自动料仓-流水线类
/// </summary>
{
public partial class DUOStoreBean : KTK_Store
{
/// <summary>
/// 灯闪烁定时器
/// </summary>
{
private System.Timers.Timer ledProcessTimer = null;
public Dictionary<int, BOX_Config> BoxConfigMap { get; set; }
......@@ -56,6 +50,7 @@ namespace OnlineStore.DeviceLibrary
Name = (" DUO料仓_" + Config.CID + " ").ToUpper();
List<string> ioList = new List<string>();
AddDeviceName(ioList, Config.IOIPList);
foreach (BOX_Config config in configList.Values)
{
BoxBean equip = new BoxBean(config);
......@@ -145,7 +140,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false;
isInSuddenDown = false;
isNoAirCheck = false;
alarmType = StoreAlarmType.None;
alarmType = AlarmType.None;
WarnMsg = "";
foreach (BoxBean box in this.BoxMap.Values)
......@@ -172,12 +167,12 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false;
isInSuddenDown = false;
isNoAirCheck = false;
alarmType = StoreAlarmType.None;
alarmType = AlarmType.None;
WarnMsg = "";
foreach (BoxBean equip in BoxMap.Values)
{
if (!equip.alarmType.Equals(StoreAlarmType.None))
if (!equip.alarmType.Equals(AlarmType.None))
{
LogUtil.info(Name + "收到复位信号，" + equip.Name + " 需要复位");
equip.Reset();
......@@ -219,11 +214,11 @@ namespace OnlineStore.DeviceLibrary
foreach (BoxBean box in BoxMap.Values)
{
if (!box.alarmType.Equals(StoreAlarmType.None))
if (!box.alarmType.Equals(AlarmType.None))
{
isNeedAlarmLed = true;
}
if (box.MoveInfo.MoveType.Equals(StoreMoveType.InStore) || box.MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
if (box.MoveInfo.MoveType.Equals(MoveType.InStore) || box.MoveInfo.MoveType.Equals(MoveType.OutStore))
{
isInOut = true;
}
......@@ -253,7 +248,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
}
}
if (alarmType.Equals(StoreAlarmType.None).Equals(false) || isNoAirCheck || isInSuddenDown )
if (alarmType.Equals(AlarmType.None).Equals(false) || isNoAirCheck || isInSuddenDown )
{
isNeedAlarmLed = true;
}
......@@ -304,9 +299,7 @@ namespace OnlineStore.DeviceLibrary
return IOValue(ioType).Equals(ioValue);
}
#endregion
/// <summary>
/// 定时处理，监听信号，监听IO
/// </summary>
protected override void timersTimer_Elapsed(object sender, ElapsedEventArgs e)
{
BusyMoveProcess();
......@@ -333,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
if ((box.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || box.storeRunStatus.Equals(StoreRunStatus.Reset)) )
//if ((box.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || box.storeRunStatus.Equals(StoreRunStatus.Reset)) && box.IsDebug.Equals(false))
{
if (box.alarmType.Equals(StoreAlarmType.None))
if (box.alarmType.Equals(AlarmType.None))
{
isOk = false;
break;
......@@ -353,38 +346,8 @@ namespace OnlineStore.DeviceLibrary
}
}
private void SetWarnMsg(string msg)
{
if (String.IsNullOrEmpty(WarnMsg).Equals(false))
{
if (WarnMsg.Equals(msg))
{
if (msg.StartsWith(Name))
{
LogUtil.error(msg, 105);
}
else
{
LogUtil.error(Name + msg, 105);
}
}
else
{
if (msg.StartsWith(Name))
{
LogUtil.error(msg);
}
else
{
LogUtil.error(Name + msg);
}
}
}
WarnMsg = msg;
}
public override void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
public override void Alarm(AlarmType alarmType, string alarmDetial = "", string alarmMsg = "", MoveType storeMoveType = MoveType.None)
{
}
......@@ -411,27 +374,26 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
}
#region 出库
public override bool StartOutStoreMove(InOutParam param)
public bool OpenAllAxis(bool isCheck = true)
{
return true;
}
protected override void OutStoreProcess()
{
if (RunMultiAxis(isCheck, IO_Type.MoveAxis_Run, IO_Type.MoveAxis_Break, new AxisBean []{ T3_UpdownAxis,T2_MiddleAxis}))
{
if (RunAxis(isCheck, T1_BatchAxis) )
{
return true;
}
}
return false;
}
#endregion
#region 入库
public override void StartInStoreMove(InOutParam param)
public void CloseAllAxis()
{
}
protected override void InStoreProcess()
{
}
IOMove(IO_Type.MoveAxis_Break, IO_VALUE.LOW);
IOMove(IO_Type.BatchAxis_Break, IO_VALUE.LOW);
#endregion
CloseMultiAxis(IO_Type.MoveAxis_Run, IO_Type.MoveAxis_Break, new AxisBean[] { T3_UpdownAxis, T2_MiddleAxis });
CloseAxis(T1_BatchAxis);
}
}
}
\ No newline at end of file
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
partial class DUOStoreBean
{
#region 出库
public override bool StartOutStoreMove(InOutParam param)
{
return true;
}
protected override void OutStoreProcess()
{
}
#endregion
#region 入库
public override void StartInStoreMove(InOutParam param)
{
}
protected override void InStoreProcess()
{
}
#endregion
}
}
source/DeviceLibrary/duoStore/StoreManager.cs
......@@ -126,8 +126,7 @@ namespace OnlineStore.DeviceLibrary
string appPath = Application.StartupPath;
string configFile = appPath + ConfigAppSettings.GetValue(Setting_Init.BOX_ConfigPath);
if (!Directory.Exists(configFile))
{
{
configFile = configFile.Replace(".csv", "_" + storeConfig.Id + ".csv");
}
bool result = CSVConfigReader.SaveBoxPosition(configFile, storeConfig);
......@@ -148,7 +147,33 @@ namespace OnlineStore.DeviceLibrary
}
return false;
}
public static bool UpdateStoreConfig(Store_Config storeConfig)
{
try
{
//位置配置到文件中
string appPath = Application.StartupPath;
string configFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_ConfigPath);
if (!Directory.Exists(configFile))
{
configFile = configFile.Replace(".csv", "_" + storeConfig.Id + ".csv");
}
bool result = CSVConfigReader.SaveBoxPosition(configFile, storeConfig);
if (!result)
{
LogUtil.error("保存配置文件失败：" + configFile);
}
StoreManager.Config = storeConfig;
StoreManager.Store.Config = storeConfig;
return true;
}
catch (Exception ex)
{
LogUtil.error("出错：" + ex.ToString());
}
return false;
}
#endregion
#region 位置加载
......
source/DeviceLibrary/store/AutoInoutInfo.cs
......@@ -44,7 +44,7 @@ namespace OnlineStore.DeviceLibrary
autoNext = false;
}
internal void InOutEndProcess(BoxBean boxBean, StoreMoveType storeMoveType)
internal void InOutEndProcess(BoxBean boxBean, MoveType storeMoveType)
{
try
{
......@@ -55,7 +55,7 @@ namespace OnlineStore.DeviceLibrary
{
return;
}
if (storeMoveType.Equals(StoreMoveType.InStore))
if (storeMoveType.Equals(MoveType.InStore))
{
int newIndex = positionIndex - 1;
if (newIndex < 0)
......@@ -96,7 +96,7 @@ namespace OnlineStore.DeviceLibrary
}
}
}
else if (storeMoveType.Equals(StoreMoveType.OutStore))
else if (storeMoveType.Equals(MoveType.OutStore))
{
int newIndex = positionIndex - Jiange;
if (newIndex < 0)
......
source/DeviceLibrary/store/KTK_Store.cs
......@@ -72,7 +72,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 是否再报警中
/// </summary>
public StoreAlarmType alarmType = StoreAlarmType.None;
public AlarmType alarmType = AlarmType.None;
public AlarmInfo alarmInfo = new AlarmInfo();
......@@ -133,19 +133,19 @@ namespace OnlineStore.DeviceLibrary
{
switch (MoveInfo.MoveType)
{
case StoreMoveType.InStore:
case MoveType.InStore:
InStoreProcess();
isInPro = false;
break;
case StoreMoveType.OutStore:
case MoveType.OutStore:
OutStoreProcess();
isInPro = false;
break;
case StoreMoveType.ReturnHome:
case MoveType.ReturnHome:
ResetProcess();
isInPro = false;
break;
case StoreMoveType.StoreReset:
case MoveType.StoreReset:
ResetProcess();
isInPro = false;
break;
......@@ -158,39 +158,39 @@ namespace OnlineStore.DeviceLibrary
}
isInPro = false;
}
protected void SaveAlarmInfo(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
protected void SaveAlarmInfo(AlarmType alarmType, string alarmDetial, string alarmMsg, MoveType storeMoveType)
{
alarmMsg = alarmMsg.Replace(Name, "");
int inoutStatus = 0;
if (storeMoveType.Equals(StoreMoveType.InStore))
if (storeMoveType.Equals(MoveType.InStore))
{
inoutStatus = 1;
}
else if (storeMoveType.Equals(StoreMoveType.InStore))
else if (storeMoveType.Equals(MoveType.InStore))
{
inoutStatus = 2;
}
int aType = 0;
switch (alarmType)
{
case StoreAlarmType.AxisMoveError:
case AlarmType.AxisMoveError:
aType = 2;
break;
case StoreAlarmType.AxisAlarm:
case AlarmType.AxisAlarm:
aType = 2;
break;
case StoreAlarmType.SuddenStop:
case AlarmType.SuddenStop:
aType = 1;
alarmDetial = "1";
break;
case StoreAlarmType.NoAirCheck:
case AlarmType.NoAirCheck:
aType = 1;
alarmDetial = "2";
break;
case StoreAlarmType.IoSingleTimeOut:
case AlarmType.IoSingleTimeOut:
aType = 3;
break;
case StoreAlarmType.StellAlarm:
case AlarmType.StellAlarm:
aType = 2;
alarmDetial = "5";
break;
......@@ -211,7 +211,7 @@ namespace OnlineStore.DeviceLibrary
/// 报警
/// </summary>
/// <param name="alarmType"></param>
public abstract void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType);
public abstract void Alarm(AlarmType alarmType, string alarmDetial="", string alarmMsg="", MoveType storeMoveType=MoveType.None);
/// <summary>
/// 重置（夹料装置状态不变）
/// </summary>
......@@ -226,101 +226,7 @@ namespace OnlineStore.DeviceLibrary
/// 重置处理
/// </summary>
protected abstract void ResetProcess();
/// <summary>
/// 松下伺服轴原点返回运动，等待收到反馈后才会返回
/// </summary>
protected void ACAxisHomeMove(ConfigMoveAxis moveAxis)
{
moveAxis.TargetPosition = 0;
LogUtil.info(Name+ moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
MoveInfo.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed);
}
/// <summary>
/// 松下伺服电机运动
/// </summary>
protected void ACAxisMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{
MoveInfo.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed));
moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
}
/// <summary>
/// 判断AC伺服电机轴是否运动完成
/// </summary>
protected bool ACAxisMoveIsEnd(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed, out string msg)
{
msg = "";
string deviceName = moveAxis.DeviceName;
short axisNo = moveAxis.GetAxisValue();
bool isOk = ACServerManager.GetBusyStatus(deviceName, axisNo).Equals(0);
int outCount = ACServerManager.GetActualtPosition(deviceName, axisNo);
int errorCount = Math.Abs(outCount - targetPosition);
if (isOk)
{
if (errorCount <= moveAxis.CanErrorCountMax)
{
return true;
}
//判断是否需要重新运动
if (MoveInfo.CanWhileCount > 0)
{
LogUtil.error(Name+ moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount +
"]，误差过大，重新开始运动，剩余[" + MoveInfo.CanWhileCount + "]次");
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
MoveInfo.CanWhileCount--;
}
else
{
msg = Name + " storeMoveStep=" + MoveInfo.MoveStep + moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount
+ "]，误差过大，需要报警";
LogUtil.error(Name+ msg);
}
}
return false;
}
protected bool ACHomeMoveIsEnd(ConfigMoveAxis moveAxis, out string msg)
{
msg = "";
if (ACServerManager.IsHomeMoveEnd(moveAxis.DeviceName, moveAxis.GetAxisValue()))
{
//原点完成并且位置=0
int outCount = ACServerManager.GetActualtPosition(moveAxis.DeviceName, moveAxis.GetAxisValue());
int errorCount = Math.Abs(outCount);
if (errorCount <= moveAxis.CanErrorCountMax)
{
return true;
}
//判断是否需要重新运动
if (MoveInfo.CanWhileCount > 0)
{
LogUtil.error(Name+ moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + MoveInfo.CanWhileCount + "]次");
//LogUtil.error(LOGGER, StoreName + moveAxis.DisplayStr + "重新回原点");
ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed);
MoveInfo.CanWhileCount--;
}
else
{
msg = Name + " storeMoveStep=" + MoveInfo.MoveStep + moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，误差过大，需要报警";
LogUtil.error(Name+ msg);
}
}
return false;
}
protected bool AxisCountClear(ConfigMoveAxis moveAxis)
{
return true;
}
/// <summary>
/// 初始化
/// </summary>
protected virtual void Init()
{
if (!isInit)
......@@ -347,15 +253,9 @@ namespace OnlineStore.DeviceLibrary
storerunstatus = value;
}
}
/// <summary>
/// 移动信息
/// </summary>
public StoreMoveInfo MoveInfo = null;
/// <summary>
/// 定时处理，监听信号，监听IO
/// </summary>
protected abstract void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e);
#region 出库
/// <summary>
......@@ -450,6 +350,8 @@ namespace OnlineStore.DeviceLibrary
return sta;
}
}
public void CylinderMove(StoreMoveInfo moveInfo, string IoLowType, string IoHighType)
{
IOMove(IoLowType, IO_VALUE.LOW);
......@@ -467,10 +369,7 @@ namespace OnlineStore.DeviceLibrary
public IO_VALUE IOValue(string IoType)
{
return IOManager.IOValue(IoType, baseConfig.Id);
}
/// <summary>
/// 阻塞等待IO信号，等到返回true,未等到返回false
/// </summary>c
}
protected bool WaitIo(string ioType, IO_VALUE value, int timeOut, string errName = "")
{
return WaitUtil.Wait(timeOut, delegate () {
......@@ -514,12 +413,117 @@ namespace OnlineStore.DeviceLibrary
{
return false;
}
if (alarmType.Equals(StoreAlarmType.None))
if (alarmType.Equals(AlarmType.None))
{
return true;
}
return false;
}
#region 多个伺服运动
public bool RunMultiAxis(bool isCheck, string serverOnDO, string breakOnDO, params AxisBean[] axisArray)
{
IOManager.IOMove(serverOnDO, IO_VALUE.HIGH);
string msg = "";
foreach (AxisBean axis in axisArray)
{
bool result = axis.Open(false, out msg);
if (!result || (!String.IsNullOrEmpty(msg)))
{
SetWarnMsg(Name + msg);
Alarm(AlarmType.AxisAlarm);
return false;
}
}
Thread.Sleep(500);
//打开所有轴
if (isCheck)
{
foreach (AxisBean axis in axisArray)
{
if (!axis.AxisIsOpen(out msg))
{
SetWarnMsg(Name + msg);
Alarm(AlarmType.AxisAlarm);
return false;
}
}
}
IOManager.IOMove(breakOnDO, IO_VALUE.HIGH);
return true;
}
public void CloseMultiAxis(string serverOnDO, string breakOnDO, params AxisBean[] axisArray)
{
IOManager.IOMove(breakOnDO, IO_VALUE.LOW);
foreach (AxisBean axis in axisArray)
{
axis.ServoOff();
}
Thread.Sleep(100);
IOManager.IOMove(serverOnDO, IO_VALUE.LOW);
}
public bool RunAxis(bool isCheck, AxisBean axis)
{
IOMove(axis.Config.ServerOnDO, IO_VALUE.HIGH);
string msg = "";
bool result = axis.Open(isCheck, out msg);
if (result && String.IsNullOrEmpty(msg))
{
IOMove(axis.Config.BreakOnDO, IO_VALUE.HIGH);
return true;
}
SetWarnMsg(Name + msg);
//WarnMsg = DateTime.Now.ToLongTimeString() + " " + Name + msg;
Alarm(AlarmType.AxisAlarm);
return false;
}
public void CloseAxis(AxisBean axis)
{
IOMove(axis.Config.BreakOnDO, IO_VALUE.LOW);
axis.ServoOff();
Thread.Sleep(100);
IOMove(axis.Config.ServerOnDO, IO_VALUE.LOW);
}
#endregion
internal void SetWarnMsg(string msg)
{
if (String.IsNullOrEmpty(WarnMsg).Equals(false))
{
if (WarnMsg.Equals(msg))
{
if (msg.StartsWith(Name))
{
LogUtil.error(msg, 105);
}
else
{
LogUtil.error(Name + msg, 105);
}
}
else
{
if (msg.StartsWith(Name))
{
LogUtil.error(msg);
}
else
{
LogUtil.error(Name + msg);
}
}
}
WarnMsg = msg;
}
}
}
source/DeviceLibrary/store/StoreStep.cs
......@@ -466,7 +466,7 @@ namespace OnlineStore.DeviceLibrary
}
public enum StoreAlarmType
public enum AlarmType
{
/// <summary>
/// 没有报警
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
public int TimeOutSeconds = 60;
public StoreMoveInfo(int storeId)
{
moveType = StoreMoveType.None;
moveType = MoveType.None;
MoveParam = new InOutParam();
this.storeId = storeId;
......@@ -48,9 +48,9 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 操作类型
/// </summary>
private StoreMoveType moveType = StoreMoveType.None;
private MoveType moveType = MoveType.None;
public StoreMoveType MoveType
public MoveType MoveType
{
get { return moveType; }
}
......@@ -115,7 +115,7 @@ namespace OnlineStore.DeviceLibrary
// // MoveNum++;
// currShelfIndex = -1;
//}
public void NewMove(StoreMoveType type, InOutParam param = null)
public void NewMove(MoveType type, InOutParam param = null)
{
moveStep = StoreMoveStep.Wait;
this.moveType = type;
......@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
}
public void EndMove()
{
this.moveType = StoreMoveType.None;
this.moveType = MoveType.None;
this.MoveParam = null;
moveStep = StoreMoveStep.Wait;
LastSetpTime = DateTime.Now;
......@@ -467,7 +467,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
internal static int W011_DoorCloseEvent = 11;
}
public enum StoreMoveType
public enum MoveType
{
/// <summary>
/// 没有任何操作
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
......@@ -112,6 +112,14 @@ namespace OnlineStore.LoadCSVLibrary
}
return false;
}
public bool IsSameAxis(string devName,int axis)
{
if (DeviceName.Equals(devName) && ((short)axis).Equals(GetAxisValue()))
{
return true;
}
return false;
}
public string DisplayStr
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!