Commit 22533e32 LN

扫码按钮修改

1 个父辈 3f22a0a2
...@@ -53,6 +53,21 @@ ...@@ -53,6 +53,21 @@
this.groupInout = new System.Windows.Forms.GroupBox(); this.groupInout = new System.Windows.Forms.GroupBox();
this.lblSize = new System.Windows.Forms.Label(); this.lblSize = new System.Windows.Forms.Label();
this.txtUpdownP11 = new System.Windows.Forms.TextBox(); this.txtUpdownP11 = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label();
this.txtComP3_P2 = new System.Windows.Forms.TextBox();
this.btnComP4 = new System.Windows.Forms.Button();
this.btnMaxP3 = new System.Windows.Forms.Button();
this.txtComP4 = new System.Windows.Forms.TextBox();
this.txtComMaxP3 = new System.Windows.Forms.TextBox();
this.btnSaveCom = new System.Windows.Forms.Button();
this.txtComMax = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label();
this.txtComMin = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
this.btnCMove = new System.Windows.Forms.Button();
this.cmbPlateH = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.txtUpdownP12 = new System.Windows.Forms.TextBox(); this.txtUpdownP12 = new System.Windows.Forms.TextBox();
this.txtInoutP11 = new System.Windows.Forms.TextBox(); this.txtInoutP11 = new System.Windows.Forms.TextBox();
this.btnInoutP11 = new System.Windows.Forms.Button(); this.btnInoutP11 = new System.Windows.Forms.Button();
...@@ -96,22 +111,8 @@ ...@@ -96,22 +111,8 @@
this.btnUpDownP6 = new System.Windows.Forms.Button(); this.btnUpDownP6 = new System.Windows.Forms.Button();
this.btnUpDownP3 = new System.Windows.Forms.Button(); this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button(); this.btnUpDownP4 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label();
this.txtComP3_P2 = new System.Windows.Forms.TextBox();
this.btnComP4 = new System.Windows.Forms.Button();
this.btnMaxP3 = new System.Windows.Forms.Button();
this.txtComP4 = new System.Windows.Forms.TextBox();
this.txtComMaxP3 = new System.Windows.Forms.TextBox();
this.btnSaveCom = new System.Windows.Forms.Button();
this.txtComMax = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label();
this.txtComMin = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
this.btnCMove = new System.Windows.Forms.Button();
this.cmbPlateH = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblTemp = new System.Windows.Forms.Label(); this.lblTemp = new System.Windows.Forms.Label();
this.lblMoveEquipInfo = new System.Windows.Forms.Label(); this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
...@@ -136,7 +137,6 @@ ...@@ -136,7 +137,6 @@
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.lblMoveInfo = new System.Windows.Forms.Label();
this.groupShelf.SuspendLayout(); this.groupShelf.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
this.btnInoutP101.Text = "进出轴位置P101:"; this.btnInoutP101.Text = "进出轴位置P101:";
this.btnInoutP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInoutP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP101.UseVisualStyleBackColor = false; this.btnInoutP101.UseVisualStyleBackColor = false;
this.btnInoutP101.Click += new System.EventHandler(this.btnInoutP101_Click);
// //
// txtMP101 // txtMP101
// //
...@@ -267,6 +268,7 @@ ...@@ -267,6 +268,7 @@
this.button5.Text = "旋转轴位置P101:"; this.button5.Text = "旋转轴位置P101:";
this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.UseVisualStyleBackColor = false; this.button5.UseVisualStyleBackColor = false;
this.button5.Click += new System.EventHandler(this.button5_Click);
// //
// txtUpdownP101 // txtUpdownP101
// //
...@@ -314,6 +316,7 @@ ...@@ -314,6 +316,7 @@
this.btnUpdownP101.Text = "升降轴低点P101:"; this.btnUpdownP101.Text = "升降轴低点P101:";
this.btnUpdownP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP101.UseVisualStyleBackColor = false; this.btnUpdownP101.UseVisualStyleBackColor = false;
this.btnUpdownP101.Click += new System.EventHandler(this.btnUpdownP101_Click);
// //
// btnUpdownP102 // btnUpdownP102
// //
...@@ -331,6 +334,7 @@ ...@@ -331,6 +334,7 @@
this.btnUpdownP102.Text = "升降轴高点P102:"; this.btnUpdownP102.Text = "升降轴高点P102:";
this.btnUpdownP102.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP102.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP102.UseVisualStyleBackColor = false; this.btnUpdownP102.UseVisualStyleBackColor = false;
this.btnUpdownP102.Click += new System.EventHandler(this.btnUpdownP102_Click);
// //
// cmbShelfPosition // cmbShelfPosition
// //
...@@ -578,6 +582,240 @@ ...@@ -578,6 +582,240 @@
this.txtUpdownP11.TabIndex = 227; this.txtUpdownP11.TabIndex = 227;
this.txtUpdownP11.Text = "999"; this.txtUpdownP11.Text = "999";
// //
// groupBox1
//
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtComP3_P2);
this.groupBox1.Controls.Add(this.btnComP4);
this.groupBox1.Controls.Add(this.btnMaxP3);
this.groupBox1.Controls.Add(this.txtComP4);
this.groupBox1.Controls.Add(this.txtComMaxP3);
this.groupBox1.Controls.Add(this.btnSaveCom);
this.groupBox1.Controls.Add(this.txtComMax);
this.groupBox1.Controls.Add(this.label47);
this.groupBox1.Controls.Add(this.txtComMin);
this.groupBox1.Controls.Add(this.label48);
this.groupBox1.Controls.Add(this.btnCMove);
this.groupBox1.Controls.Add(this.cmbPlateH);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false;
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.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(283, 329);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置";
//
// label2
//
this.label2.AutoSize = true;
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.ForeColor = System.Drawing.Color.Purple;
this.label2.Location = new System.Drawing.Point(6, 113);
this.label2.Name = "label2";
this.label2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label2.Size = new System.Drawing.Size(171, 17);
this.label2.TabIndex = 263;
this.label2.Text = "压紧前点P3相对压紧点P2位置:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtComP3_P2
//
this.txtComP3_P2.AcceptsReturn = true;
this.txtComP3_P2.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3_P2.Location = new System.Drawing.Point(183, 109);
this.txtComP3_P2.MaxLength = 0;
this.txtComP3_P2.Name = "txtComP3_P2";
this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3_P2.Size = new System.Drawing.Size(89, 23);
this.txtComP3_P2.TabIndex = 262;
this.txtComP3_P2.Text = "999";
//
// btnComP4
//
this.btnComP4.AutoSize = true;
this.btnComP4.BackColor = System.Drawing.SystemColors.Control;
this.btnComP4.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.Color.Purple;
this.btnComP4.Location = new System.Drawing.Point(5, 26);
this.btnComP4.Name = "btnComP4";
this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP4.Size = new System.Drawing.Size(140, 33);
this.btnComP4.TabIndex = 257;
this.btnComP4.Text = "压紧轴目标压紧点P4:";
this.btnComP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP4.UseVisualStyleBackColor = false;
this.btnComP4.Click += new System.EventHandler(this.btnComP4_Click);
//
// btnMaxP3
//
this.btnMaxP3.AutoSize = true;
this.btnMaxP3.BackColor = System.Drawing.SystemColors.Control;
this.btnMaxP3.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.Color.Purple;
this.btnMaxP3.Location = new System.Drawing.Point(5, 66);
this.btnMaxP3.Name = "btnMaxP3";
this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMaxP3.Size = new System.Drawing.Size(145, 33);
this.btnMaxP3.TabIndex = 259;
this.btnMaxP3.Text = "压紧轴最大压紧前点P3:";
this.btnMaxP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMaxP3.UseVisualStyleBackColor = false;
this.btnMaxP3.Click += new System.EventHandler(this.btnMaxP3_Click);
//
// txtComP4
//
this.txtComP4.AcceptsReturn = true;
this.txtComP4.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP4.Location = new System.Drawing.Point(183, 31);
this.txtComP4.MaxLength = 0;
this.txtComP4.Name = "txtComP4";
this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP4.Size = new System.Drawing.Size(89, 23);
this.txtComP4.TabIndex = 258;
this.txtComP4.Text = "999";
//
// txtComMaxP3
//
this.txtComMaxP3.AcceptsReturn = true;
this.txtComMaxP3.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMaxP3.Location = new System.Drawing.Point(183, 70);
this.txtComMaxP3.MaxLength = 0;
this.txtComMaxP3.Name = "txtComMaxP3";
this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMaxP3.Size = new System.Drawing.Size(89, 23);
this.txtComMaxP3.TabIndex = 260;
this.txtComMaxP3.Text = "999";
//
// btnSaveCom
//
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
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.Location = new System.Drawing.Point(80, 282);
this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256;
this.btnSaveCom.Text = "保存位置";
this.btnSaveCom.UseVisualStyleBackColor = false;
this.btnSaveCom.Click += new System.EventHandler(this.btnSaveCom_Click);
//
// txtComMax
//
this.txtComMax.AcceptsReturn = true;
this.txtComMax.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(194, 194);
this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMax.Size = new System.Drawing.Size(82, 23);
this.txtComMax.TabIndex = 255;
this.txtComMax.Text = "1000";
//
// label47
//
this.label47.AutoSize = true;
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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(179, 197);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17);
this.label47.TabIndex = 254;
this.label47.Text = "-";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtComMin
//
this.txtComMin.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(95, 194);
this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMin.Size = new System.Drawing.Size(82, 23);
this.txtComMin.TabIndex = 253;
this.txtComMin.Text = "1000";
//
// label48
//
this.label48.AutoSize = true;
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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(10, 197);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17);
this.label48.TabIndex = 252;
this.label48.Text = "压紧位置范围:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCMove
//
this.btnCMove.AutoSize = true;
this.btnCMove.BackColor = System.Drawing.SystemColors.Control;
this.btnCMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnCMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(79, 233);
this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(197, 33);
this.btnCMove.TabIndex = 215;
this.btnCMove.Text = "移动至压紧点P2:";
this.btnCMove.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.UseVisualStyleBackColor = false;
this.btnCMove.Click += new System.EventHandler(this.btnCMove_Click);
//
// cmbPlateH
//
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.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(80, 147);
this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(197, 28);
this.cmbPlateH.TabIndex = 176;
this.cmbPlateH.SelectedIndexChanged += new System.EventHandler(this.cmbPlateH_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(14, 153);
this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(62, 17);
this.label1.TabIndex = 175;
this.label1.Text = "盘高/mm:";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtUpdownP12 // txtUpdownP12
// //
this.txtUpdownP12.AcceptsReturn = true; this.txtUpdownP12.AcceptsReturn = true;
...@@ -1259,240 +1497,6 @@ ...@@ -1259,240 +1497,6 @@
this.btnUpDownP4.UseVisualStyleBackColor = false; this.btnUpDownP4.UseVisualStyleBackColor = false;
this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click); this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
// //
// groupBox1
//
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtComP3_P2);
this.groupBox1.Controls.Add(this.btnComP4);
this.groupBox1.Controls.Add(this.btnMaxP3);
this.groupBox1.Controls.Add(this.txtComP4);
this.groupBox1.Controls.Add(this.txtComMaxP3);
this.groupBox1.Controls.Add(this.btnSaveCom);
this.groupBox1.Controls.Add(this.txtComMax);
this.groupBox1.Controls.Add(this.label47);
this.groupBox1.Controls.Add(this.txtComMin);
this.groupBox1.Controls.Add(this.label48);
this.groupBox1.Controls.Add(this.btnCMove);
this.groupBox1.Controls.Add(this.cmbPlateH);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false;
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.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(283, 329);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置";
//
// label2
//
this.label2.AutoSize = true;
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.ForeColor = System.Drawing.Color.Purple;
this.label2.Location = new System.Drawing.Point(6, 113);
this.label2.Name = "label2";
this.label2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label2.Size = new System.Drawing.Size(171, 17);
this.label2.TabIndex = 263;
this.label2.Text = "压紧前点P3相对压紧点P2位置:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtComP3_P2
//
this.txtComP3_P2.AcceptsReturn = true;
this.txtComP3_P2.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3_P2.Location = new System.Drawing.Point(183, 109);
this.txtComP3_P2.MaxLength = 0;
this.txtComP3_P2.Name = "txtComP3_P2";
this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3_P2.Size = new System.Drawing.Size(89, 23);
this.txtComP3_P2.TabIndex = 262;
this.txtComP3_P2.Text = "999";
//
// btnComP4
//
this.btnComP4.AutoSize = true;
this.btnComP4.BackColor = System.Drawing.SystemColors.Control;
this.btnComP4.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.Color.Purple;
this.btnComP4.Location = new System.Drawing.Point(5, 26);
this.btnComP4.Name = "btnComP4";
this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP4.Size = new System.Drawing.Size(140, 33);
this.btnComP4.TabIndex = 257;
this.btnComP4.Text = "压紧轴目标压紧点P4:";
this.btnComP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP4.UseVisualStyleBackColor = false;
this.btnComP4.Click += new System.EventHandler(this.btnComP4_Click);
//
// btnMaxP3
//
this.btnMaxP3.AutoSize = true;
this.btnMaxP3.BackColor = System.Drawing.SystemColors.Control;
this.btnMaxP3.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.Color.Purple;
this.btnMaxP3.Location = new System.Drawing.Point(5, 66);
this.btnMaxP3.Name = "btnMaxP3";
this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMaxP3.Size = new System.Drawing.Size(145, 33);
this.btnMaxP3.TabIndex = 259;
this.btnMaxP3.Text = "压紧轴最大压紧前点P3:";
this.btnMaxP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMaxP3.UseVisualStyleBackColor = false;
this.btnMaxP3.Click += new System.EventHandler(this.btnMaxP3_Click);
//
// txtComP4
//
this.txtComP4.AcceptsReturn = true;
this.txtComP4.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP4.Location = new System.Drawing.Point(183, 31);
this.txtComP4.MaxLength = 0;
this.txtComP4.Name = "txtComP4";
this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP4.Size = new System.Drawing.Size(89, 23);
this.txtComP4.TabIndex = 258;
this.txtComP4.Text = "999";
//
// txtComMaxP3
//
this.txtComMaxP3.AcceptsReturn = true;
this.txtComMaxP3.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMaxP3.Location = new System.Drawing.Point(183, 70);
this.txtComMaxP3.MaxLength = 0;
this.txtComMaxP3.Name = "txtComMaxP3";
this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMaxP3.Size = new System.Drawing.Size(89, 23);
this.txtComMaxP3.TabIndex = 260;
this.txtComMaxP3.Text = "999";
//
// btnSaveCom
//
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
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.Location = new System.Drawing.Point(80, 282);
this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256;
this.btnSaveCom.Text = "保存位置";
this.btnSaveCom.UseVisualStyleBackColor = false;
this.btnSaveCom.Click += new System.EventHandler(this.btnSaveCom_Click);
//
// txtComMax
//
this.txtComMax.AcceptsReturn = true;
this.txtComMax.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(194, 194);
this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMax.Size = new System.Drawing.Size(82, 23);
this.txtComMax.TabIndex = 255;
this.txtComMax.Text = "1000";
//
// label47
//
this.label47.AutoSize = true;
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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(179, 197);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17);
this.label47.TabIndex = 254;
this.label47.Text = "-";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtComMin
//
this.txtComMin.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(95, 194);
this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComMin.Size = new System.Drawing.Size(82, 23);
this.txtComMin.TabIndex = 253;
this.txtComMin.Text = "1000";
//
// label48
//
this.label48.AutoSize = true;
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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(10, 197);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17);
this.label48.TabIndex = 252;
this.label48.Text = "压紧位置范围:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCMove
//
this.btnCMove.AutoSize = true;
this.btnCMove.BackColor = System.Drawing.SystemColors.Control;
this.btnCMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnCMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(79, 233);
this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(197, 33);
this.btnCMove.TabIndex = 215;
this.btnCMove.Text = "移动至压紧点P2:";
this.btnCMove.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.UseVisualStyleBackColor = false;
this.btnCMove.Click += new System.EventHandler(this.btnCMove_Click);
//
// cmbPlateH
//
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.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(80, 147);
this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(197, 28);
this.cmbPlateH.TabIndex = 176;
this.cmbPlateH.SelectedIndexChanged += new System.EventHandler(this.cmbPlateH_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(14, 153);
this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(62, 17);
this.label1.TabIndex = 175;
this.label1.Text = "盘高/mm:";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.lblMoveInfo); this.groupBox3.Controls.Add(this.lblMoveInfo);
...@@ -1508,6 +1512,16 @@ ...@@ -1508,6 +1512,16 @@
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
// //
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(975, 12);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(56, 17);
this.lblMoveInfo.TabIndex = 269;
this.lblMoveInfo.Text = "运转状态";
//
// lblTemp // lblTemp
// //
this.lblTemp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblTemp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
...@@ -1793,16 +1807,6 @@ ...@@ -1793,16 +1807,6 @@
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;
// //
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(975, 12);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(56, 17);
this.lblMoveInfo.TabIndex = 269;
this.lblMoveInfo.Text = "运转状态";
//
// FrmBox // FrmBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
...@@ -153,7 +153,16 @@ namespace OnlineStore.ACPackingStore ...@@ -153,7 +153,16 @@ namespace OnlineStore.ACPackingStore
lblTemp.Text = BoxBean.humBean.currTempStr; lblTemp.Text = BoxBean.humBean.currTempStr;
lblWarnMsg.Text = BoxBean.GetWarnMsg(); lblWarnMsg.Text = BoxBean.GetWarnMsg();
lblMoveInfo.Text = BoxBean.GetMoveStr(); lblMoveInfo.Text = BoxBean.GetMoveStr();
lblMoveEquipInfo.Text="当前出入库信息:" if (BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.OutStore) || BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.InStore))
{
lblMoveEquipInfo.Text ="入库:"+ BoxBean.MoveInfo.MoveParam.ToShortStr();
}
else
{
lblMoveEquipInfo.Text ="";
// lblMoveEquipInfo.Text = "";
}
//ReadPosistion(); //ReadPosistion();
if (BoxBean.storeRunStatus > StoreRunStatus.Wait) if (BoxBean.storeRunStatus > StoreRunStatus.Wait)
{ {
...@@ -793,7 +802,9 @@ namespace OnlineStore.ACPackingStore ...@@ -793,7 +802,9 @@ namespace OnlineStore.ACPackingStore
private void btnScanTest_Click(object sender, EventArgs e) private void btnScanTest_Click(object sender, EventArgs e)
{ {
List<string> codes = CodeManager.CameraScan(BoxBean.Config.GetCameraList()); BoxBean. IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
List<string> codes = CodeManager.CameraScan(BoxBean.Config.GetCameraList());
BoxBean.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
string result = ""; string result = "";
if (codes.Count > 0) if (codes.Count > 0)
{ {
...@@ -804,6 +815,11 @@ namespace OnlineStore.ACPackingStore ...@@ -804,6 +815,11 @@ namespace OnlineStore.ACPackingStore
MessageBox.Show("扫到二维码:" + result); MessageBox.Show("扫到二维码:" + result);
LogUtil.info("扫到二维码:" + result); LogUtil.info("扫到二维码:" + result);
} }
else
{
MessageBox.Show("未扫到二维码" );
}
} }
private void cmbShelfPosition_SelectedIndexChanged(object sender, EventArgs e) private void cmbShelfPosition_SelectedIndexChanged(object sender, EventArgs e)
...@@ -1005,5 +1021,40 @@ namespace OnlineStore.ACPackingStore ...@@ -1005,5 +1021,40 @@ namespace OnlineStore.ACPackingStore
} }
} }
} }
private void btnUpdownP101_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpdownP101);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P101_Speed);
}
}
private void btnUpdownP102_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpdownP102);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P102_Speed);
}
}
private void button5_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtMP101);
AxisABSMove(BoxBean.Config.Middle_Axis, value, BoxBean.Config.MiddleAxis_P101_Speed);
}
}
private void btnInoutP101_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtInoutP101);
AxisABSMove(BoxBean.Config.InOut_Axis, value, BoxBean.Config.InOutAxis_P101_Speed );
}
} }
} }
...@@ -298,6 +298,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -298,6 +298,8 @@ namespace OnlineStore.DeviceLibrary
// return usable; // return usable;
//} //}
//else //else
//Arrive收到后打开门
if (action.Equals(ClientAction.Arrive)) if (action.Equals(ClientAction.Arrive))
{ {
//出库处理中不处理 //出库处理中不处理
......
...@@ -46,13 +46,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,13 +46,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error("初始化agvClient " + ServerIp + " 出错:"+ ex.ToString()); LogUtil.error("初始化agvClient " + ServerIp + " 出错:"+ ex.ToString());
} }
} }
//private static void AgvClient_GetRFID(string name, byte[] content)
//{
// RFIDData data = new RFIDData(content);
// LogUtil.info("收到 AgvClient_GetRFID [" + name + "] [" + data.ToData() + "] ");
//}
public static void SetStatus(string id,string mark="", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low) public static void SetStatus(string id,string mark="", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low)
{ {
ClientAction currA = GetAction(id); ClientAction currA = GetAction(id);
...@@ -72,15 +66,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -72,15 +66,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] "); LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] ");
StoreManager.Store.AGVProcess(id, ClientAction.Ready); StoreManager.Store.AGVProcess(id, ClientAction.Ready);
} }
//private static void AgvClient_CanEnter(string id, byte[] content)
//{
// UpdateAction(id, ClientAction.CanEnter);
// RFIDData data = new RFIDData(content);
// LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] ");
// StoreManager.Store.AGVProcess(id, ClientAction.CanEnter);
//}
private static void AgvClient_Arrive(string id, byte[] content) private static void AgvClient_Arrive(string id, byte[] content)
{ {
......
...@@ -144,6 +144,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -144,6 +144,10 @@ namespace OnlineStore.DeviceLibrary
"NeedEnterShelf【" + NeedEnterShelf + "】NeedOutShelf【" + NeedOutShelf + "】"+ "NeedEnterShelf【" + NeedEnterShelf + "】NeedOutShelf【" + NeedOutShelf + "】"+
"urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]"; "urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
} }
public string ToShortStr()
{
return " [" + ShelfPosID + "] [" + PosID + "] [" + WareCode + "], [" + PlateW + "x" + PlateH + "]";
}
internal void UpdateShelfPosId(string pId) internal void UpdateShelfPosId(string pId)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!