Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 598a720a 由 几米阳光
选项

复位时升降轴至门口位置。出入库升降轴逻辑修改。

1 个父辈 e4680c31
内嵌 并排
正在显示 9 个修改的文件 包含 410 行增加 和 311 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -82,10 +82,14 @@ ...@@ -82,10 +82,14 @@
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblAxisStatus = new System.Windows.Forms.Label(); this.lblAxisStatus = new System.Windows.Forms.Label();
this.button3 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.txtBatchTarget = new System.Windows.Forms.TextBox(); this.txtBatchTarget = new System.Windows.Forms.TextBox();
this.lblCountPulse5 = new System.Windows.Forms.TextBox(); this.lblCountPulse5 = new System.Windows.Forms.TextBox();
this.lblOutPulse5 = new System.Windows.Forms.TextBox(); this.lblOutPulse5 = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.label38 = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox(); this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox(); this.txtInoutTarget = new System.Windows.Forms.TextBox();
...@@ -212,6 +216,17 @@ ...@@ -212,6 +216,17 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.btnSelTemp = new System.Windows.Forms.Button();
this.txtHum = new System.Windows.Forms.TextBox();
this.label29 = new System.Windows.Forms.Label();
this.txtTemp = new System.Windows.Forms.TextBox();
this.label28 = new System.Windows.Forms.Label();
this.txtTempPort = new System.Windows.Forms.TextBox();
this.label27 = new System.Windows.Forms.Label();
this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnOpenDoor = new System.Windows.Forms.Button(); this.btnOpenDoor = new System.Windows.Forms.Button();
this.lblWaitTragGo = new System.Windows.Forms.Label(); this.lblWaitTragGo = new System.Windows.Forms.Label();
...@@ -223,21 +238,10 @@ ...@@ -223,21 +238,10 @@
this.btnGetOutTray = new System.Windows.Forms.Button(); this.btnGetOutTray = new System.Windows.Forms.Button();
this.lblDoorStatus = new System.Windows.Forms.Label(); this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button(); this.btnBatchInStore = new System.Windows.Forms.Button();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.txtUpdownP8 = new System.Windows.Forms.TextBox();
this.btnTempClose = new System.Windows.Forms.Button(); this.btnUpdownP8 = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button(); this.txtUpdownP2 = new System.Windows.Forms.TextBox();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.btnUpdownP2 = new System.Windows.Forms.Button();
this.txtTempPort = new System.Windows.Forms.TextBox();
this.label27 = new System.Windows.Forms.Label();
this.txtTemp = new System.Windows.Forms.TextBox();
this.label28 = new System.Windows.Forms.Label();
this.txtHum = new System.Windows.Forms.TextBox();
this.label29 = new System.Windows.Forms.Label();
this.btnSelTemp = new System.Windows.Forms.Button();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -248,9 +252,9 @@ ...@@ -248,9 +252,9 @@
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
this.groupBox6.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupBox6.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -966,6 +970,16 @@ ...@@ -966,6 +970,16 @@
this.button3.UseVisualStyleBackColor = true; this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click); this.button3.Click += new System.EventHandler(this.button3_Click);
// //
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
this.axis_5_Alarm.IOValue = 0;
this.axis_5_Alarm.isCanClick = false;
this.axis_5_Alarm.Location = new System.Drawing.Point(418, 37);
this.axis_5_Alarm.Name = "axis_5_Alarm";
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_5_Alarm.TabIndex = 271;
//
// txtBatchTarget // txtBatchTarget
// //
this.txtBatchTarget.Location = new System.Drawing.Point(395, 139); this.txtBatchTarget.Location = new System.Drawing.Point(395, 139);
...@@ -1000,6 +1014,36 @@ ...@@ -1000,6 +1014,36 @@
this.label20.TabIndex = 267; this.label20.TabIndex = 267;
this.label20.Text = "批量出入料轴"; this.label20.Text = "批量出入料轴";
// //
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(116, 37);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(318, 37);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(213, 37);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// label38 // label38
// //
this.label38.AutoSize = true; this.label38.AutoSize = true;
...@@ -1144,6 +1188,10 @@ ...@@ -1144,6 +1188,10 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.txtUpdownP8);
this.groupBox2.Controls.Add(this.btnUpdownP8);
this.groupBox2.Controls.Add(this.txtUpdownP2);
this.groupBox2.Controls.Add(this.btnUpdownP2);
this.groupBox2.Controls.Add(this.txtUpDownDoor); this.groupBox2.Controls.Add(this.txtUpDownDoor);
this.groupBox2.Controls.Add(this.btnUpDownDoor); this.groupBox2.Controls.Add(this.btnUpDownDoor);
this.groupBox2.Controls.Add(this.lblTemp); this.groupBox2.Controls.Add(this.lblTemp);
...@@ -1197,7 +1245,7 @@ ...@@ -1197,7 +1245,7 @@
this.txtUpDownDoor.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownDoor.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownDoor.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownDoor.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownDoor.Location = new System.Drawing.Point(153, 194); this.txtUpDownDoor.Location = new System.Drawing.Point(153, 132);
this.txtUpDownDoor.MaxLength = 0; this.txtUpDownDoor.MaxLength = 0;
this.txtUpDownDoor.Name = "txtUpDownDoor"; this.txtUpDownDoor.Name = "txtUpDownDoor";
this.txtUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1213,12 +1261,12 @@ ...@@ -1213,12 +1261,12 @@
this.btnUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownDoor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownDoor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownDoor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownDoor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownDoor.Location = new System.Drawing.Point(10, 192); this.btnUpDownDoor.Location = new System.Drawing.Point(10, 130);
this.btnUpDownDoor.Name = "btnUpDownDoor"; this.btnUpDownDoor.Name = "btnUpDownDoor";
this.btnUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownDoor.Size = new System.Drawing.Size(140, 27); this.btnUpDownDoor.Size = new System.Drawing.Size(140, 27);
this.btnUpDownDoor.TabIndex = 271; this.btnUpDownDoor.TabIndex = 271;
this.btnUpDownDoor.Text = "升降轴仓门位置："; this.btnUpDownDoor.Text = "升降轴仓门位置P7：";
this.btnUpDownDoor.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownDoor.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownDoor.UseVisualStyleBackColor = true; this.btnUpDownDoor.UseVisualStyleBackColor = true;
this.btnUpDownDoor.Click += new System.EventHandler(this.btnUpDownDoor_Click); this.btnUpDownDoor.Click += new System.EventHandler(this.btnUpDownDoor_Click);
...@@ -1228,7 +1276,7 @@ ...@@ -1228,7 +1276,7 @@
this.lblTemp.AutoSize = true; this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black; this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(18, 106); this.lblTemp.Location = new System.Drawing.Point(18, 357);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270; this.lblTemp.TabIndex = 270;
...@@ -1363,7 +1411,7 @@ ...@@ -1363,7 +1411,7 @@
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(153, 163); this.txtUpDownP1.Location = new System.Drawing.Point(153, 101);
this.txtUpDownP1.MaxLength = 0; this.txtUpDownP1.MaxLength = 0;
this.txtUpDownP1.Name = "txtUpDownP1"; this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1621,12 +1669,12 @@ ...@@ -1621,12 +1669,12 @@
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(10, 161); this.btnUpDownP1.Location = new System.Drawing.Point(10, 99);
this.btnUpDownP1.Name = "btnUpDownP1"; this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(140, 27); this.btnUpDownP1.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP1.TabIndex = 199; this.btnUpDownP1.TabIndex = 199;
this.btnUpDownP1.Text = "升降轴出入料点P1："; this.btnUpDownP1.Text = "升降轴入料点P1：";
this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.UseVisualStyleBackColor = true; this.btnUpDownP1.UseVisualStyleBackColor = true;
this.btnUpDownP1.Click += new System.EventHandler(this.btnUpDownP1_Click); this.btnUpDownP1.Click += new System.EventHandler(this.btnUpDownP1_Click);
...@@ -2384,6 +2432,130 @@ ...@@ -2384,6 +2432,130 @@
this.tabPage3.Text = "压紧轴调试"; this.tabPage3.Text = "压紧轴调试";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
// //
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(567, 405);
this.tabPage1.TabIndex = 3;
this.tabPage1.Text = "温湿度调试";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox7
//
this.groupBox7.Controls.Add(this.btnSelTemp);
this.groupBox7.Controls.Add(this.txtHum);
this.groupBox7.Controls.Add(this.label29);
this.groupBox7.Controls.Add(this.txtTemp);
this.groupBox7.Controls.Add(this.label28);
this.groupBox7.Controls.Add(this.txtTempPort);
this.groupBox7.Controls.Add(this.label27);
this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Location = new System.Drawing.Point(12, 14);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(549, 134);
this.groupBox7.TabIndex = 90;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温控器调试";
//
// btnSelTemp
//
this.btnSelTemp.Location = new System.Drawing.Point(212, 82);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(100, 33);
this.btnSelTemp.TabIndex = 248;
this.btnSelTemp.Text = "查询";
this.btnSelTemp.UseVisualStyleBackColor = true;
this.btnSelTemp.Click += new System.EventHandler(this.btnSelTemp_Click);
//
// txtHum
//
this.txtHum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(95, 98);
this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(87, 21);
this.txtHum.TabIndex = 247;
this.txtHum.Text = "0";
//
// label29
//
this.label29.AutoSize = true;
this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label29.Location = new System.Drawing.Point(38, 101);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(44, 17);
this.label29.TabIndex = 246;
this.label29.Text = "湿度：";
this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTemp
//
this.txtTemp.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTemp.Location = new System.Drawing.Point(95, 63);
this.txtTemp.MaxLength = 10;
this.txtTemp.Name = "txtTemp";
this.txtTemp.Size = new System.Drawing.Size(87, 21);
this.txtTemp.TabIndex = 245;
this.txtTemp.Text = "0";
//
// label28
//
this.label28.AutoSize = true;
this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label28.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label28.Location = new System.Drawing.Point(38, 67);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(44, 17);
this.label28.TabIndex = 244;
this.label28.Text = "温度：";
this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTempPort
//
this.txtTempPort.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTempPort.Location = new System.Drawing.Point(95, 28);
this.txtTempPort.MaxLength = 10;
this.txtTempPort.Name = "txtTempPort";
this.txtTempPort.Size = new System.Drawing.Size(87, 21);
this.txtTempPort.TabIndex = 243;
this.txtTempPort.Text = "0";
//
// label27
//
this.label27.AutoSize = true;
this.label27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label27.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label27.Location = new System.Drawing.Point(26, 33);
this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(56, 17);
this.label27.TabIndex = 242;
this.label27.Text = "端口号：";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnTempClose
//
this.btnTempClose.Location = new System.Drawing.Point(322, 30);
this.btnTempClose.Name = "btnTempClose";
this.btnTempClose.Size = new System.Drawing.Size(100, 33);
this.btnTempClose.TabIndex = 89;
this.btnTempClose.Text = "断开";
this.btnTempClose.UseVisualStyleBackColor = true;
this.btnTempClose.Click += new System.EventHandler(this.btnTempClose_Click);
//
// btnTempInit
//
this.btnTempInit.Location = new System.Drawing.Point(212, 30);
this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(100, 33);
this.btnTempInit.TabIndex = 88;
this.btnTempInit.Text = "初始化";
this.btnTempInit.UseVisualStyleBackColor = true;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click);
//
// groupBox6 // groupBox6
// //
this.groupBox6.Controls.Add(this.btnOpenDoor); this.groupBox6.Controls.Add(this.btnOpenDoor);
...@@ -2514,169 +2686,71 @@ ...@@ -2514,169 +2686,71 @@
this.btnBatchInStore.UseVisualStyleBackColor = true; this.btnBatchInStore.UseVisualStyleBackColor = true;
this.btnBatchInStore.Click += new System.EventHandler(this.btnBatchInStore_Click); this.btnBatchInStore.Click += new System.EventHandler(this.btnBatchInStore_Click);
// //
// tabPage1 // txtUpdownP8
// //
this.tabPage1.Controls.Add(this.groupBox7); this.txtUpdownP8.AcceptsReturn = true;
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.txtUpdownP8.BackColor = System.Drawing.SystemColors.Window;
this.tabPage1.Name = "tabPage1"; this.txtUpdownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
this.tabPage1.Size = new System.Drawing.Size(567, 405); this.txtUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabPage1.TabIndex = 3; this.txtUpdownP8.ForeColor = System.Drawing.SystemColors.WindowText;
this.tabPage1.Text = "温湿度调试"; this.txtUpdownP8.Location = new System.Drawing.Point(153, 194);
this.tabPage1.UseVisualStyleBackColor = true; this.txtUpdownP8.MaxLength = 0;
// this.txtUpdownP8.Name = "txtUpdownP8";
// btnTempClose this.txtUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
// this.txtUpdownP8.Size = new System.Drawing.Size(89, 23);
this.btnTempClose.Location = new System.Drawing.Point(322, 30); this.txtUpdownP8.TabIndex = 276;
this.btnTempClose.Name = "btnTempClose"; this.txtUpdownP8.Text = "1000";
this.btnTempClose.Size = new System.Drawing.Size(100, 33); //
this.btnTempClose.TabIndex = 89; // btnUpdownP8
this.btnTempClose.Text = "断开"; //
this.btnTempClose.UseVisualStyleBackColor = true; this.btnUpdownP8.AutoSize = true;
this.btnTempClose.Click += new System.EventHandler(this.btnTempClose_Click); this.btnUpdownP8.BackColor = System.Drawing.SystemColors.Control;
// this.btnUpdownP8.Cursor = System.Windows.Forms.Cursors.Default;
// btnTempInit this.btnUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
// this.btnUpdownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnTempInit.Location = new System.Drawing.Point(212, 30); this.btnUpdownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnTempInit.Name = "btnTempInit"; this.btnUpdownP8.Location = new System.Drawing.Point(10, 192);
this.btnTempInit.Size = new System.Drawing.Size(100, 33); this.btnUpdownP8.Name = "btnUpdownP8";
this.btnTempInit.TabIndex = 88; this.btnUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnTempInit.Text = "初始化"; this.btnUpdownP8.Size = new System.Drawing.Size(140, 27);
this.btnTempInit.UseVisualStyleBackColor = true; this.btnUpdownP8.TabIndex = 275;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click); this.btnUpdownP8.Text = "升降轴出库低点P8：";
// this.btnUpdownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// groupBox7 this.btnUpdownP8.UseVisualStyleBackColor = true;
// this.btnUpdownP8.Click += new System.EventHandler(this.btnUpDownP8_Click);
this.groupBox7.Controls.Add(this.btnSelTemp); //
this.groupBox7.Controls.Add(this.txtHum); // txtUpdownP2
this.groupBox7.Controls.Add(this.label29); //
this.groupBox7.Controls.Add(this.txtTemp); this.txtUpdownP2.AcceptsReturn = true;
this.groupBox7.Controls.Add(this.label28); this.txtUpdownP2.BackColor = System.Drawing.SystemColors.Window;
this.groupBox7.Controls.Add(this.txtTempPort); this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.groupBox7.Controls.Add(this.label27); this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox7.Controls.Add(this.btnTempClose); this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.groupBox7.Controls.Add(this.btnTempInit); this.txtUpdownP2.Location = new System.Drawing.Point(153, 163);
this.groupBox7.Location = new System.Drawing.Point(12, 14); this.txtUpdownP2.MaxLength = 0;
this.groupBox7.Name = "groupBox7"; this.txtUpdownP2.Name = "txtUpdownP2";
this.groupBox7.Size = new System.Drawing.Size(549, 134); this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.groupBox7.TabIndex = 90; this.txtUpdownP2.Size = new System.Drawing.Size(89, 23);
this.groupBox7.TabStop = false; this.txtUpdownP2.TabIndex = 274;
this.groupBox7.Text = "温控器调试"; this.txtUpdownP2.Text = "1000";
// //
// txtTempPort // btnUpdownP2
// //
this.txtTempPort.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP2.AutoSize = true;
this.txtTempPort.Location = new System.Drawing.Point(95, 28); this.btnUpdownP2.BackColor = System.Drawing.SystemColors.Control;
this.txtTempPort.MaxLength = 10; this.btnUpdownP2.Cursor = System.Windows.Forms.Cursors.Default;
this.txtTempPort.Name = "txtTempPort"; this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTempPort.Size = new System.Drawing.Size(87, 21); this.btnUpdownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.txtTempPort.TabIndex = 243; this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.txtTempPort.Text = "0"; this.btnUpdownP2.Location = new System.Drawing.Point(10, 161);
// this.btnUpdownP2.Name = "btnUpdownP2";
// label27 this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
// this.btnUpdownP2.Size = new System.Drawing.Size(140, 27);
this.label27.AutoSize = true; this.btnUpdownP2.TabIndex = 273;
this.label27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP2.Text = "升降轴出库高点P2：";
this.label27.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.btnUpdownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label27.Location = new System.Drawing.Point(26, 33); this.btnUpdownP2.UseVisualStyleBackColor = true;
this.label27.Name = "label27"; this.btnUpdownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
this.label27.Size = new System.Drawing.Size(56, 17);
this.label27.TabIndex = 242;
this.label27.Text = "端口号：";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTemp
//
this.txtTemp.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTemp.Location = new System.Drawing.Point(95, 63);
this.txtTemp.MaxLength = 10;
this.txtTemp.Name = "txtTemp";
this.txtTemp.Size = new System.Drawing.Size(87, 21);
this.txtTemp.TabIndex = 245;
this.txtTemp.Text = "0";
//
// label28
//
this.label28.AutoSize = true;
this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label28.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label28.Location = new System.Drawing.Point(38, 67);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(44, 17);
this.label28.TabIndex = 244;
this.label28.Text = "温度：";
this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtHum
//
this.txtHum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(95, 98);
this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(87, 21);
this.txtHum.TabIndex = 247;
this.txtHum.Text = "0";
//
// label29
//
this.label29.AutoSize = true;
this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label29.Location = new System.Drawing.Point(38, 101);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(44, 17);
this.label29.TabIndex = 246;
this.label29.Text = "湿度：";
this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnSelTemp
//
this.btnSelTemp.Location = new System.Drawing.Point(212, 82);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(100, 33);
this.btnSelTemp.TabIndex = 248;
this.btnSelTemp.Text = "查询";
this.btnSelTemp.UseVisualStyleBackColor = true;
this.btnSelTemp.Click += new System.EventHandler(this.btnSelTemp_Click);
//
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
this.axis_5_Alarm.IOValue = 0;
this.axis_5_Alarm.isCanClick = false;
this.axis_5_Alarm.Location = new System.Drawing.Point(418, 37);
this.axis_5_Alarm.Name = "axis_5_Alarm";
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_5_Alarm.TabIndex = 271;
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(116, 37);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(318, 37);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(213, 37);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
// //
// FrmStoreBox // FrmStoreBox
// //
...@@ -2715,11 +2789,11 @@ ...@@ -2715,11 +2789,11 @@
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout(); this.groupBox7.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -2941,6 +3015,10 @@ ...@@ -2941,6 +3015,10 @@
private System.Windows.Forms.Label label29; private System.Windows.Forms.Label label29;
private System.Windows.Forms.TextBox txtTemp; private System.Windows.Forms.TextBox txtTemp;
private System.Windows.Forms.Label label28; private System.Windows.Forms.Label label28;
public System.Windows.Forms.TextBox txtUpdownP8;
public System.Windows.Forms.Button btnUpdownP8;
public System.Windows.Forms.TextBox txtUpdownP2;
public System.Windows.Forms.Button btnUpdownP2;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -65,12 +65,13 @@ namespace OnlineStore.AutoInOutStore ...@@ -65,12 +65,13 @@ namespace OnlineStore.AutoInOutStore
txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString(); txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString();
txtComP1.Text = store.Config.CompressAxis_P1_Position.ToString(); txtComP1.Text = store.Config.CompressAxis_P1_Position.ToString();
//txtUpDownP2.Text = store.Config.UpDownAxis_DoorIPosition_P2.ToString(); txtUpdownP8.Text = store.Config.UpDownAxis_OutLow_P8.ToString();
txtUpdownP2.Text = store.Config.UpDownAxis_OutHigh_P2.ToString();
//txtUpDownP7.Text = store.Config.UpDownAxis_DoorOBPosition_P7.ToString(); //txtUpDownP7.Text = store.Config.UpDownAxis_DoorOBPosition_P7.ToString();
//txtUpDownP8.Text = store.Config.UpDownAxis_DoorIBPosition_P8.ToString(); //txtUpDownP8.Text = store.Config.UpDownAxis_DoorIBPosition_P8.ToString();
//txtInOutP2.Text = store.Config.InOutAxis_DoorPosition_P2.ToString(); //txtInOutP2.Text = store.Config.InOutAxis_DoorPosition_P2.ToString();
txtUpDownP1.Text = store.Config.GetDefaultUpDownP1().ToString(); txtUpDownP1.Text = store.Config.GetDefaultUpDownP1().ToString();
txtUpDownDoor.Text = store.Config.UpDownAxis_DoorPosition.ToString(); txtUpDownDoor.Text = store.Config.UpDownAxis_Door_P7.ToString();
if (Position != null) if (Position != null)
{ {
txtUpDownP1.Text = store.Config.GetUpDownP1(Position.BagHeight).ToString(); txtUpDownP1.Text = store.Config.GetUpDownP1(Position.BagHeight).ToString();
...@@ -81,11 +82,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -81,11 +82,7 @@ namespace OnlineStore.AutoInOutStore
txtUpDownP6.Text = Position.UpDownAxis_OLPosition_P6.ToString(); txtUpDownP6.Text = Position.UpDownAxis_OLPosition_P6.ToString();
txtComP2.Text = Position.CompressAxis_Position_P2.ToString(); txtComP2.Text = Position.CompressAxis_Position_P2.ToString();
txtComP3.Text = Position.CompressAxis_CPosition_P3.ToString(); txtComP3.Text = Position.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = Position.InOutAxis_Position_P3.ToString(); txtInOutP3.Text = Position.InOutAxis_Position_P3.ToString();
//txtUpDownP2.Text = ktkPosition.UpDownAxis_DoorIPosition_P2.ToString();
//txtUpDownP7.Text = ktkPosition.UpDownAxis_DoorOBPosition_P7.ToString();
//txtUpDownP8.Text = ktkPosition.UpDownAxis_DoorIBPosition_P8.ToString();
txtInOutP2.Text = Position.InOutAxis_DoorPosition_P2.ToString(); txtInOutP2.Text = Position.InOutAxis_DoorPosition_P2.ToString();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString(); //txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString();
...@@ -237,21 +234,14 @@ namespace OnlineStore.AutoInOutStore ...@@ -237,21 +234,14 @@ namespace OnlineStore.AutoInOutStore
} }
} }
} }
lblWarnMsg.Text = store.WarnMsg; lblWarnMsg.Text = store.WarnMsg;
string deviceMsg = "叉子上有料盘，请打开仓门检查";
if (store.Config.IsHasDoorLimit.Equals(1)) if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && store.StoreMove.MoveType.Equals(StoreMoveType.None) && KND.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
if (KND.IOValue(IO_Type.DoorColse_Single).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关";
}
}
//如果不在出入库中，且叉子上有信号，需要提示检查叉子
if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && KND.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 叉子料盘检测有料，请检查"; lblWarnMsg.Text = lblWarnMsg.Text + deviceMsg;
} }
if (store.autoNext) if (store.autoNext)
{ {
string msg = store.autoMsg; string msg = store.autoMsg;
...@@ -334,10 +324,27 @@ namespace OnlineStore.AutoInOutStore ...@@ -334,10 +324,27 @@ namespace OnlineStore.AutoInOutStore
private void UpdateFormDoorStats(bool dooIsOpen) private void UpdateFormDoorStats(bool dooIsOpen)
{ {
btnOpenDoor.Enabled = !dooIsOpen;
btnBatchInStore.Enabled = dooIsOpen;
btnGetOutTray.Enabled = !dooIsOpen;
btnCloseDoor.Enabled = dooIsOpen; btnCloseDoor.Enabled = dooIsOpen;
btnBatchInStore.Enabled = dooIsOpen;
if (dooIsOpen.Equals(false))
{
if (AutomaticBaiting.BatchOutStoreCount > 0)
{
btnGetOutTray.Enabled = true;
btnOpenDoor.Enabled = false;
}
else
{
btnGetOutTray.Enabled = false;
btnOpenDoor.Enabled = true;
}
}
else
{
btnOpenDoor.Enabled = !dooIsOpen;
btnGetOutTray.Enabled = !dooIsOpen;
}
btnBatchReset.Enabled = !dooIsOpen; btnBatchReset.Enabled = !dooIsOpen;
} }
...@@ -492,7 +499,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -492,7 +499,7 @@ namespace OnlineStore.AutoInOutStore
ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2); ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1); ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1);
ktk.UpDown_Door = FormUtil.GetIntValue(txtUpDownDoor); ktk.UpDown_Door_P7 = FormUtil.GetIntValue(txtUpDownDoor);
//ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2); //ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2);
ktk.UpDown_P3 = FormUtil.GetIntValue(txtUpDownP3); ktk.UpDown_P3 = FormUtil.GetIntValue(txtUpDownP3);
ktk.UpDown_P4 = FormUtil.GetIntValue(txtUpDownP4); ktk.UpDown_P4 = FormUtil.GetIntValue(txtUpDownP4);
...@@ -500,6 +507,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -500,6 +507,8 @@ namespace OnlineStore.AutoInOutStore
ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6); ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6);
//ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7); //ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
//ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8); //ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
ktk.UpDown_OutHigh_P2 = FormUtil.GetIntValue(txtUpdownP2);
ktk.UpDown_OutLow_P8 = FormUtil.GetIntValue(txtUpdownP8);
return ktk; return ktk;
} }
...@@ -720,26 +729,26 @@ namespace OnlineStore.AutoInOutStore ...@@ -720,26 +729,26 @@ namespace OnlineStore.AutoInOutStore
store.Config.CompressAxis_P1_Position = FormUtil.GetIntValue(txtComP1); store.Config.CompressAxis_P1_Position = FormUtil.GetIntValue(txtComP1);
needUpdate = true; needUpdate = true;
} }
if (store.Config.UpDownAxis_DoorPosition != FormUtil.GetIntValue(txtUpDownDoor)) if (store.Config.UpDownAxis_Door_P7 != FormUtil.GetIntValue(txtUpDownDoor))
{ {
store.Config.UpDownAxis_DoorPosition = FormUtil.GetIntValue(txtUpDownDoor); store.Config.UpDownAxis_Door_P7 = FormUtil.GetIntValue(txtUpDownDoor);
needUpdate = true;
}
if (store.Config.UpDownAxis_OutHigh_P2 != FormUtil.GetIntValue(txtUpdownP2))
{
store.Config.UpDownAxis_OutHigh_P2 = FormUtil.GetIntValue(txtUpdownP2);
needUpdate = true; needUpdate = true;
} }
//if (store.Config.UpDownAxis_DoorIPosition_P2 != FormUtil.GetIntValue(txtUpDownP2))
//{
// store.Config.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
// needUpdate = true;
//}
//if (store.Config.UpDownAxis_DoorOBPosition_P7 != FormUtil.GetIntValue(txtUpDownP7)) //if (store.Config.UpDownAxis_DoorOBPosition_P7 != FormUtil.GetIntValue(txtUpDownP7))
//{ //{
// store.Config.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7); // store.Config.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
// needUpdate = true; // needUpdate = true;
//} //}
//if (store.Config.UpDownAxis_DoorIBPosition_P8 != FormUtil.GetIntValue(txtUpDownP8)) if (store.Config.UpDownAxis_OutLow_P8 != FormUtil.GetIntValue(txtUpdownP8))
//{ {
// store.Config.UpDownAxis_DoorIBPosition_P8 = FormUtil.GetIntValue(txtUpDownP8); store.Config.UpDownAxis_OutLow_P8 = FormUtil.GetIntValue(txtUpdownP8);
// needUpdate = true; needUpdate = true;
//} }
//if (store.Config.InOutAxis_DoorPosition_P2 != FormUtil.GetIntValue(txtInOutP2)) //if (store.Config.InOutAxis_DoorPosition_P2 != FormUtil.GetIntValue(txtInOutP2))
//{ //{
// store.Config.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2); // store.Config.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2);
...@@ -811,11 +820,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -811,11 +820,11 @@ namespace OnlineStore.AutoInOutStore
private void btnUpDownP2_Click(object sender, EventArgs e) private void btnUpDownP2_Click(object sender, EventArgs e)
{ {
//if (InOutIsIsP1()) if (InOutIsIsP1())
//{ {
// int value = FormUtil.GetIntValue(txtUpDownP2); int value = FormUtil.GetIntValue(txtUpdownP2);
// AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P2_Speed); AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P2_Speed);
//} }
} }
private void btnUpDownP7_Click(object sender, EventArgs e) private void btnUpDownP7_Click(object sender, EventArgs e)
{ {
...@@ -828,11 +837,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -828,11 +837,11 @@ namespace OnlineStore.AutoInOutStore
private void btnUpDownP8_Click(object sender, EventArgs e) private void btnUpDownP8_Click(object sender, EventArgs e)
{ {
//if (InOutIsIsP1()) if (InOutIsIsP1())
//{ {
// int value = FormUtil.GetIntValue(txtUpDownP8); int value = FormUtil.GetIntValue(txtUpdownP8);
// AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P8_Speed); AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P8_Speed);
//} }
} }
private void btnUpDownP3_Click(object sender, EventArgs e) private void btnUpDownP3_Click(object sender, EventArgs e)
...@@ -1540,7 +1549,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1540,7 +1549,7 @@ namespace OnlineStore.AutoInOutStore
if (InOutIsIsP1()) if (InOutIsIsP1())
{ {
int value = FormUtil.GetIntValue(txtUpDownDoor); int value = FormUtil.GetIntValue(txtUpDownDoor);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_Door_Speed); AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P7_Speed);
} }
} }
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -45,12 +45,10 @@ AXIS,(轴三)进出轴,InOut_Axis,1,COM5,0,,,,, ...@@ -45,12 +45,10 @@ AXIS,(轴三)进出轴,InOut_Axis,1,COM5,0,,,,,
AXIS,(轴五)批量上下料轴,Batch_Axis,1,COM6,0,,,,, AXIS,(轴五)批量上下料轴,Batch_Axis,1,COM6,0,,,,,
,,,,,,,,,, ,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,升降轴 进料口仓门位置,UpDownAxis_DoorPosition,355000,,,,,,, PRO,升降轴 仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,355007,,,,,,,
,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,403000,,,,,,, PRO,升降轴 出库高点P2,UpDownAxis_OutHigh_P2,355002,,,,,,,
,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,415000,,,,,,, PRO,升降轴 出库低点P8,UpDownAxis_OutLow_P8,350008,,,,,,,
,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,, PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#355001;12#350001;,,,,,,,
,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,,
PRO,升降轴 出入料待机点P1集合,UpDownAxis_P1_List,8#355000;12#350000;,,,,,,,
PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,260000,,,,,,, PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,260000,,,,,,,
PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,, PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,-40000,,,,,,, PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,-40000,,,,,,,
...@@ -80,15 +78,15 @@ PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,30,,,,,,, ...@@ -80,15 +78,15 @@ PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,30,,,,,,,
PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,, PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,60,,,,,,, PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,60,,,,,,,
PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,20,,,,,,, PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,20,,,,,,,
PRO,升降轴(轴二)到仓门速度,UpDownAxis_Door_Speed,50,,,,,,, ,,,,,,,,,,
PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,250,,,,,,, PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,250,,,,,,,
,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,250,,,,,,, PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,250,,,,,,,
PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,250,,,,,,, PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,250,,,,,,,
PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,, PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,150,,,,,,,
PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,250,,,,,,, PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,250,,,,,,,
PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,100,,,,,,, PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,100,,,,,,,
,升降轴(轴二)P7速度,UpDownAxis_P7_Speed,100,,,,,,, PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,100,,,,,,,
,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,, PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,,
PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,120,,,,,,, PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,120,,,,,,,
PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,120,,,,,,, PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,120,,,,,,,
PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,100,,,,,,, PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,100,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -363,9 +363,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -363,9 +363,9 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H_OtherAxisBack: case StoreMoveStep.BOX_H_OtherAxisBack:
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1); StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
LogUtil.info(LOGGER, StoreName + "复位中：旋转轴运动到P1，上下轴走到P1，压紧轴到P1！"); LogUtil.info(LOGGER, StoreName + "复位中：旋转轴运动到P1，上下轴走到P7门口位置，压紧轴到P1！");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.GetDefaultUpDownP1(), Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_Door_P7, Config.UpDownAxis_P7_Speed);
ComMoveToPosition(Config.CompressAxis_P1_Position); ComMoveToPosition(Config.CompressAxis_P1_Position);
break; break;
case StoreMoveStep.BOX_H_MiddleAxisToP1: case StoreMoveStep.BOX_H_MiddleAxisToP1:
...@@ -392,9 +392,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -392,9 +392,9 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StoreMoveStep.BOX_M_H_TOP1_CompressHome: case StoreMoveStep.BOX_M_H_TOP1_CompressHome:
StoreMove.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1); StoreMove.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1);
LogUtil.info(LOGGER, StoreName + "复位中：旋转轴运动到P1，上下轴走到P1，压紧轴到P1！"); LogUtil.info(LOGGER, StoreName + "复位中：旋转轴运动到P1，上下轴走到门口位置P7，压紧轴到P1！");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.GetDefaultUpDownP1(), Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_Door_P7, Config.UpDownAxis_P7_Speed);
ComMoveToPosition(Config.CompressAxis_P1_Position); ComMoveToPosition(Config.CompressAxis_P1_Position);
break; break;
case StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1: case StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1:
...@@ -507,9 +507,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -507,9 +507,9 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H_OtherAxisBack: case StoreMoveStep.BOX_H_OtherAxisBack:
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1); StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
LogUtil.info(LOGGER, StoreName + "回原点：旋转轴运动到P1,上下轴到P1,压紧轴到P1！"); LogUtil.info(LOGGER, StoreName + "回原点：旋转轴运动到P1,上下轴到门口位置P7,压紧轴到P1！");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.GetDefaultUpDownP1(), Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_Door_P7, Config.UpDownAxis_P7_Speed);
ComMoveToPosition(Config.CompressAxis_P1_Position); ComMoveToPosition(Config.CompressAxis_P1_Position);
break; break;
case StoreMoveStep.BOX_H_MiddleAxisToP1: case StoreMoveStep.BOX_H_MiddleAxisToP1:
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -52,7 +52,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -52,7 +52,9 @@ namespace OnlineStore.DeviceLibrary
p.ComPress_P1 = Config.CompressAxis_P1_Position; p.ComPress_P1 = Config.CompressAxis_P1_Position;
p.InOut_P1 = Config.InOutAxis_P1_Position; p.InOut_P1 = Config.InOutAxis_P1_Position;
p.Middle_P1 = Config.MiddleAxis_P1_Position; p.Middle_P1 = Config.MiddleAxis_P1_Position;
p.UpDown_Door = Config.UpDownAxis_DoorPosition; p.UpDown_Door_P7 = Config.UpDownAxis_Door_P7;
p.UpDown_OutHigh_P2 = Config.UpDownAxis_OutHigh_P2;
p.UpDown_OutLow_P8 = Config.UpDownAxis_OutLow_P8;
p.InOut_P2 = position.InOutAxis_DoorPosition_P2; p.InOut_P2 = position.InOutAxis_DoorPosition_P2;
if (IsBatch) if (IsBatch)
{ {
...@@ -410,7 +412,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -410,7 +412,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog("入库：SI_21不需要入库，把料盘放在门口等待操作人员拿走料盘 "); InStoreLog("入库：SI_21不需要入库，把料盘放在门口等待操作人员拿走料盘 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor); StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor);
OpenDoorAndWait(); OpenDoorAndWait();
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door, Config.UpDownAxis_Door_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door_P7, Config.UpDownAxis_P7_Speed);
} }
else else
{ {
...@@ -661,6 +663,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -661,6 +663,11 @@ namespace OnlineStore.DeviceLibrary
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack) else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack)
{ {
if (KND.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
LogUtil.error("出库【"+posId+"】过程中叉子已从库位退出，未检测到叉子料盘信号 ");
}
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
SO_08_ToDoorPosition(); SO_08_ToDoorPosition();
...@@ -674,8 +681,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -674,8 +681,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up) else if (StoreMove.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up)
{ {
SO_08_ToDoorPosition(); SO_08_ToDoorPosition();
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_08_ToDoorPosition) else if (StoreMove.MoveStep == StoreMoveStep.SO_08_ToDoorPosition)
{ {
...@@ -700,7 +706,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -700,7 +706,9 @@ namespace OnlineStore.DeviceLibrary
if (StoreMove.IsBatchInOutStore) if (StoreMove.IsBatchInOutStore)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_11_PutTray); StoreMove.NextMoveStep(StoreMoveStep.SO_11_PutTray);
BatchAxisUpTrayHeight(); OutStoreLog("出库：SO_11_PutTray 放下料盘，升降轴下降到_OutLow_P8，压紧轴放松");
ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P3);
ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_OutLow_P8, Config.UpDownAxis_P8_Speed);
} }
else else
{ {
...@@ -750,10 +758,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -750,10 +758,7 @@ namespace OnlineStore.DeviceLibrary
//如果批量能未检测到料盘，需要把批量轴走到能检测到料盘的位置 //如果批量能未检测到料盘，需要把批量轴走到能检测到料盘的位置
if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW)) if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW))
{ {
StoreMove.TimeOutSeconds = 120; StoreMove.TimeOutSeconds = 120;
//ACServerManager.AbsMove(Config.Batch_Axis.DeviceName, Config.Batch_Axis.GetAxisValue(), Config.BatchAxis_P1, Config.BatchAxis_P1_Speed);
//StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(Config.Batch_Axis, Config.BatchAxis_P1, Config.BatchAxis_P1_Speed));
//Config.Batch_Axis.TargetPosition = Config.BatchAxis_P1;
ACAxisMove(Config.Batch_Axis, Config.BatchAxis_P1, Config.BatchAxis_P1_Speed); ACAxisMove(Config.Batch_Axis, Config.BatchAxis_P1, Config.BatchAxis_P1_Speed);
OutStoreLog("出库：SO_02 批量上下料轴走到P1点 "); OutStoreLog("出库：SO_02 批量上下料轴走到P1点 ");
} }
...@@ -771,7 +776,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -771,7 +776,7 @@ namespace OnlineStore.DeviceLibrary
//记录高度 //记录高度
AutomaticBaiting.BatchOutStoreCount++; AutomaticBaiting.BatchOutStoreCount++;
AutomaticBaiting.BatchOutStoreHeight += StoreMove.MoveParam.GetACPosition().BagHeight; AutomaticBaiting.BatchOutStoreHeight += StoreMove.MoveParam.GetACPosition().BagHeight;
OutStoreLog("出库：SO_13 升降轴返回，将物品放下，批量上下料轴下降【" + StoreMove.MoveParam.MoveP.BatchAxis_DownValue + "】，目标位置【" + targetValue + "】"); OutStoreLog(" 批量上下料轴下降【" + StoreMove.MoveParam.MoveP.BatchAxis_DownValue + "】，目标位置【" + targetValue + "】");
//判断盘满后，需要报警? //判断盘满后，需要报警?
if (targetValue <= 0) if (targetValue <= 0)
{ {
...@@ -803,18 +808,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -803,18 +808,16 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_08_ToDoorPosition); StoreMove.NextMoveStep(StoreMoveStep.SO_08_ToDoorPosition);
if (StoreMove.IsBatchInOutStore) if (StoreMove.IsBatchInOutStore)
{ {
OutStoreLog("出库：SO_08 走到吸盘下方，旋转轴至P1(待机点)升降轴至P1 "); OutStoreLog("出库：SO_08 升降轴到出料高点OutHigh_P2，旋转轴至P1(待机点) ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_OutHigh_P2, Config.UpDownAxis_P2_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
BatchAxisUpTrayHeight();
} }
else else
{ {
OutStoreLog("出库：SO_08 走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点) "); OutStoreLog("出库：SO_08 走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点) ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door, Config.UpDownAxis_Door_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door_P7, Config.UpDownAxis_P7_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
//此处需要等待box门口没有盘
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
} }
} }
private void SO_10_DeviceToDoorPro() private void SO_10_DeviceToDoorPro()
...@@ -823,8 +826,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -823,8 +826,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_10_DeviceToDoor); StoreMove.NextMoveStep(StoreMoveStep.SO_10_DeviceToDoor);
OutStoreLog("出库：SO_10 叉子进出料口，进出轴至P2(进料口取料点) "); OutStoreLog("出库：SO_10 叉子进出料口，进出轴至P2(进料口取料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
NeedCheckSafetyLight = 1; //NeedCheckSafetyLight = 1;
} }
#endregion #endregion
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -15,15 +15,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,15 +15,19 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 轴2（升降轴）门口位置，需要等待拿走料盘的位置 /// 轴2（升降轴）门口位置，需要等待拿走料盘的位置
/// </summary> /// </summary>
public int UpDown_Door { get; set; } public int UpDown_Door_P7 { get; set; }
/// <summary> /// <summary>
/// 轴2（ 升降轴） 进料口取料点 P1 /// 轴2（ 升降轴） 入库取料点 P1
/// </summary> /// </summary>
public int UpDown_P1 { get; set; } public int UpDown_P1 { get; set; }
///// <summary> /// <summary>
///// 轴2（ 升降轴） 进料口出料前点P2 /// 轴2（ 升降轴）升降轴 出库高点P2
///// </summary> /// </summary>
//public int UpDown_P2 { get; set; } public int UpDown_OutHigh_P2 { get; set; }
/// <summary>
/// 轴2（ 升降轴）升降轴 出库低点P8
/// </summary>
public int UpDown_OutLow_P8 { get; set; }
/// <summary> /// <summary>
/// 轴2（ 升降轴） 库位入料前点P3 /// 轴2（ 升降轴） 库位入料前点P3
/// </summary> /// </summary>
...@@ -44,10 +48,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -44,10 +48,7 @@ namespace OnlineStore.DeviceLibrary
///// 轴2（ 升降轴） 进料口取料缓冲点P7 ///// 轴2（ 升降轴） 进料口取料缓冲点P7
///// </summary> ///// </summary>
//public int UpDown_P7 { get; set; } //public int UpDown_P7 { get; set; }
///// <summary>
///// 轴2（ 升降轴） 进料口出料缓冲点P8
///// </summary>
//public int UpDown_P8 { get; set; }
/// <summary> /// <summary>
/// 轴1旋转轴 待机原位点 P1 /// 轴1旋转轴 待机原位点 P1
......
source/DeviceLibrary/store/StoreMoveStep.cs
...@@ -233,7 +233,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -233,7 +233,7 @@ namespace OnlineStore.DeviceLibrary
//SO_12_DeviceOutFromDoor = 112, //SO_12_DeviceOutFromDoor = 112,
/// <summary> /// <summary>
/// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点） /// 料仓出库，升降轴下降，压紧轴放松
/// </summary> /// </summary>
SO_11_PutTray = 111, SO_11_PutTray = 111,
/// <summary> /// <summary>
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
...@@ -159,11 +159,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -159,11 +159,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P1_Speed")] [ConfigProAttribute("UpDownAxis_P1_Speed")]
public int UpDownAxis_P1_Speed { get; set; } public int UpDownAxis_P1_Speed { get; set; }
///// <summary> /// <summary>
///// PRO 升降轴（轴2）P2速度 UpDownAxis_P2_Speed /// PRO 升降轴（轴2）P2速度 UpDownAxis_P2_Speed
///// </summary> /// </summary>
//[ConfigProAttribute("UpDownAxis_P2_Speed")] [ConfigProAttribute("UpDownAxis_P2_Speed")]
//public int UpDownAxis_P2_Speed { get; set; } public int UpDownAxis_P2_Speed { get; set; }
/// <summary> /// <summary>
/// PRO 升降轴（轴2）P3速度 UpDownAxis_P3_Speed /// PRO 升降轴（轴2）P3速度 UpDownAxis_P3_Speed
/// </summary> /// </summary>
...@@ -186,18 +186,18 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -186,18 +186,18 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_P6_Speed { get; set; } public int UpDownAxis_P6_Speed { get; set; }
///// <summary> /// <summary>
///// PRO 升降轴（轴2）P7速度 UpDownAxis_P7_Speed /// PRO 升降轴(轴二)到仓门P7速度 UpDownAxis_P7_Speed
///// </summary> /// </summary>
//[ConfigProAttribute("UpDownAxis_P7_Speed")] [ConfigProAttribute("UpDownAxis_P7_Speed")]
//public int UpDownAxis_P7_Speed { get; set; } public int UpDownAxis_P7_Speed { get; set; }
///// <summary> /// <summary>
///// PRO 升降轴（轴2）P8速度 UpDownAxis_P8_Speed /// PRO 升降轴（轴2）P8速度 UpDownAxis_P8_Speed
///// </summary> /// </summary>
//[ConfigProAttribute("UpDownAxis_P8_Speed")] [ConfigProAttribute("UpDownAxis_P8_Speed")]
//public int UpDownAxis_P8_Speed { get; set; } public int UpDownAxis_P8_Speed { get; set; }
/// <summary> /// <summary>
/// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed /// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed
...@@ -279,22 +279,33 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -279,22 +279,33 @@ namespace OnlineStore.LoadCSVLibrary
public int IOSingle_TimerOut { get; set; } public int IOSingle_TimerOut { get; set; }
/// <summary> /// <summary>
/// PRO 升降轴 待机点P1集合 UpDownAxis_P1_List 8#20000;12#22000 /// PRO 升降轴 入库P1点集合 UpDownAxis_P1_List 8#20000;12#22000
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P1_List")] [ConfigProAttribute("UpDownAxis_P1_List")]
public string UpDownAxis_P1_List { get; set; } public string UpDownAxis_P1_List { get; set; }
/// <summary> /// <summary>
/// PRO,升降轴 进料口位置, UpDownAxis_DoorPosition,403000,,,,,,, /// PRO 升降轴 出库高点 P2 UpDownAxis_OutHigh_P2
/// </summary>
[ConfigProAttribute("UpDownAxis_OutHigh_P2")]
public int UpDownAxis_OutHigh_P2 { get; set; }
/// <summary>
///PRO 升降轴 出库低点 P8 UpDownAxis_OutLow_P8
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_DoorPosition")] [ConfigProAttribute("UpDownAxis_OutLow_P8")]
public int UpDownAxis_DoorPosition { get; set; } public int UpDownAxis_OutLow_P8 { get; set; }
/// <summary> /// <summary>
/// 升降轴(轴二)到仓门速度 UpDownAxis_Door_Speed 2500 /// PRO,升降轴 进料口位置, UpDownAxis_Door_P7,403000,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_Door_Speed")] [ConfigProAttribute("UpDownAxis_Door_P7")]
public int UpDownAxis_Door_Speed { get; set; } public int UpDownAxis_Door_P7 { get; set; }
///// <summary>
///// 升降轴(轴二)到仓门速度 UpDownAxis_Door_Speed 2500
///// </summary>
//[ConfigProAttribute("UpDownAxis_Door_Speed")]
//public int UpDownAxis_Door_Speed { get; set; }
///// <summary> ///// <summary>
///// 升降轴 进料口取料点 P1 ///// 升降轴 进料口取料点 P1
///// </summary> ///// </summary>
...@@ -723,7 +734,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -723,7 +734,7 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.DoorClose_LoadMaterial); MustHaveDIList.Add(IO_Type.DoorClose_LoadMaterial);
MustHaveDIList.Add(IO_Type.Airpressure_Check); MustHaveDIList.Add(IO_Type.Airpressure_Check);
MustHaveDIList.Add(IO_Type.SuckingDisc_Air); MustHaveDIList.Add(IO_Type.SuckingDisc_Air);
MustHaveDIList.Add(IO_Type.DoorColse_Single); //MustHaveDIList.Add(IO_Type.DoorColse_Single);
MustHaveDOList.Add(IO_Type.AutoRun_HddLed); MustHaveDOList.Add(IO_Type.AutoRun_HddLed);
...@@ -794,7 +805,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -794,7 +805,7 @@ namespace OnlineStore.LoadCSVLibrary
Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1_Position; Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1_Position;
Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position; Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position;
Config.UpDown_Axis.DefaultPosition = Config.GetDefaultUpDownP1(); Config.UpDown_Axis.DefaultPosition = Config.UpDownAxis_Door_P7;
} }
} }
} }
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
...@@ -118,10 +118,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -118,10 +118,10 @@ namespace OnlineStore.LoadCSVLibrary
/// 吸盘压力确认信号 SuckingDisc_Air 202 192.168.200.11 0 吸盘压力确认信号 X19 DI-23 /// 吸盘压力确认信号 SuckingDisc_Air 202 192.168.200.11 0 吸盘压力确认信号 X19 DI-23
/// </summary> /// </summary>
public static string SuckingDisc_Air = "SuckingDisc_Air"; public static string SuckingDisc_Air = "SuckingDisc_Air";
/// <summary> ///// <summary>
/// 左侧门关闭 DoorColse_Single X20 DI-24 ///// 左侧门关闭 DoorColse_Single X20 DI-24
/// </summary> ///// </summary>
public static string DoorColse_Single = "DoorColse_Single"; //public static string DoorColse_Single = "DoorColse_Single";
/// <summary> /// <summary>
/// 吸盘气缸上升端 SuckingDisc_Up X07 DI-07 /// 吸盘气缸上升端 SuckingDisc_Up X07 DI-07
...@@ -180,7 +180,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -180,7 +180,7 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string SuckingDisc_Work = "SuckingDisc_Work"; public static string SuckingDisc_Work = "SuckingDisc_Work";
public static string TrayCheck_Door = "TrayCheck_Door"; //public static string TrayCheck_Door = "TrayCheck_Door";
//public static string TrayCheck_Door = "TrayCheck_Door"; //public static string TrayCheck_Door = "TrayCheck_Door";
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!