Skip to content

孙克 / RC1250-ACPackingStore

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

压紧轴压紧前点P3-压紧轴压紧点P2的差值，7寸盘和其他的分开配置。

1 个父辈 5453792d
内嵌 并排
正在显示 6 个修改的文件 包含 120 行增加 和 56 行删除
source/ACPackingStore/FrmBox.Designer.cs
...@@ -137,6 +137,8 @@ ...@@ -137,6 +137,8 @@
this.btnTempClose = new System.Windows.Forms.Button(); this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button(); this.btnTempInit = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.label5 = new System.Windows.Forms.Label();
this.txtCom7_P3_P2 = new System.Windows.Forms.TextBox();
this.groupShelf.SuspendLayout(); this.groupShelf.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
...@@ -169,9 +171,9 @@ ...@@ -169,9 +171,9 @@
this.groupShelf.Controls.Add(this.btnUpdownP102); this.groupShelf.Controls.Add(this.btnUpdownP102);
this.groupShelf.Controls.Add(this.cmbShelfPosition); this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false; this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(754, 18); this.groupShelf.Location = new System.Drawing.Point(738, 13);
this.groupShelf.Name = "groupShelf"; this.groupShelf.Name = "groupShelf";
this.groupShelf.Size = new System.Drawing.Size(226, 276); this.groupShelf.Size = new System.Drawing.Size(237, 282);
this.groupShelf.TabIndex = 274; this.groupShelf.TabIndex = 274;
this.groupShelf.TabStop = false; this.groupShelf.TabStop = false;
this.groupShelf.Text = "料架位置"; this.groupShelf.Text = "料架位置";
...@@ -181,7 +183,7 @@ ...@@ -181,7 +183,7 @@
this.btnSaveShelf.BackColor = System.Drawing.SystemColors.Control; this.btnSaveShelf.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveShelf.Location = new System.Drawing.Point(113, 229); this.btnSaveShelf.Location = new System.Drawing.Point(118, 229);
this.btnSaveShelf.Name = "btnSaveShelf"; this.btnSaveShelf.Name = "btnSaveShelf";
this.btnSaveShelf.Size = new System.Drawing.Size(105, 38); this.btnSaveShelf.Size = new System.Drawing.Size(105, 38);
this.btnSaveShelf.TabIndex = 282; this.btnSaveShelf.TabIndex = 282;
...@@ -195,7 +197,7 @@ ...@@ -195,7 +197,7 @@
this.label13.Cursor = System.Windows.Forms.Cursors.Default; this.label13.Cursor = System.Windows.Forms.Cursors.Default;
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.SystemColors.ControlText; this.label13.ForeColor = System.Drawing.SystemColors.ControlText;
this.label13.Location = new System.Drawing.Point(7, 33); this.label13.Location = new System.Drawing.Point(12, 33);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label13.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label13.Size = new System.Drawing.Size(59, 17); this.label13.Size = new System.Drawing.Size(59, 17);
...@@ -210,7 +212,7 @@ ...@@ -210,7 +212,7 @@
this.txtInoutP101.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInoutP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP101.Location = new System.Drawing.Point(129, 192); this.txtInoutP101.Location = new System.Drawing.Point(134, 192);
this.txtInoutP101.MaxLength = 0; this.txtInoutP101.MaxLength = 0;
this.txtInoutP101.Name = "txtInoutP101"; this.txtInoutP101.Name = "txtInoutP101";
this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -226,7 +228,7 @@ ...@@ -226,7 +228,7 @@
this.btnInoutP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInoutP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP101.ForeColor = System.Drawing.Color.Green; this.btnInoutP101.ForeColor = System.Drawing.Color.Green;
this.btnInoutP101.Location = new System.Drawing.Point(6, 187); this.btnInoutP101.Location = new System.Drawing.Point(11, 187);
this.btnInoutP101.Name = "btnInoutP101"; this.btnInoutP101.Name = "btnInoutP101";
this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP101.Size = new System.Drawing.Size(118, 33); this.btnInoutP101.Size = new System.Drawing.Size(118, 33);
...@@ -243,7 +245,7 @@ ...@@ -243,7 +245,7 @@
this.txtMP101.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMP101.Location = new System.Drawing.Point(129, 155); this.txtMP101.Location = new System.Drawing.Point(134, 155);
this.txtMP101.MaxLength = 0; this.txtMP101.MaxLength = 0;
this.txtMP101.Name = "txtMP101"; this.txtMP101.Name = "txtMP101";
this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -260,7 +262,7 @@ ...@@ -260,7 +262,7 @@
this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.Location = new System.Drawing.Point(6, 150); this.button5.Location = new System.Drawing.Point(11, 150);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button5.Size = new System.Drawing.Size(118, 33); this.button5.Size = new System.Drawing.Size(118, 33);
...@@ -277,7 +279,7 @@ ...@@ -277,7 +279,7 @@
this.txtUpdownP101.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP101.Location = new System.Drawing.Point(129, 79); this.txtUpdownP101.Location = new System.Drawing.Point(134, 79);
this.txtUpdownP101.MaxLength = 0; this.txtUpdownP101.MaxLength = 0;
this.txtUpdownP101.Name = "txtUpdownP101"; this.txtUpdownP101.Name = "txtUpdownP101";
this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -292,7 +294,7 @@ ...@@ -292,7 +294,7 @@
this.txtUpdownP102.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP102.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP102.Location = new System.Drawing.Point(129, 117); this.txtUpdownP102.Location = new System.Drawing.Point(134, 117);
this.txtUpdownP102.MaxLength = 0; this.txtUpdownP102.MaxLength = 0;
this.txtUpdownP102.Name = "txtUpdownP102"; this.txtUpdownP102.Name = "txtUpdownP102";
this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -308,7 +310,7 @@ ...@@ -308,7 +310,7 @@
this.btnUpdownP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP101.ForeColor = System.Drawing.Color.Red; this.btnUpdownP101.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP101.Location = new System.Drawing.Point(6, 74); this.btnUpdownP101.Location = new System.Drawing.Point(11, 74);
this.btnUpdownP101.Name = "btnUpdownP101"; this.btnUpdownP101.Name = "btnUpdownP101";
this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP101.Size = new System.Drawing.Size(118, 33); this.btnUpdownP101.Size = new System.Drawing.Size(118, 33);
...@@ -326,7 +328,7 @@ ...@@ -326,7 +328,7 @@
this.btnUpdownP102.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP102.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP102.ForeColor = System.Drawing.Color.Red; this.btnUpdownP102.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP102.Location = new System.Drawing.Point(6, 112); this.btnUpdownP102.Location = new System.Drawing.Point(11, 112);
this.btnUpdownP102.Name = "btnUpdownP102"; this.btnUpdownP102.Name = "btnUpdownP102";
this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP102.Size = new System.Drawing.Size(118, 33); this.btnUpdownP102.Size = new System.Drawing.Size(118, 33);
...@@ -341,7 +343,7 @@ ...@@ -341,7 +343,7 @@
this.cmbShelfPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbShelfPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbShelfPosition.FormattingEnabled = true; this.cmbShelfPosition.FormattingEnabled = true;
this.cmbShelfPosition.Location = new System.Drawing.Point(72, 27); this.cmbShelfPosition.Location = new System.Drawing.Point(77, 27);
this.cmbShelfPosition.Name = "cmbShelfPosition"; this.cmbShelfPosition.Name = "cmbShelfPosition";
this.cmbShelfPosition.Size = new System.Drawing.Size(146, 28); this.cmbShelfPosition.Size = new System.Drawing.Size(146, 28);
this.cmbShelfPosition.TabIndex = 272; this.cmbShelfPosition.TabIndex = 272;
...@@ -550,9 +552,9 @@ ...@@ -550,9 +552,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 127); this.groupInout.Location = new System.Drawing.Point(3, 127);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(1282, 353); this.groupInout.Size = new System.Drawing.Size(1291, 353);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -584,6 +586,8 @@ ...@@ -584,6 +586,8 @@
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtCom7_P3_P2);
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtComP3_P2); this.groupBox1.Controls.Add(this.txtComP3_P2);
this.groupBox1.Controls.Add(this.btnComP4); this.groupBox1.Controls.Add(this.btnComP4);
...@@ -600,9 +604,9 @@ ...@@ -600,9 +604,9 @@
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false; this.groupBox1.Enabled = false;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(986, 18); this.groupBox1.Location = new System.Drawing.Point(986, 13);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(283, 329); this.groupBox1.Size = new System.Drawing.Size(299, 335);
this.groupBox1.TabIndex = 1; this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置"; this.groupBox1.Text = "压紧轴位置配置";
...@@ -613,12 +617,12 @@ ...@@ -613,12 +617,12 @@
this.label2.Cursor = System.Windows.Forms.Cursors.Default; this.label2.Cursor = System.Windows.Forms.Cursors.Default;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Purple; this.label2.ForeColor = System.Drawing.Color.Purple;
this.label2.Location = new System.Drawing.Point(6, 113); this.label2.Location = new System.Drawing.Point(6, 107);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label2.Size = new System.Drawing.Size(171, 17); this.label2.Size = new System.Drawing.Size(193, 17);
this.label2.TabIndex = 263; this.label2.TabIndex = 263;
this.label2.Text = "压紧前点P3相对压紧点P2位置:"; this.label2.Text = "非七寸_压紧前点P3-压紧点P2差值:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtComP3_P2 // txtComP3_P2
...@@ -628,11 +632,11 @@ ...@@ -628,11 +632,11 @@
this.txtComP3_P2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP3_P2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3_P2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3_P2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3_P2.Location = new System.Drawing.Point(183, 109); this.txtComP3_P2.Location = new System.Drawing.Point(201, 104);
this.txtComP3_P2.MaxLength = 0; this.txtComP3_P2.MaxLength = 0;
this.txtComP3_P2.Name = "txtComP3_P2"; this.txtComP3_P2.Name = "txtComP3_P2";
this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3_P2.Size = new System.Drawing.Size(89, 23); this.txtComP3_P2.Size = new System.Drawing.Size(80, 23);
this.txtComP3_P2.TabIndex = 262; this.txtComP3_P2.TabIndex = 262;
this.txtComP3_P2.Text = "999"; this.txtComP3_P2.Text = "999";
// //
...@@ -644,10 +648,10 @@ ...@@ -644,10 +648,10 @@
this.btnComP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP4.ForeColor = System.Drawing.Color.Purple; this.btnComP4.ForeColor = System.Drawing.Color.Purple;
this.btnComP4.Location = new System.Drawing.Point(5, 26); this.btnComP4.Location = new System.Drawing.Point(17, 22);
this.btnComP4.Name = "btnComP4"; this.btnComP4.Name = "btnComP4";
this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP4.Size = new System.Drawing.Size(140, 33); this.btnComP4.Size = new System.Drawing.Size(133, 29);
this.btnComP4.TabIndex = 257; this.btnComP4.TabIndex = 257;
this.btnComP4.Text = "压紧轴目标压紧点P4:"; this.btnComP4.Text = "压紧轴目标压紧点P4:";
this.btnComP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -662,10 +666,10 @@ ...@@ -662,10 +666,10 @@
this.btnMaxP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMaxP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMaxP3.ForeColor = System.Drawing.Color.Purple; this.btnMaxP3.ForeColor = System.Drawing.Color.Purple;
this.btnMaxP3.Location = new System.Drawing.Point(5, 66); this.btnMaxP3.Location = new System.Drawing.Point(13, 63);
this.btnMaxP3.Name = "btnMaxP3"; this.btnMaxP3.Name = "btnMaxP3";
this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMaxP3.Size = new System.Drawing.Size(145, 33); this.btnMaxP3.Size = new System.Drawing.Size(145, 29);
this.btnMaxP3.TabIndex = 259; this.btnMaxP3.TabIndex = 259;
this.btnMaxP3.Text = "压紧轴最大压紧前点P3:"; this.btnMaxP3.Text = "压紧轴最大压紧前点P3:";
this.btnMaxP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMaxP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -679,7 +683,7 @@ ...@@ -679,7 +683,7 @@
this.txtComP4.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP4.Location = new System.Drawing.Point(183, 31); this.txtComP4.Location = new System.Drawing.Point(183, 27);
this.txtComP4.MaxLength = 0; this.txtComP4.MaxLength = 0;
this.txtComP4.Name = "txtComP4"; this.txtComP4.Name = "txtComP4";
this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -694,7 +698,7 @@ ...@@ -694,7 +698,7 @@
this.txtComMaxP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMaxP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMaxP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMaxP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMaxP3.Location = new System.Drawing.Point(183, 70); this.txtComMaxP3.Location = new System.Drawing.Point(183, 65);
this.txtComMaxP3.MaxLength = 0; this.txtComMaxP3.MaxLength = 0;
this.txtComMaxP3.Name = "txtComMaxP3"; this.txtComMaxP3.Name = "txtComMaxP3";
this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -707,7 +711,7 @@ ...@@ -707,7 +711,7 @@
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control; this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(80, 282); this.btnSaveCom.Location = new System.Drawing.Point(79, 289);
this.btnSaveCom.Name = "btnSaveCom"; this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38); this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256; this.btnSaveCom.TabIndex = 256;
...@@ -722,7 +726,7 @@ ...@@ -722,7 +726,7 @@
this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(194, 194); this.txtComMax.Location = new System.Drawing.Point(194, 219);
this.txtComMax.MaxLength = 12; this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax"; this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -736,7 +740,7 @@ ...@@ -736,7 +740,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default; this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText; this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(179, 197); this.label47.Location = new System.Drawing.Point(179, 222);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17); this.label47.Size = new System.Drawing.Size(13, 17);
...@@ -750,7 +754,7 @@ ...@@ -750,7 +754,7 @@
this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(95, 194); this.txtComMin.Location = new System.Drawing.Point(95, 219);
this.txtComMin.MaxLength = 12; this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin"; this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -764,7 +768,7 @@ ...@@ -764,7 +768,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default; this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText; this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(10, 197); this.label48.Location = new System.Drawing.Point(10, 222);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17); this.label48.Size = new System.Drawing.Size(83, 17);
...@@ -781,7 +785,7 @@ ...@@ -781,7 +785,7 @@
this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCMove.ForeColor = System.Drawing.Color.Purple; this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(79, 233); this.btnCMove.Location = new System.Drawing.Point(79, 250);
this.btnCMove.Name = "btnCMove"; this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(197, 33); this.btnCMove.Size = new System.Drawing.Size(197, 33);
...@@ -796,7 +800,7 @@ ...@@ -796,7 +800,7 @@
this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true; this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(80, 147); this.cmbPlateH.Location = new System.Drawing.Point(80, 180);
this.cmbPlateH.Name = "cmbPlateH"; this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(197, 28); this.cmbPlateH.Size = new System.Drawing.Size(197, 28);
this.cmbPlateH.TabIndex = 176; this.cmbPlateH.TabIndex = 176;
...@@ -808,7 +812,7 @@ ...@@ -808,7 +812,7 @@
this.label1.Cursor = System.Windows.Forms.Cursors.Default; this.label1.Cursor = System.Windows.Forms.Cursors.Default;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.SystemColors.ControlText; this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(14, 153); this.label1.Location = new System.Drawing.Point(14, 186);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(62, 17); this.label1.Size = new System.Drawing.Size(62, 17);
...@@ -823,7 +827,7 @@ ...@@ -823,7 +827,7 @@
this.txtUpdownP12.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP12.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP12.Location = new System.Drawing.Point(891, 313); this.txtUpdownP12.Location = new System.Drawing.Point(886, 313);
this.txtUpdownP12.MaxLength = 0; this.txtUpdownP12.MaxLength = 0;
this.txtUpdownP12.Name = "txtUpdownP12"; this.txtUpdownP12.Name = "txtUpdownP12";
this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1807,6 +1811,35 @@ ...@@ -1807,6 +1811,35 @@
this.axisMoveControl1.Size = new System.Drawing.Size(547, 449); this.axisMoveControl1.Size = new System.Drawing.Size(547, 449);
this.axisMoveControl1.TabIndex = 0; this.axisMoveControl1.TabIndex = 0;
// //
// label5
//
this.label5.AutoSize = true;
this.label5.Cursor = System.Windows.Forms.Cursors.Default;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.Purple;
this.label5.Location = new System.Drawing.Point(6, 141);
this.label5.Name = "label5";
this.label5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label5.Size = new System.Drawing.Size(193, 17);
this.label5.TabIndex = 265;
this.label5.Text = "七寸盘_压紧前点P3-压紧点P2差值:";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtCom7_P3_P2
//
this.txtCom7_P3_P2.AcceptsReturn = true;
this.txtCom7_P3_P2.BackColor = System.Drawing.SystemColors.Window;
this.txtCom7_P3_P2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtCom7_P3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCom7_P3_P2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtCom7_P3_P2.Location = new System.Drawing.Point(201, 138);
this.txtCom7_P3_P2.MaxLength = 0;
this.txtCom7_P3_P2.Name = "txtCom7_P3_P2";
this.txtCom7_P3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtCom7_P3_P2.Size = new System.Drawing.Size(80, 23);
this.txtCom7_P3_P2.TabIndex = 264;
this.txtCom7_P3_P2.Text = "999";
//
// FrmBox // FrmBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -1957,6 +1990,8 @@ ...@@ -1957,6 +1990,8 @@
private System.Windows.Forms.NumericUpDown numericUpDown1; private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.Button btnUPosId; private System.Windows.Forms.Button btnUPosId;
private System.Windows.Forms.Label lblMoveInfo; private System.Windows.Forms.Label lblMoveInfo;
public System.Windows.Forms.Label label5;
public System.Windows.Forms.TextBox txtCom7_P3_P2;
} }
} }
source/ACPackingStore/FrmBox.cs
...@@ -75,6 +75,7 @@ namespace OnlineStore.ACPackingStore ...@@ -75,6 +75,7 @@ namespace OnlineStore.ACPackingStore
txtComP4.Text = BoxBean.Config.CompAxis_P4_Position.ToString(); txtComP4.Text = BoxBean.Config.CompAxis_P4_Position.ToString();
txtComMaxP3.Text = BoxBean.Config.CompAxis_Max_P3.ToString(); txtComMaxP3.Text = BoxBean.Config.CompAxis_Max_P3.ToString();
txtComP3_P2.Text = BoxBean.Config.CompAxis_P3_P2_Value.ToString(); txtComP3_P2.Text = BoxBean.Config.CompAxis_P3_P2_Value.ToString();
txtCom7_P3_P2.Text = BoxBean.Config.CompAxis7_P3_P2_Value.ToString();
if (shelrfP != null) if (shelrfP != null)
{ {
txtInoutP101.Text = shelrfP.InoutAxis_P101.ToString(); txtInoutP101.Text = shelrfP.InoutAxis_P101.ToString();
...@@ -327,7 +328,7 @@ namespace OnlineStore.ACPackingStore ...@@ -327,7 +328,7 @@ namespace OnlineStore.ACPackingStore
int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh).TargetComP2(); int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh).TargetComP2();
txtComP2.Text = comP2.ToString(); txtComP2.Text = comP2.ToString();
txtComP3.Text = (comP2 + BoxBean.Config.CompAxis_P3_P2_Value).ToString(); txtComP3.Text = (comP2 + BoxBean.Config.GetCom_P3_P2(acPosition.BagWidth)).ToString();
btnComP2.Text = "" + acPosition.BagHigh + "mm压紧点P2:"; btnComP2.Text = "" + acPosition.BagHigh + "mm压紧点P2:";
btnComP3.Text = "" + acPosition.BagHigh + "mm压紧前点P3:"; btnComP3.Text = "" + acPosition.BagHigh + "mm压紧前点P3:";
lblSize.Text = "尺寸：" + acPosition.BagWidth + "*" + acPosition.BagHigh; lblSize.Text = "尺寸：" + acPosition.BagWidth + "*" + acPosition.BagHigh;
...@@ -893,24 +894,26 @@ namespace OnlineStore.ACPackingStore ...@@ -893,24 +894,26 @@ namespace OnlineStore.ACPackingStore
int minValue = FormUtil.GetIntValue(txtComMin); int minValue = FormUtil.GetIntValue(txtComMin);
int maxValue = FormUtil.GetIntValue(txtComMax); int maxValue = FormUtil.GetIntValue(txtComMax);
ComP2Info p2Info = new ComP2Info(height, minValue, maxValue); ComP2Info p2Info = new ComP2Info(height, minValue, maxValue);
if (minValue >BoxBean.Config. CompAxis_P1_Position && maxValue > BoxBean.Config.CompAxis_P1_Position) if (minValue > BoxBean.Config.CompAxis_P1_Position && maxValue > BoxBean.Config.CompAxis_P1_Position)
{ {
} }
else else
{ {
MessageBox.Show("保存失败："+ " 盘高【" + height + "】范围【" + minValue + "~" + maxValue + "】无效，压紧点需大于待机点【" + BoxBean.Config.CompAxis_P1_Position + "】"); MessageBox.Show("保存失败：" + " 盘高【" + height + "】范围【" + minValue + "~" + maxValue + "】无效，压紧点需大于待机点【" + BoxBean.Config.CompAxis_P1_Position + "】");
return; return;
} }
BoxBean.Config.UpdateComP2(height, p2Info); BoxBean.Config.UpdateComP2(height, p2Info);
BoxBean.Config.CompAxis_P4_Position = FormUtil.GetIntValue(txtComP4); BoxBean.Config.CompAxis_P4_Position = FormUtil.GetIntValue(txtComP4);
BoxBean.Config.CompAxis_Max_P3 = FormUtil.GetIntValue(txtComMaxP3); BoxBean.Config.CompAxis_Max_P3 = FormUtil.GetIntValue(txtComMaxP3);
BoxBean.Config.CompAxis_P3_P2_Value = FormUtil.GetIntValue(txtComP3_P2); BoxBean.Config.CompAxis_P3_P2_Value = FormUtil.GetIntValue(txtComP3_P2);
BoxBean.Config.CompAxis7_P3_P2_Value = FormUtil.GetIntValue(txtCom7_P3_P2);
if (StoreManager.UpdateBoxConfig(BoxBean.Config)) if (StoreManager.UpdateBoxConfig(BoxBean.Config))
{ {
LogUtil.info(BoxBean.Name + "更新ComP2【 " + BoxBean.Config.CompAxis_P2_List+ "】CompAxis_P4_Position【"+ LogUtil.info(BoxBean.Name + "更新ComP2【 " + BoxBean.Config.CompAxis_P2_List + "】CompAxis_P4_Position【" +
BoxBean.Config. CompAxis_P4_Position + "】CompAxis_Max_P3【"+BoxBean.Config.CompAxis_Max_P3 + "】CompAxis_P3_P2_Value【"+ BoxBean.Config.CompAxis_P3_P2_Value + "】"); BoxBean.Config.CompAxis_P4_Position + "】CompAxis_Max_P3【" + BoxBean.Config.CompAxis_Max_P3 + "】CompAxis_P3_P2_Value【" +
BoxBean.Config.CompAxis_P3_P2_Value + "】CompAxis7_P3_P2_Value【" + BoxBean.Config.CompAxis7_P3_P2_Value + "】");
} }
else else
{ {
......
source/DeviceLibrary/ACPackingStore/StoreManager.cs
...@@ -201,6 +201,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -201,6 +201,14 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(box.Name + "GetPositon[" + param.ShelfPosID + "]=null,没有库位不能执行出入库"); LogUtil.error(box.Name + "GetPositon[" + param.ShelfPosID + "]=null,没有库位不能执行出入库");
return false; return false;
} }
if (String.IsNullOrEmpty(param.PlateH))
{
param.PlateH = position.BagHigh.ToString();
}
if (string.IsNullOrEmpty(param.PlateW))
{
param.PlateW = position.BagWidth.ToString();
}
if (sp != null) if (sp != null)
{ {
p.InOut_P101 = sp.InoutAxis_P101; p.InOut_P101 = sp.InoutAxis_P101;
...@@ -225,7 +233,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -225,7 +233,7 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P12 = box.Config.UpDownAxis_P12; p.UpDown_P12 = box.Config.UpDownAxis_P12;
p.ComPress_P2 = box.Config.GetComP2(position.BagHigh).TargetComP2(); p.ComPress_P2 = box.Config.GetComP2(position.BagHigh).TargetComP2();
p.ComPress_P3 = p.ComPress_P2 + box.Config.CompAxis_P3_P2_Value; p.ComPress_P3 = p.ComPress_P2 + box.Config.GetCom_P3_P2(param.PlateW);
p.InOut_P3 = position.InoutAxis_P3; p.InOut_P3 = position.InoutAxis_P3;
p.Middle_P2 = position.MiddleAxis_P2; p.Middle_P2 = position.MiddleAxis_P2;
p.UpDown_P3 = position.UpdownAxis_IH_P3; p.UpDown_P3 = position.UpdownAxis_IH_P3;
...@@ -234,14 +242,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -234,14 +242,7 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P6 = position.UpdownAxis_OL_P6; p.UpDown_P6 = position.UpdownAxis_OL_P6;
param.MoveP = p; param.MoveP = p;
if (String.IsNullOrEmpty(param.PlateH))
{
param.PlateH = position.BagHigh.ToString();
}
if (string.IsNullOrEmpty(param.PlateW))
{
param.PlateW = position.BagWidth.ToString();
}
return true; return true;
} }
return true; return true;
......
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
...@@ -58,7 +58,8 @@ PRO,进出轴（轴3）P1待机点,InOutAxis_P1_Position,1000,,,,,,, ...@@ -58,7 +58,8 @@ PRO,进出轴（轴3）P1待机点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴（轴4）P1待机点,CompAxis_P1_Position,140000,,,,,,, PRO,压紧轴（轴4）P1待机点,CompAxis_P1_Position,140000,,,,,,,
PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,, PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,,
PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,315000,,,,,,, PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,315000,,,,,,,
PRO,压紧轴（轴4）取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-90000,,,,,,, PRO,压紧轴（轴4）非七寸盘压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-90000,,,,,,,
PRO,压紧轴（轴4）七寸盘压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
PRO,压紧轴（轴4）压紧确认信号收到之后下降的位置,CompAxis_Down_Position,77500,,,,,,, PRO,压紧轴（轴4）压紧确认信号收到之后下降的位置,CompAxis_Down_Position,77500,,,,,,,
PRO,压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#）,CompAxis_P2_List,8=385001;424000#12=383001;385000#16=379001;383000#24=360001;368000#32=315001;330000#48=200000;231560#20=368001;379000#28=330001;360000#36=298001;315000#40=256101;298000#44=231561;256100#,,,,,,, PRO,压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#）,CompAxis_P2_List,8=385001;424000#12=383001;385000#16=379001;383000#24=360001;368000#32=315001;330000#48=200000;231560#20=368001;379000#28=330001;360000#36=298001;315000#40=256101;298000#44=231561;256100#,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
......
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
...@@ -57,7 +57,8 @@ PRO,进出轴（轴3）P1待机点,InOutAxis_P1_Position,1000,,,,,,, ...@@ -57,7 +57,8 @@ PRO,进出轴（轴3）P1待机点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴（轴4）P1待机点,CompAxis_P1_Position,140000,,,,,,, PRO,压紧轴（轴4）P1待机点,CompAxis_P1_Position,140000,,,,,,,
PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,, PRO,压紧轴（轴4）P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,,
PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,317000,,,,,,, PRO,压紧轴（轴4）P4目标压紧点,CompAxis_P4_Position,317000,,,,,,,
PRO,压紧轴（轴4）取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-100000,,,,,,, PRO,压紧轴（轴4）非七寸盘压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-100000,,,,,,,
PRO,压紧轴（轴4）七寸盘压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
PRO,压紧轴（轴4）压紧确认信号收到之后下降的位置,CompAxis_Down_Position,81000,,,,,,, PRO,压紧轴（轴4）压紧确认信号收到之后下降的位置,CompAxis_Down_Position,81000,,,,,,,
PRO,压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#）,CompAxis_P2_List,8=419201;421200#12=384501;419200#16=379501;384500#24=358001;366000#32=308001;318000#48=200000;234000#44=234001;274000#40=274001;287500#36=287501;308000#28=318001;358000#20=366001;379500#,,,,,,, PRO,压紧轴（轴4）P2压紧点范围对应值（8=1000;2000#）,CompAxis_P2_List,8=419201;421200#12=384501;419200#16=379501;384500#24=358001;366000#32=308001;318000#48=200000;234000#44=234001;274000#40=274001;287500#36=287501;308000#28=318001;358000#20=366001;379500#,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
......
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
...@@ -516,12 +516,35 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -516,12 +516,35 @@ namespace OnlineStore.LoadCSVLibrary
private List<string> CameraList = null; private List<string> CameraList = null;
/// <summary> /// <summary>
/// PRO,压紧轴（轴4）取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,, /// PRO,压紧轴（轴4）非七寸取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,,
/// /// </summary> /// /// </summary>
[ConfigProAttribute("CompAxis_P3_P2_Value")] [ConfigProAttribute("CompAxis_P3_P2_Value")]
public int CompAxis_P3_P2_Value { get; set; } public int CompAxis_P3_P2_Value { get; set; }
/// <summary> /// <summary>
/// PRO,压紧轴（轴4）七寸盘取料时的压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
/// </summary>
[ConfigProAttribute("CompAxis7_P3_P2_Value")]
public int CompAxis7_P3_P2_Value { get; set; }
public int GetCom_P3_P2(int width = 13)
{
if (width.Equals(7))
{
return CompAxis7_P3_P2_Value;
}
return CompAxis_P3_P2_Value;
}
public int GetCom_P3_P2(string width = "13")
{
if (width.Equals("7"))
{
return CompAxis7_P3_P2_Value;
}
return CompAxis_P3_P2_Value;
}
/// <summary>
/// PRO 压紧轴（轴4）P2压紧点范围对应值 CompAxis_P2_List 8 = 1000; 2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000# /// PRO 压紧轴（轴4）P2压紧点范围对应值 CompAxis_P2_List 8 = 1000; 2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000#
/// </summary> /// </summary>
[ConfigProAttribute("CompAxis_P2_List")] [ConfigProAttribute("CompAxis_P2_List")]
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!