Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6f3e225d 由 张东亮
选项

1

1 个父辈 4e882e84
内嵌 并排
正在显示 6 个修改的文件 包含 122 行增加 和 62 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
......@@ -835,6 +835,10 @@ namespace OnlineStore.DeviceLibrary
}
}
}
else
{
return waitAOutStoreList.TryDequeue(out param);
}
}
else
{
......@@ -853,6 +857,10 @@ namespace OnlineStore.DeviceLibrary
}
}
}
else
{
return waitBOutStoreList.TryDequeue(out param);
}
}
}catch(Exception ex)
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
......@@ -41,8 +41,8 @@ namespace OnlineStore.XLRStore
lblName.Text = boxBean.Name;
this.Text = boxBean.Name;
chbDebug.Checked = boxBean.IsDebug;
FrmAutoFindPos frmAutoFindPos = new FrmAutoFindPos();
AddForm(tabControl1, " 视觉对位 ", frmAutoFindPos);
//FrmAutoFindPos frmAutoFindPos = new FrmAutoFindPos();
//AddForm(tabControl1, " 视觉对位 ", frmAutoFindPos);
//FrmTongsLearn learn = new FrmTongsLearn();
//AddForm(tabControl1, " 抓手训练 ", learn);
FrmPosDebug frmPosDebug = new FrmPosDebug();
......
source/XLRStoreClient/inputForm/FrmBatchMove.Designer.cs
......@@ -20,6 +20,7 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnScan = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.btnPointEnable = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.LineStop_A = new System.Windows.Forms.Button();
this.LineBack_A = new System.Windows.Forms.Button();
......@@ -73,6 +74,7 @@
//
// panel2
//
this.panel2.Controls.Add(this.btnPointEnable);
this.panel2.Controls.Add(this.groupBox3);
this.panel2.Controls.Add(this.groupBox2);
this.panel2.Controls.Add(this.groupBox1);
......@@ -85,6 +87,19 @@
this.panel2.Size = new System.Drawing.Size(949, 546);
this.panel2.TabIndex = 324;
//
// btnPointEnable
//
this.btnPointEnable.BackColor = System.Drawing.Color.White;
this.btnPointEnable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPointEnable.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPointEnable.Location = new System.Drawing.Point(502, 503);
this.btnPointEnable.Name = "btnPointEnable";
this.btnPointEnable.Size = new System.Drawing.Size(135, 34);
this.btnPointEnable.TabIndex = 286;
this.btnPointEnable.Text = "启用点位编辑";
this.btnPointEnable.UseVisualStyleBackColor = false;
this.btnPointEnable.Click += new System.EventHandler(this.btnPointEnable_Click);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.LineStop_A);
......@@ -308,9 +323,9 @@
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(322, 86);
this.chbMoveStop.Location = new System.Drawing.Point(302, 86);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 327;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
......@@ -349,9 +364,9 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(213, 86);
this.chbDebug.Location = new System.Drawing.Point(193, 86);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 325;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
......@@ -377,7 +392,7 @@
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(5, 62);
this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.Size = new System.Drawing.Size(75, 20);
this.lblAgvInfo.TabIndex = 282;
this.lblAgvInfo.Text = "AGV 状态";
//
......@@ -423,7 +438,7 @@
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(6, 128);
this.axisMoveControl1.Location = new System.Drawing.Point(5, 136);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(486, 398);
this.axisMoveControl1.TabIndex = 219;
......@@ -435,9 +450,9 @@
this.chbAutoOut.Checked = true;
this.chbAutoOut.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoOut.Location = new System.Drawing.Point(502, 510);
this.chbAutoOut.Location = new System.Drawing.Point(725, 509);
this.chbAutoOut.Name = "chbAutoOut";
this.chbAutoOut.Size = new System.Drawing.Size(168, 24);
this.chbAutoOut.Size = new System.Drawing.Size(212, 28);
this.chbAutoOut.TabIndex = 280;
this.chbAutoOut.Text = "入料完成自动开始出库";
this.chbAutoOut.UseVisualStyleBackColor = true;
......@@ -445,7 +460,7 @@
//
// FrmBatchMove
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(949, 546);
this.Controls.Add(this.panel2);
......@@ -457,6 +472,7 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
this.Leave += new System.EventHandler(this.FrmBatchMove_Leave);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.groupBox3.ResumeLayout(false);
......@@ -500,6 +516,7 @@
protected System.Windows.Forms.Button btnResetShelf;
protected System.Windows.Forms.CheckBox chbMoveStop;
private useControl.AxisPointControl batchAxisP4;
private System.Windows.Forms.Button btnPointEnable;
}
}
source/XLRStoreClient/inputForm/FrmBatchMove.cs
......@@ -91,6 +91,7 @@ namespace OnlineStore.XLRStore
lblWarnMsg.Text = moveBean.WarnMsg;
lblCurrInfo.Text = moveBean.GetMoveStr();
lblAgvInfo.Text = "AGV " + moveBean.Config.AgvName + " :" + AgvClient.GetAction(moveBean.Config.AgvName);
PointEnable(false);
IsLoad = true;
}
......@@ -317,6 +318,34 @@ namespace OnlineStore.XLRStore
moveBean.MoveStop = chbMoveStop.Checked;
LogUtil.info(moveBean.Name + "用户切换是否暂停： " + moveBean.MoveStop);
}
private void btnPointEnable_Click(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("打开入料机构点位调试时，没有正确输入密码");
return;
}
PointEnable(true);
}
void PointEnable(bool enable)
{
axisMoveControl1.Enabled= enable;
groupBox1.Enabled= enable;
groupBox2.Enabled= enable;
groupBox3.Enabled= enable;
}
private void FrmBatchMove_Leave(object sender, EventArgs e)
{
PointEnable(false);
}
}
}
......
source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
......@@ -22,7 +22,6 @@ namespace OnlineStore.XLRStore
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnScan = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.chbPointEditEnable = new System.Windows.Forms.CheckBox();
this.groupBox11 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.mideleAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
......@@ -112,6 +111,7 @@ namespace OnlineStore.XLRStore
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.btnPointEditEnable = new System.Windows.Forms.Button();
this.tabPage2.SuspendLayout();
this.groupBox11.SuspendLayout();
this.panel1.SuspendLayout();
......@@ -152,7 +152,7 @@ namespace OnlineStore.XLRStore
//
// tabPage2
//
this.tabPage2.Controls.Add(this.chbPointEditEnable);
this.tabPage2.Controls.Add(this.btnPointEditEnable);
this.tabPage2.Controls.Add(this.groupBox11);
this.tabPage2.Controls.Add(this.groupBox10);
this.tabPage2.Controls.Add(this.groupBox9);
......@@ -162,26 +162,14 @@ namespace OnlineStore.XLRStore
this.tabPage2.Controls.Add(this.groupBox5);
this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(986, 561);
this.tabPage2.Size = new System.Drawing.Size(986, 558);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
//
// chbPointEditEnable
//
this.chbPointEditEnable.AutoSize = true;
this.chbPointEditEnable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPointEditEnable.Location = new System.Drawing.Point(606, 265);
this.chbPointEditEnable.Name = "chbPointEditEnable";
this.chbPointEditEnable.Size = new System.Drawing.Size(125, 26);
this.chbPointEditEnable.TabIndex = 229;
this.chbPointEditEnable.Text = "启用点位编辑";
this.chbPointEditEnable.UseVisualStyleBackColor = true;
this.chbPointEditEnable.CheckedChanged += new System.EventHandler(this.chbPointEditEnable_CheckedChanged);
//
// groupBox11
//
this.groupBox11.Controls.Add(this.panel1);
......@@ -199,9 +187,9 @@ namespace OnlineStore.XLRStore
this.panel1.Controls.Add(this.updownAxisP2);
this.panel1.Controls.Add(this.updownAxisP3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 19);
this.panel1.Location = new System.Drawing.Point(3, 23);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(233, 191);
this.panel1.Size = new System.Drawing.Size(233, 187);
this.panel1.TabIndex = 220;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
......@@ -341,7 +329,7 @@ namespace OnlineStore.XLRStore
this.btnSave.BackColor = System.Drawing.Color.White;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(761, 263);
this.btnSave.Location = new System.Drawing.Point(794, 262);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(163, 40);
this.btnSave.TabIndex = 226;
......@@ -555,10 +543,10 @@ namespace OnlineStore.XLRStore
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(986, 561);
this.tabPage1.Size = new System.Drawing.Size(986, 558);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -815,7 +803,7 @@ namespace OnlineStore.XLRStore
this.txtDOIndex.Location = new System.Drawing.Point(386, 47);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
this.txtDOIndex.Size = new System.Drawing.Size(47, 27);
this.txtDOIndex.TabIndex = 260;
this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
......@@ -827,7 +815,7 @@ namespace OnlineStore.XLRStore
this.txtDoName.Location = new System.Drawing.Point(386, 64);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(53, 23);
this.txtDoName.Size = new System.Drawing.Size(53, 27);
this.txtDoName.TabIndex = 259;
this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
......@@ -839,7 +827,7 @@ namespace OnlineStore.XLRStore
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(364, 27);
this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(46, 17);
this.lblAddr.Size = new System.Drawing.Size(56, 20);
this.lblAddr.TabIndex = 258;
this.lblAddr.Text = "设备IP:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -863,7 +851,7 @@ namespace OnlineStore.XLRStore
this.txtSlaveId.Location = new System.Drawing.Point(427, 24);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
this.txtSlaveId.Size = new System.Drawing.Size(12, 27);
this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false;
......@@ -903,7 +891,7 @@ namespace OnlineStore.XLRStore
this.txtWriteTime.Location = new System.Drawing.Point(82, 61);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(60, 23);
this.txtWriteTime.Size = new System.Drawing.Size(60, 27);
this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0";
//
......@@ -914,7 +902,7 @@ namespace OnlineStore.XLRStore
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(17, 64);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.Size = new System.Drawing.Size(74, 20);
this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -979,9 +967,9 @@ namespace OnlineStore.XLRStore
//
this.tabPage3.Controls.Add(this.panBase);
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(986, 561);
this.tabPage3.Size = new System.Drawing.Size(986, 558);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "状态信息";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -1022,7 +1010,7 @@ namespace OnlineStore.XLRStore
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(454, 11);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
......@@ -1046,7 +1034,7 @@ namespace OnlineStore.XLRStore
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(365, 11);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 247;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
......@@ -1061,7 +1049,7 @@ namespace OnlineStore.XLRStore
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(543, 13);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.Size = new System.Drawing.Size(82, 24);
this.lblStoreStatus.TabIndex = 245;
this.lblStoreStatus.Text = "等待启动";
this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -1115,7 +1103,7 @@ namespace OnlineStore.XLRStore
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(10, 328);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(154, 24);
this.checkBox1.Size = new System.Drawing.Size(194, 28);
this.checkBox1.TabIndex = 291;
this.checkBox1.Text = "检测到料串自动入库";
this.checkBox1.UseVisualStyleBackColor = true;
......@@ -1147,7 +1135,7 @@ namespace OnlineStore.XLRStore
this.cmbOutstorePos.FormattingEnabled = true;
this.cmbOutstorePos.Location = new System.Drawing.Point(104, 70);
this.cmbOutstorePos.Name = "cmbOutstorePos";
this.cmbOutstorePos.Size = new System.Drawing.Size(142, 28);
this.cmbOutstorePos.Size = new System.Drawing.Size(142, 31);
this.cmbOutstorePos.TabIndex = 290;
//
// cmbInstorePos
......@@ -1157,7 +1145,7 @@ namespace OnlineStore.XLRStore
this.cmbInstorePos.FormattingEnabled = true;
this.cmbInstorePos.Location = new System.Drawing.Point(266, 28);
this.cmbInstorePos.Name = "cmbInstorePos";
this.cmbInstorePos.Size = new System.Drawing.Size(142, 28);
this.cmbInstorePos.Size = new System.Drawing.Size(142, 31);
this.cmbInstorePos.TabIndex = 289;
//
// btnOutStoreTest
......@@ -1183,7 +1171,7 @@ namespace OnlineStore.XLRStore
"B下暂存区"});
this.cmbOutStartP.Location = new System.Drawing.Point(9, 70);
this.cmbOutStartP.Name = "cmbOutStartP";
this.cmbOutStartP.Size = new System.Drawing.Size(90, 28);
this.cmbOutStartP.Size = new System.Drawing.Size(90, 31);
this.cmbOutStartP.TabIndex = 287;
this.cmbOutStartP.SelectedIndexChanged += new System.EventHandler(this.cmbOutShelf_SelectedIndexChanged);
//
......@@ -1193,7 +1181,7 @@ namespace OnlineStore.XLRStore
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(251, 74);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(31, 20);
this.label2.Size = new System.Drawing.Size(39, 24);
this.label2.TabIndex = 286;
this.label2.Text = "-->";
//
......@@ -1207,7 +1195,7 @@ namespace OnlineStore.XLRStore
"B料口"});
this.cmbOutShelf.Location = new System.Drawing.Point(287, 70);
this.cmbOutShelf.Name = "cmbOutShelf";
this.cmbOutShelf.Size = new System.Drawing.Size(121, 28);
this.cmbOutShelf.Size = new System.Drawing.Size(121, 31);
this.cmbOutShelf.TabIndex = 285;
//
// BtnInStoreTest
......@@ -1233,7 +1221,7 @@ namespace OnlineStore.XLRStore
"B上暂存区"});
this.cmbInstoreTargetP.Location = new System.Drawing.Point(171, 28);
this.cmbInstoreTargetP.Name = "cmbInstoreTargetP";
this.cmbInstoreTargetP.Size = new System.Drawing.Size(90, 28);
this.cmbInstoreTargetP.Size = new System.Drawing.Size(90, 31);
this.cmbInstoreTargetP.TabIndex = 2;
this.cmbInstoreTargetP.SelectedIndexChanged += new System.EventHandler(this.cmbInstoreTargetP_SelectedIndexChanged);
//
......@@ -1243,7 +1231,7 @@ namespace OnlineStore.XLRStore
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(135, 32);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(31, 20);
this.label1.Size = new System.Drawing.Size(39, 24);
this.label1.TabIndex = 1;
this.label1.Text = "-->";
//
......@@ -1257,7 +1245,7 @@ namespace OnlineStore.XLRStore
"B料口"});
this.cmbInstoreShelf.Location = new System.Drawing.Point(9, 28);
this.cmbInstoreShelf.Name = "cmbInstoreShelf";
this.cmbInstoreShelf.Size = new System.Drawing.Size(121, 28);
this.cmbInstoreShelf.Size = new System.Drawing.Size(121, 31);
this.cmbInstoreShelf.TabIndex = 0;
//
// lblwidth
......@@ -1279,7 +1267,7 @@ namespace OnlineStore.XLRStore
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(8, 109);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(59, 17);
this.lblMoveInfo.Size = new System.Drawing.Size(73, 20);
this.lblMoveInfo.TabIndex = 278;
this.lblMoveInfo.Text = "运动信息:";
//
......@@ -1312,9 +1300,22 @@ namespace OnlineStore.XLRStore
this.tabControl1.TabIndex = 257;
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// btnPointEditEnable
//
this.btnPointEditEnable.BackColor = System.Drawing.Color.White;
this.btnPointEditEnable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPointEditEnable.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPointEditEnable.Location = new System.Drawing.Point(625, 262);
this.btnPointEditEnable.Name = "btnPointEditEnable";
this.btnPointEditEnable.Size = new System.Drawing.Size(163, 40);
this.btnPointEditEnable.TabIndex = 230;
this.btnPointEditEnable.Text = "启用点位编辑";
this.btnPointEditEnable.UseVisualStyleBackColor = false;
this.btnPointEditEnable.Click += new System.EventHandler(this.btnPointEditEnable_Click);
//
// FrmInputEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1000, 596);
this.Controls.Add(this.tabControl1);
......@@ -1328,7 +1329,6 @@ namespace OnlineStore.XLRStore
this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
this.VisibleChanged += new System.EventHandler(this.FrmInputEquip_VisibleChanged);
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
this.groupBox11.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.groupBox10.ResumeLayout(false);
......@@ -1438,7 +1438,6 @@ namespace OnlineStore.XLRStore
private System.Windows.Forms.ComboBox cmbInstoreTargetP;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnOutStoreTest;
private System.Windows.Forms.CheckBox chbPointEditEnable;
public System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.ComboBox cmbInstorePos;
private System.Windows.Forms.ComboBox cmbOutstorePos;
......@@ -1450,6 +1449,7 @@ namespace OnlineStore.XLRStore
private System.Windows.Forms.Button btnClampWork;
private System.Windows.Forms.Button btnClampJawStop;
private System.Windows.Forms.Button btnClampJawStart;
protected System.Windows.Forms.Button btnPointEditEnable;
}
}
source/XLRStoreClient/inputForm/FrmInputEquip.cs
......@@ -620,24 +620,29 @@ namespace OnlineStore.XLRStore
groupBox9.Enabled = enable;
groupBox10.Enabled = enable;
groupBox11.Enabled = enable;
axisMoveControl1.Enabled= enable;
}
private void chbPointEditEnable_CheckedChanged(object sender, EventArgs e)
private void btnPointEditEnable_Click(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
PointEditEnable(chbPointEditEnable.Checked);
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("打开入料机构点位调试时，没有正确输入密码");
return;
}
PointEditEnable(true);
}
internal void FrmInputEquip_VisibleChanged(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
chbPointEditEnable.Checked = false;
}
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
......@@ -646,7 +651,7 @@ namespace OnlineStore.XLRStore
{
return;
}
chbPointEditEnable.Checked = false;
PointEditEnable(false);
}
private void BtnInStoreTest_Click(object sender, EventArgs e)
......@@ -810,6 +815,7 @@ namespace OnlineStore.XLRStore
}
}
#endregion
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!