Skip to content

孙克 / ACSingleStore

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

出入库增加门关闭验证。中英文修改。

1 个父辈 d908af79
内嵌 并排
正在显示 7 个修改的文件 包含 127 行增加 和 98 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -55,6 +55,7 @@
this.btnLogDebug = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.btnHul = new System.Windows.Forms.Button();
this.btnCloseDLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
......@@ -165,7 +166,6 @@
this.开启DEBUGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btnHul = new System.Windows.Forms.Button();
this.contextMenuStrip1.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout();
......@@ -244,7 +244,7 @@
this.tabPage4.Controls.Add(this.btnStoreStart);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(1083, 47);
this.tabPage4.TabIndex = 0;
this.tabPage4.Text = " 料仓操作 ";
......@@ -255,7 +255,7 @@
this.chbIsDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbIsDebug.AutoSize = true;
this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbIsDebug.Location = new System.Drawing.Point(709, 13);
this.chbIsDebug.Location = new System.Drawing.Point(690, 13);
this.chbIsDebug.Name = "chbIsDebug";
this.chbIsDebug.Size = new System.Drawing.Size(84, 24);
this.chbIsDebug.TabIndex = 272;
......@@ -268,7 +268,7 @@
this.chbBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(847, 13);
this.chbBuzzer.Location = new System.Drawing.Point(832, 13);
this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271;
......@@ -305,7 +305,7 @@
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(965, 13);
this.chbAuto.Location = new System.Drawing.Point(964, 13);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
......@@ -360,7 +360,7 @@
this.tabPage5.Controls.Add(this.btnIO);
this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(1083, 47);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = " 设备调试 ";
......@@ -475,6 +475,7 @@
this.btnOpenAutoInOut.TabIndex = 271;
this.btnOpenAutoInOut.Text = "开启自动出入库";
this.btnOpenAutoInOut.UseVisualStyleBackColor = false;
this.btnOpenAutoInOut.Visible = false;
this.btnOpenAutoInOut.Click += new System.EventHandler(this.btnOpenAutoInOut_Click);
//
// btnLan
......@@ -557,12 +558,26 @@
this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// btnHul
//
this.btnHul.BackColor = System.Drawing.Color.White;
this.btnHul.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHul.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHul.Location = new System.Drawing.Point(383, 8);
this.btnHul.Name = "btnHul";
this.btnHul.Size = new System.Drawing.Size(149, 38);
this.btnHul.TabIndex = 263;
this.btnHul.Text = "忽略夹爪检测信号";
this.btnHul.UseVisualStyleBackColor = false;
this.btnHul.Visible = false;
this.btnHul.Click += new System.EventHandler(this.btnHul_Click);
//
// btnCloseDLed
//
this.btnCloseDLed.BackColor = System.Drawing.Color.White;
this.btnCloseDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDLed.Location = new System.Drawing.Point(251, 50);
this.btnCloseDLed.Location = new System.Drawing.Point(260, 49);
this.btnCloseDLed.Name = "btnCloseDLed";
this.btnCloseDLed.Size = new System.Drawing.Size(117, 38);
this.btnCloseDLed.TabIndex = 262;
......@@ -575,7 +590,7 @@
this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(251, 9);
this.btnOpenDLed.Location = new System.Drawing.Point(260, 8);
this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(117, 38);
this.btnOpenDLed.TabIndex = 261;
......@@ -588,7 +603,7 @@
this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(128, 50);
this.btnCloseLed.Location = new System.Drawing.Point(137, 49);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(117, 38);
this.btnCloseLed.TabIndex = 260;
......@@ -601,9 +616,9 @@
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(391, 50);
this.btnClearLog.Location = new System.Drawing.Point(383, 49);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(117, 38);
this.btnClearLog.Size = new System.Drawing.Size(149, 38);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = false;
......@@ -614,7 +629,7 @@
this.btnOpenLed.BackColor = System.Drawing.Color.White;
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(128, 9);
this.btnOpenLed.Location = new System.Drawing.Point(137, 8);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(117, 38);
this.btnOpenLed.TabIndex = 259;
......@@ -627,7 +642,7 @@
this.btnCloseDoor.BackColor = System.Drawing.Color.White;
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(5, 50);
this.btnCloseDoor.Location = new System.Drawing.Point(14, 49);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(117, 38);
this.btnCloseDoor.TabIndex = 258;
......@@ -640,7 +655,7 @@
this.btnOpenDoor.BackColor = System.Drawing.Color.White;
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(5, 9);
this.btnOpenDoor.Location = new System.Drawing.Point(14, 8);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(117, 38);
this.btnOpenDoor.TabIndex = 257;
......@@ -654,18 +669,19 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 104);
this.richTextBox1.Location = new System.Drawing.Point(5, 91);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(537, 515);
this.richTextBox1.Size = new System.Drawing.Size(534, 526);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.Visible = false;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(547, 622);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
......@@ -683,7 +699,7 @@
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(547, 622);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 压紧轴/温湿度 ";
......@@ -961,9 +977,9 @@
//
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(14, 49);
this.lblWarnMsg.Location = new System.Drawing.Point(5, 49);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(507, 65);
this.lblWarnMsg.Size = new System.Drawing.Size(519, 77);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -1463,7 +1479,7 @@
this.btnUpDownP7.Location = new System.Drawing.Point(5, 224);
this.btnUpDownP7.Name = "btnUpDownP7";
this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP7.Size = new System.Drawing.Size(174, 33);
this.btnUpDownP7.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP7.TabIndex = 203;
this.btnUpDownP7.Text = "升降轴入料缓冲点P7：";
this.btnUpDownP7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1482,7 +1498,7 @@
this.btnUpDownP8.Location = new System.Drawing.Point(5, 264);
this.btnUpDownP8.Name = "btnUpDownP8";
this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP8.Size = new System.Drawing.Size(174, 33);
this.btnUpDownP8.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP8.TabIndex = 205;
this.btnUpDownP8.Text = "升降轴出料缓冲点P8：";
this.btnUpDownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1628,7 +1644,7 @@
this.btnUpDownP6.Location = new System.Drawing.Point(267, 264);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(174, 33);
this.btnUpDownP6.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP6.TabIndex = 189;
this.btnUpDownP6.Text = "升降轴出料缓冲点P6：";
this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1664,7 +1680,7 @@
this.btnUpDownP4.Location = new System.Drawing.Point(267, 184);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(174, 33);
this.btnUpDownP4.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP4.TabIndex = 165;
this.btnUpDownP4.Text = "升降轴入料缓冲点P4：";
this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1911,20 +1927,6 @@
this.清理日志ToolStripMenuItem.Text = "清理日志";
this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
//
// btnHul
//
this.btnHul.BackColor = System.Drawing.Color.White;
this.btnHul.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHul.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHul.Location = new System.Drawing.Point(374, 9);
this.btnHul.Name = "btnHul";
this.btnHul.Size = new System.Drawing.Size(149, 38);
this.btnHul.TabIndex = 263;
this.btnHul.Text = "忽略夹爪检测信号";
this.btnHul.UseVisualStyleBackColor = false;
this.btnHul.Visible = false;
this.btnHul.Click += new System.EventHandler(this.btnHul_Click);
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -1938,7 +1940,7 @@
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmStoreBox";
this.Text = "AC_SA_料仓";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -168,8 +168,10 @@ namespace OnlineStore.ACSingleStore
{
groupHistory.Visible = false;
}
// this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false;
LanguageProcess();
LanguagePro();
// this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false;
}
private string WaitStart = ResourceCulture.GetString("等待启动");
private string dooropen = ResourceCulture.GetString("前门未关");
......
source/ACSingleStore/useControl/AxisMoveControl.Designer.cs
......@@ -135,7 +135,7 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(6, 4);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(531, 312);
this.groupAxis.Size = new System.Drawing.Size(529, 312);
this.groupAxis.TabIndex = 217;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
......@@ -264,9 +264,9 @@
//
this.btnGetAlarm.BackColor = System.Drawing.SystemColors.Control;
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(301, 205);
this.btnGetAlarm.Location = new System.Drawing.Point(291, 205);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(105, 33);
this.btnGetAlarm.Size = new System.Drawing.Size(115, 33);
this.btnGetAlarm.TabIndex = 284;
this.btnGetAlarm.Text = "读取状态";
this.btnGetAlarm.UseVisualStyleBackColor = false;
......@@ -279,10 +279,10 @@
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(416, 244);
this.btnReadPosition.Location = new System.Drawing.Point(409, 244);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(105, 33);
this.btnReadPosition.Size = new System.Drawing.Size(115, 33);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = false;
......@@ -305,10 +305,10 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(297, 25);
this.btnOpenAxis.Location = new System.Drawing.Point(291, 25);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(105, 33);
this.btnOpenAxis.Size = new System.Drawing.Size(115, 33);
this.btnOpenAxis.TabIndex = 253;
this.btnOpenAxis.Text = "打开伺服";
this.btnOpenAxis.UseVisualStyleBackColor = false;
......@@ -321,10 +321,10 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(416, 25);
this.btnCloseAxis.Location = new System.Drawing.Point(409, 25);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(105, 33);
this.btnCloseAxis.Size = new System.Drawing.Size(115, 33);
this.btnCloseAxis.TabIndex = 252;
this.btnCloseAxis.Text = "关闭伺服";
this.btnCloseAxis.UseVisualStyleBackColor = false;
......@@ -345,7 +345,7 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(206, 111);
this.txtASpeed.Location = new System.Drawing.Point(201, 111);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -358,7 +358,7 @@
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(149, 113);
this.label47.Location = new System.Drawing.Point(144, 113);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(55, 17);
......@@ -373,10 +373,10 @@
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(297, 106);
this.btnAxisVMove.Location = new System.Drawing.Point(291, 106);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(105, 33);
this.btnAxisVMove.Size = new System.Drawing.Size(115, 33);
this.btnAxisVMove.TabIndex = 249;
this.btnAxisVMove.Text = "匀速运动";
this.btnAxisVMove.UseVisualStyleBackColor = false;
......@@ -389,10 +389,10 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(416, 67);
this.btnAxisRMove.Location = new System.Drawing.Point(409, 67);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(105, 33);
this.btnAxisRMove.Size = new System.Drawing.Size(115, 33);
this.btnAxisRMove.TabIndex = 248;
this.btnAxisRMove.Text = "相对运动";
this.btnAxisRMove.UseVisualStyleBackColor = false;
......@@ -405,10 +405,10 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(416, 205);
this.btnAxisReturnHome.Location = new System.Drawing.Point(409, 205);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(105, 33);
this.btnAxisReturnHome.Size = new System.Drawing.Size(115, 33);
this.btnAxisReturnHome.TabIndex = 247;
this.btnAxisReturnHome.Text = "原点返回";
this.btnAxisReturnHome.UseVisualStyleBackColor = false;
......@@ -421,10 +421,10 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(297, 67);
this.btnAxisAMove.Location = new System.Drawing.Point(291, 67);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(105, 33);
this.btnAxisAMove.Size = new System.Drawing.Size(115, 33);
this.btnAxisAMove.TabIndex = 245;
this.btnAxisAMove.Text = "绝对运动";
this.btnAxisAMove.UseVisualStyleBackColor = false;
......@@ -434,9 +434,9 @@
//
this.btnComAlarmClear.BackColor = System.Drawing.SystemColors.Control;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(301, 244);
this.btnComAlarmClear.Location = new System.Drawing.Point(291, 244);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(105, 33);
this.btnComAlarmClear.Size = new System.Drawing.Size(115, 33);
this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = false;
......@@ -448,7 +448,7 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(206, 72);
this.txtAPosition.Location = new System.Drawing.Point(201, 72);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -461,7 +461,7 @@
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(149, 74);
this.label48.Location = new System.Drawing.Point(144, 74);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(55, 17);
......@@ -476,10 +476,10 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(416, 106);
this.btnAxisStop.Location = new System.Drawing.Point(409, 106);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(105, 33);
this.btnAxisStop.Size = new System.Drawing.Size(115, 33);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = false;
......@@ -488,7 +488,7 @@
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(88, 109);
this.txtAxisValue.Location = new System.Drawing.Point(83, 109);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
......@@ -499,7 +499,7 @@
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(88, 70);
this.txtAxisDeviceName.Location = new System.Drawing.Point(83, 70);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
......@@ -511,7 +511,7 @@
//
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(10, 75);
this.label45.Location = new System.Drawing.Point(5, 75);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(75, 17);
this.label45.TabIndex = 240;
......@@ -522,7 +522,7 @@
//
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(10, 114);
this.label46.Location = new System.Drawing.Point(5, 114);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(75, 17);
this.label46.TabIndex = 239;
......@@ -535,7 +535,7 @@
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.ItemHeight = 17;
this.comboBox1.Location = new System.Drawing.Point(13, 28);
this.comboBox1.Location = new System.Drawing.Point(8, 28);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(278, 25);
this.comboBox1.TabIndex = 234;
......@@ -572,7 +572,7 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(6, 315);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(531, 207);
this.groupBox1.Size = new System.Drawing.Size(529, 199);
this.groupBox1.TabIndex = 218;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -456,6 +456,15 @@ namespace OnlineStore.DeviceLibrary
}
return false;
}
private bool DoorIsOpen()
{
if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) &&
IOManager.IOValue(IO_Type.Door_Up).Equals(IO_VALUE.HIGH))
{
return true;
}
return false;
}
private void OpenDoorAndWait()
{
Thread.Sleep(60);
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -305,7 +305,7 @@ namespace OnlineStore.DeviceLibrary
{
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
SI_02_Move(param.MoveP);
SI_02_OpenDoor(param.MoveP);
}
else
{
......@@ -328,10 +328,11 @@ namespace OnlineStore.DeviceLibrary
{
StartInStoreMove(param, false);
}
private void SI_02_Move(LineMoveP moveP)
private void SI_02_OpenDoor(LineMoveP moveP)
{
InStoreLog("入库：SI_02_ 进出轴(叉子)动作至P1, 打开仓门");
StoreMove.NextMoveStep(StoreMoveStep.SI_02_InOutAxisHome);
StoreMove.NextMoveStep(StoreMoveStep.SI_02_OpenDoor);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(200));
OpenDoorAndWait();
InOutBackToP1(moveP.InOut_P1);
}
......@@ -361,7 +362,7 @@ namespace OnlineStore.DeviceLibrary
{
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
SI_02_Move(moveP);
SI_02_OpenDoor(moveP);
}
else
{
......@@ -372,15 +373,22 @@ namespace OnlineStore.DeviceLibrary
}
if (StoreMove.MoveStep == StoreMoveStep.SI_01_LocationCylinderDown)
{
SI_02_Move(moveP);
SI_02_OpenDoor(moveP);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_02_InOutAxisHome)
else if (StoreMove.MoveStep == StoreMoveStep.SI_02_OpenDoor)
{
InStoreLog("入库：SI_03 所有轴回到待机点，轴2、轴1 动作到P1,，轴4动作至P3");
StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
if (DoorIsOpen())
{
InStoreLog("入库：SI_03 所有轴回到待机点，轴2、轴1 动作到P1,，轴4动作至P3");
StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
}
else
{
SI_02_OpenDoor(moveP);
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_03_ReturnHome)
{
......@@ -675,13 +683,7 @@ namespace OnlineStore.DeviceLibrary
{
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
//SO_10_DeviceToDoorPro();
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoorAndWait();
SO_091_WaitNoTray();
}
else
{
......@@ -693,16 +695,19 @@ namespace OnlineStore.DeviceLibrary
//此处需要等待移栽没有工作，才能把盘放入出料口
else if (StoreMove.MoveStep == StoreMoveStep.SO_09_LocationCylinder_Down)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoorAndWait();
SO_091_WaitNoTray();
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_091_WaitNoTray)
{
SO_10_DeviceToDoorPro();
if (DoorIsOpen())
{
SO_10_DeviceToDoorPro();
}
else
{
SO_091_WaitNoTray();
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_10_DeviceToDoor)
{
......@@ -790,6 +795,14 @@ namespace OnlineStore.DeviceLibrary
}
}
private void SO_091_WaitNoTray()
{
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoorAndWait();
}
private void OutStoreEnd()
{
TimeSpan span = DateTime.Now - startOutStoreTime;
......
source/DeviceLibrary/dataLogic/DLScanSocket.cs
......@@ -68,7 +68,10 @@ namespace OnlineStore.DeviceLibrary
{
try
{
scannerSocket.close();
if (scannerSocket != null)
{
scannerSocket.close();
}
isScannerRun = false;
}
catch (Exception ex)
......
source/DeviceLibrary/store/StoreStep.cs
......@@ -272,7 +272,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入库。。进出轴（叉子）先返回P1
/// </summary>
SI_02_InOutAxisHome = 202,
SI_02_OpenDoor = 202,
/// <summary>
/// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!