Skip to content

李娜 / SO664-AssemblyLine

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

增加出料线禁用框

1 个父辈 5b55cc5a
内嵌 并排
正在显示 9 个修改的文件 包含 324 行增加 和 166 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -32,6 +32,14 @@ ...@@ -32,6 +32,14 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLineStore)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLineStore));
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label();
this.btnUpdateStatus = new System.Windows.Forms.Button();
this.txtPosId = new System.Windows.Forms.TextBox();
this.cmbBoxIndex = new System.Windows.Forms.ComboBox();
this.btnInStoreTset = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.logBox = new System.Windows.Forms.RichTextBox(); this.logBox = new System.Windows.Forms.RichTextBox();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
...@@ -53,14 +61,6 @@ ...@@ -53,14 +61,6 @@
this.label12 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label();
this.btnUpdateStatus = new System.Windows.Forms.Button();
this.txtPosId = new System.Windows.Forms.TextBox();
this.cmbBoxIndex = new System.Windows.Forms.ComboBox();
this.btnInStoreTset = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
this.panel5 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel();
this.picLine = new System.Windows.Forms.PictureBox(); this.picLine = new System.Windows.Forms.PictureBox();
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.自动保存托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip_control = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip_control = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
this.toolName = new System.Windows.Forms.ToolStripMenuItem(); this.toolName = new System.Windows.Forms.ToolStripMenuItem();
...@@ -121,8 +122,15 @@ ...@@ -121,8 +122,15 @@
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
this.control_Debug = new System.Windows.Forms.ToolStripMenuItem(); this.control_Debug = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
this.启用右侧ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启用左侧出料线ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.chbLeftDis = new System.Windows.Forms.CheckBox();
this.chbRightDis = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
...@@ -131,7 +139,6 @@ ...@@ -131,7 +139,6 @@
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.panel5.SuspendLayout(); this.panel5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit();
...@@ -160,6 +167,8 @@ ...@@ -160,6 +167,8 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.chbRightDis);
this.tabPage1.Controls.Add(this.chbLeftDis);
this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
...@@ -169,15 +178,107 @@ ...@@ -169,15 +178,107 @@
this.tabPage1.Text = " 运行日志 "; this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.lblPosId);
this.groupBox1.Controls.Add(this.btnUpdateStatus);
this.groupBox1.Controls.Add(this.txtPosId);
this.groupBox1.Controls.Add(this.cmbBoxIndex);
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(49, 233);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(872, 61);
this.groupBox1.TabIndex = 195;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓通信测试";
this.groupBox1.Visible = false;
//
// lblPosId
//
this.lblPosId.AutoSize = true;
this.lblPosId.Location = new System.Drawing.Point(366, 24);
this.lblPosId.Name = "lblPosId";
this.lblPosId.Size = new System.Drawing.Size(40, 20);
this.lblPosId.TabIndex = 197;
this.lblPosId.Text = "库位:";
//
// btnUpdateStatus
//
this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(641, 17);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.TabIndex = 195;
this.btnUpdateStatus.Text = "更改为调试状态";
this.btnUpdateStatus.UseVisualStyleBackColor = false;
//
// txtPosId
//
this.txtPosId.Location = new System.Drawing.Point(426, 21);
this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(80, 26);
this.txtPosId.TabIndex = 196;
//
// cmbBoxIndex
//
this.cmbBoxIndex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBoxIndex.FormattingEnabled = true;
this.cmbBoxIndex.Location = new System.Drawing.Point(272, 20);
this.cmbBoxIndex.Name = "cmbBoxIndex";
this.cmbBoxIndex.Size = new System.Drawing.Size(85, 28);
this.cmbBoxIndex.TabIndex = 195;
//
// btnInStoreTset
//
this.btnInStoreTset.BackColor = System.Drawing.Color.White;
this.btnInStoreTset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStoreTset.Location = new System.Drawing.Point(515, 17);
this.btnInStoreTset.Name = "btnInStoreTset";
this.btnInStoreTset.Size = new System.Drawing.Size(105, 35);
this.btnInStoreTset.TabIndex = 194;
this.btnInStoreTset.Text = "入库测试";
this.btnInStoreTset.UseVisualStyleBackColor = false;
this.btnInStoreTset.Click += new System.EventHandler(this.btnInStoreTset_Click);
//
// button2
//
this.button2.BackColor = System.Drawing.Color.White;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Location = new System.Drawing.Point(118, 17);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(105, 35);
this.button2.TabIndex = 193;
this.button2.Text = "停止服务";
this.button2.UseVisualStyleBackColor = false;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(11, 17);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 35);
this.button1.TabIndex = 192;
this.button1.Text = "启动服务";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// logBox // logBox
// //
this.logBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.logBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(3, 3); this.logBox.Location = new System.Drawing.Point(3, 55);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1317, 601); this.logBox.Size = new System.Drawing.Size(1317, 549);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -421,99 +522,6 @@ ...@@ -421,99 +522,6 @@
this.label14.TabIndex = 198; this.label14.TabIndex = 198;
this.label14.Text = "绿色：忙碌中"; this.label14.Text = "绿色：忙碌中";
// //
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.lblPosId);
this.groupBox1.Controls.Add(this.btnUpdateStatus);
this.groupBox1.Controls.Add(this.txtPosId);
this.groupBox1.Controls.Add(this.cmbBoxIndex);
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(32, 60);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(872, 61);
this.groupBox1.TabIndex = 195;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓通信测试";
this.groupBox1.Visible = false;
//
// lblPosId
//
this.lblPosId.AutoSize = true;
this.lblPosId.Location = new System.Drawing.Point(366, 24);
this.lblPosId.Name = "lblPosId";
this.lblPosId.Size = new System.Drawing.Size(40, 20);
this.lblPosId.TabIndex = 197;
this.lblPosId.Text = "库位:";
//
// btnUpdateStatus
//
this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(641, 17);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.TabIndex = 195;
this.btnUpdateStatus.Text = "更改为调试状态";
this.btnUpdateStatus.UseVisualStyleBackColor = false;
//this.btnUpdateStatus.Click += new System.EventHandler(this.btnUpdateStatus_Click);
//
// txtPosId
//
this.txtPosId.Location = new System.Drawing.Point(426, 21);
this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(80, 26);
this.txtPosId.TabIndex = 196;
//
// cmbBoxIndex
//
this.cmbBoxIndex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBoxIndex.FormattingEnabled = true;
this.cmbBoxIndex.Location = new System.Drawing.Point(272, 20);
this.cmbBoxIndex.Name = "cmbBoxIndex";
this.cmbBoxIndex.Size = new System.Drawing.Size(85, 28);
this.cmbBoxIndex.TabIndex = 195;
//
// btnInStoreTset
//
this.btnInStoreTset.BackColor = System.Drawing.Color.White;
this.btnInStoreTset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStoreTset.Location = new System.Drawing.Point(515, 17);
this.btnInStoreTset.Name = "btnInStoreTset";
this.btnInStoreTset.Size = new System.Drawing.Size(105, 35);
this.btnInStoreTset.TabIndex = 194;
this.btnInStoreTset.Text = "入库测试";
this.btnInStoreTset.UseVisualStyleBackColor = false;
this.btnInStoreTset.Click += new System.EventHandler(this.btnInStoreTset_Click);
//
// button2
//
this.button2.BackColor = System.Drawing.Color.White;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Location = new System.Drawing.Point(118, 17);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(105, 35);
this.button2.TabIndex = 193;
this.button2.Text = "停止服务";
this.button2.UseVisualStyleBackColor = false;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(11, 17);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 35);
this.button1.TabIndex = 192;
this.button1.Text = "启动服务";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tabPage5 // tabPage5
// //
this.tabPage5.Controls.Add(this.panel5); this.tabPage5.Controls.Add(this.panel5);
...@@ -838,8 +846,13 @@ ...@@ -838,8 +846,13 @@
this.toolStripSeparator15, this.toolStripSeparator15,
this.启用蜂鸣器ToolStripMenuItem, this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator16, this.toolStripSeparator16,
this.toolStripSeparator25,
this.aGVCancelStateToolStripMenuItem, this.aGVCancelStateToolStripMenuItem,
this.toolStripSeparator17}); this.toolStripSeparator17,
this.自动保存托盘信息ToolStripMenuItem,
this.toolStripSeparator24,
this.启用左侧出料线ToolStripMenuItem,
this.启用右侧ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem"; this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25); this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数"; this.运行参数ToolStripMenuItem.Text = "运行参数";
...@@ -879,7 +892,13 @@ ...@@ -879,7 +892,13 @@
// //
this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6); this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6);
this.toolStripSeparator17.Visible = false; //
// 自动保存托盘信息ToolStripMenuItem
//
this.自动保存托盘信息ToolStripMenuItem.Name = "自动保存托盘信息ToolStripMenuItem";
this.自动保存托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.自动保存托盘信息ToolStripMenuItem.Text = "保存托盘信息";
this.自动保存托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.自动保存托盘信息ToolStripMenuItem_Click);
// //
// contextMenuStrip_control // contextMenuStrip_control
// //
...@@ -965,6 +984,50 @@ ...@@ -965,6 +984,50 @@
this.toolStripSeparator22.Name = "toolStripSeparator22"; this.toolStripSeparator22.Name = "toolStripSeparator22";
this.toolStripSeparator22.Size = new System.Drawing.Size(159, 6); this.toolStripSeparator22.Size = new System.Drawing.Size(159, 6);
// //
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(203, 6);
//
// toolStripSeparator25
//
this.toolStripSeparator25.Name = "toolStripSeparator25";
this.toolStripSeparator25.Size = new System.Drawing.Size(203, 6);
//
// 启用右侧ToolStripMenuItem
//
this.启用右侧ToolStripMenuItem.Name = "启用右侧ToolStripMenuItem";
this.启用右侧ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用右侧ToolStripMenuItem.Text = "启用右侧";
//
// 启用左侧出料线ToolStripMenuItem
//
this.启用左侧出料线ToolStripMenuItem.Name = "启用左侧出料线ToolStripMenuItem";
this.启用左侧出料线ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用左侧出料线ToolStripMenuItem.Text = "启用左侧出料线";
//
// chbLeftDis
//
this.chbLeftDis.AutoSize = true;
this.chbLeftDis.Location = new System.Drawing.Point(26, 14);
this.chbLeftDis.Name = "chbLeftDis";
this.chbLeftDis.Size = new System.Drawing.Size(126, 24);
this.chbLeftDis.TabIndex = 196;
this.chbLeftDis.Text = "禁用左侧出料线";
this.chbLeftDis.UseVisualStyleBackColor = true;
this.chbLeftDis.CheckedChanged += new System.EventHandler(this.chbLeftDis_CheckedChanged);
//
// chbRightDis
//
this.chbRightDis.AutoSize = true;
this.chbRightDis.Location = new System.Drawing.Point(176, 14);
this.chbRightDis.Name = "chbRightDis";
this.chbRightDis.Size = new System.Drawing.Size(126, 24);
this.chbRightDis.TabIndex = 197;
this.chbRightDis.Text = "禁用右侧出料线";
this.chbRightDis.UseVisualStyleBackColor = true;
this.chbRightDis.CheckedChanged += new System.EventHandler(this.chbRightDis_CheckedChanged);
//
// FrmLineStore // FrmLineStore
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -988,6 +1051,9 @@ ...@@ -988,6 +1051,9 @@
this.Load += new System.EventHandler(this.FrmMain_Load); this.Load += new System.EventHandler(this.FrmMain_Load);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false);
...@@ -996,8 +1062,6 @@ ...@@ -996,8 +1062,6 @@
this.panel3.ResumeLayout(false); this.panel3.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false);
this.panel4.ResumeLayout(false); this.panel4.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
this.tabPage5.PerformLayout(); this.tabPage5.PerformLayout();
this.panel5.ResumeLayout(false); this.panel5.ResumeLayout(false);
...@@ -1104,6 +1168,13 @@ ...@@ -1104,6 +1168,13 @@
private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.PictureBox picLine; private System.Windows.Forms.PictureBox picLine;
private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.ToolStripMenuItem 自动保存托盘信息ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator24;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator25;
private System.Windows.Forms.ToolStripMenuItem 启用左侧出料线ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 启用右侧ToolStripMenuItem;
private System.Windows.Forms.CheckBox chbLeftDis;
private System.Windows.Forms.CheckBox chbRightDis;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -75,7 +75,14 @@ namespace OnlineStore.AssemblyLine ...@@ -75,7 +75,14 @@ namespace OnlineStore.AssemblyLine
{ {
启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器"; 启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
} }
if (TrayManager.DisTraySave)
{
自动保存托盘信息ToolStripMenuItem.Text = "自动保存托盘信息";
}
else
{
自动保存托盘信息ToolStripMenuItem.Text = gouStr + "自动保存托盘信息";
}
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
this.Opacity = 100; this.Opacity = 100;
...@@ -1014,9 +1021,8 @@ namespace OnlineStore.AssemblyLine ...@@ -1014,9 +1021,8 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
#endregion
#endregion
#region ListView显示 #region ListView显示
...@@ -1243,5 +1249,58 @@ namespace OnlineStore.AssemblyLine ...@@ -1243,5 +1249,58 @@ namespace OnlineStore.AssemblyLine
//} //}
#endregion #endregion
private void 自动保存托盘信息ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = 自动保存托盘信息ToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals( TrayManager.DisTraySave))
{
return;
}
TrayManager.DisTraySave = result;
ConfigAppSettings.SaveValue(Setting_Init.DisTraySave, (TrayManager.DisTraySave ? 1 : 0));
if (TrayManager.DisTraySave)
{
自动保存托盘信息ToolStripMenuItem.Text = "自动保存托盘信息";
}
else
{
自动保存托盘信息ToolStripMenuItem.Text = gouStr + " 自动保存托盘信息";
}
LogUtil.info(Name + " 点击：" + 自动保存托盘信息ToolStripMenuItem.Text);
}
private void chbLeftDis_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisLeftOutLine.Equals(chbLeftDis.Checked))
{
return;
}
LineManager.DisLeftOutLine = chbLeftDis.Checked;
LogUtil.error("用户点击勾选：" + chbLeftDis.Text+"="+ LineManager.DisLeftOutLine);
}
private void chbRightDis_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisRightOutLine.Equals(chbRightDis.Checked))
{
return;
}
LineManager.DisRightOutLine = chbRightDis.Checked;
LogUtil.error("用户点击勾选：" + chbRightDis.Text + "="+ LineManager.DisRightOutLine);
}
} }
} }
source/Common/Setting_Init.cs
...@@ -101,5 +101,7 @@ namespace OnlineStore.Common ...@@ -101,5 +101,7 @@ namespace OnlineStore.Common
public static string UseHCBoard = "UseHCBoard"; public static string UseHCBoard = "UseHCBoard";
public static string ConfigPath_TrayList = "ConfigPath_TrayList"; public static string ConfigPath_TrayList = "ConfigPath_TrayList";
public static string DisTraySave = "DisTraySave";
} }
} }
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -309,11 +309,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -309,11 +309,11 @@ namespace OnlineStore.DeviceLibrary
TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样"; TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样";
LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样"); LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样");
} }
else if (!TrayManager.CheckIsRightNum(currTrayNum, preTrayNum)) //else if (!TrayManager.CheckIsRightNum(currTrayNum, preTrayNum))
{ //{
TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续"; // TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续";
LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续"); // LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续");
} //}
return true; return true;
} }
internal void ClearTrayRFID() internal void ClearTrayRFID()
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -757,6 +757,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -757,6 +757,16 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
//判断是否禁用
if(LineManager.DisLeftOutLine&&(DeviceID.Equals(204) || DeviceID.Equals(209)))
{
return false;
}
if(LineManager.DisRightOutLine&& (DeviceID.Equals(213) || DeviceID.Equals(216)))
{
return false;
}
if (Config.IsOutLineIn && trayNum > 0) if (Config.IsOutLineIn && trayNum > 0)
{ {
//测线满时不需要横移 //测线满时不需要横移
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
...@@ -142,6 +142,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -142,6 +142,7 @@ namespace OnlineStore.DeviceLibrary
private int GetRobotIndex() private int GetRobotIndex()
{ {
//机器人索引号
int robotIndex = 1; int robotIndex = 1;
if (DeviceID.Equals(212)) if (DeviceID.Equals(212))
{ {
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -746,24 +746,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -746,24 +746,15 @@ namespace OnlineStore.DeviceLibrary
bool isNeed = false; bool isNeed = false;
UpdateTrayNum(); UpdateTrayNum();
bool isFull = TrayManager.TrayIsFull(currTrayNum); bool isFull = TrayManager.TrayIsFull(currTrayNum);
if (TrayManager.RightTrayCode(currTrayNum, preTrayNum, false))
//出库中，需要拦盘
if (CheckIsNeedOutStore())
{ {
//出库中，需要拦盘 isNeed = true;
if (CheckIsNeedOutStore())
{
isNeed = true;
}
else if (isFull && IsInStoreNeed())
{
isNeed = true;
}
} }
else else if (isFull && IsInStoreNeed())
{ {
string msg = Name + " 托盘顺序错乱，上个托盘号【" + preTrayNum + "】当前托盘号 【" + currTrayNum + "】最大盘号【" + TrayManager.MaxTrayNum + "】"; isNeed = true;
TrayManager.UpdateTrayNumError(DeviceID, msg);
LogUtil.error(msg);
return;
} }
if (isNeed) if (isNeed)
{ {
...@@ -780,9 +771,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -780,9 +771,7 @@ namespace OnlineStore.DeviceLibrary
TrayManager.UpdateTrayNumError(-1, ""); TrayManager.UpdateTrayNumError(-1, "");
} }
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
//CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
} }
} }
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -14,6 +14,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,6 +14,10 @@ namespace OnlineStore.DeviceLibrary
{ {
public class LineManager public class LineManager
{ {
public static bool DisLeftOutLine = false ;
public static bool DisRightOutLine = false ;
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
private static bool isInit = false; private static bool isInit = false;
public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals(""); public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
...@@ -15,15 +15,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,15 +15,16 @@ namespace OnlineStore.DeviceLibrary
{ {
public class TrayManager public class TrayManager
{ {
public static bool DisTraySave = ConfigAppSettings.GetIntValue(Setting_Init.DisTraySave).Equals(1);
/// <summary> /// <summary>
/// 托盘集合，key=托盘编号，value=托盘详细信息 /// 托盘集合，key=托盘编号，value=托盘详细信息
/// </summary> /// </summary>
private static ConcurrentDictionary<int, TrayInfo> TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>(); private static ConcurrentDictionary<int, TrayInfo> TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
/// <summary> ///// <summary>
/// 最大托盘号，必须按照顺序从1到6走过 ///// 最大托盘号，必须按照顺序从1到6走过
/// </summary> ///// </summary>
internal static int MaxTrayNum = 0; //internal static int MaxTrayNum = 0;
/// <summary> /// <summary>
/// 托盘错误消息 /// 托盘错误消息
/// </summary> /// </summary>
...@@ -123,33 +124,33 @@ namespace OnlineStore.DeviceLibrary ...@@ -123,33 +124,33 @@ namespace OnlineStore.DeviceLibrary
} }
public static bool NeedCheckTray = ConfigAppSettings.GetIntValue(Setting_Init.NeedCheckTray).Equals(1); public static bool NeedCheckTray = ConfigAppSettings.GetIntValue(Setting_Init.NeedCheckTray).Equals(1);
internal static bool CheckIsRightNum(int trayNum, int preTrayNum, bool isCanUpdateMax = true) //internal static bool CheckIsRightNum(int trayNum, int preTrayNum, bool isCanUpdateMax = true)
{ //{
if (!NeedCheckTray) // if (!NeedCheckTray)
{ // {
return true; // return true;
} // }
int defNext = preTrayNum + 1; // int defNext = preTrayNum + 1;
if (preTrayNum.Equals(0) || MaxTrayNum.Equals(0) || trayNum.Equals(defNext)) // if (preTrayNum.Equals(0) || MaxTrayNum.Equals(0) || trayNum.Equals(defNext))
{ // {
if (isCanUpdateMax && trayNum > MaxTrayNum) // if (isCanUpdateMax && trayNum > MaxTrayNum)
{ // {
MaxTrayNum = trayNum; // MaxTrayNum = trayNum;
LogUtil.info("更新MaxTrayNum=" + preTrayNum); // LogUtil.info("更新MaxTrayNum=" + preTrayNum);
} // }
return true; // return true;
} // }
else if (trayNum.Equals(1) && preTrayNum >= MaxTrayNum) // else if (trayNum.Equals(1) && preTrayNum >= MaxTrayNum)
{ // {
return true; // return true;
} // }
return false; // return false;
} //}
internal static bool RightTrayCode(int trayNum, int preTrayNum, bool isCanUpdateMax = true) //internal static bool RightTrayCode(int trayNum, int preTrayNum, bool isCanUpdateMax = true)
{ //{
return true; // return true;
return CheckIsRightNum(trayNum, preTrayNum, isCanUpdateMax); // //return CheckIsRightNum(trayNum, preTrayNum, isCanUpdateMax);
} //}
internal static void UpdateTrayNumError(int errorStoreID, string errorMsg) internal static void UpdateTrayNumError(int errorStoreID, string errorMsg)
{ {
...@@ -174,6 +175,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -174,6 +175,11 @@ namespace OnlineStore.DeviceLibrary
public static void InitFileData() public static void InitFileData()
{ {
TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>(); TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
if (DisTraySave)
{
LogUtil.error("禁用了托盘保存功能，不需要从文件夹加载托盘");
return;
}
FilePath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_TrayList); FilePath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_TrayList);
if (File.Exists(FilePath)) if (File.Exists(FilePath))
{ {
...@@ -186,6 +192,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -186,6 +192,22 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info("加载到缓存托盘：" + tray.ToStr()); LogUtil.info("加载到缓存托盘：" + tray.ToStr());
TrayInfoMap.TryAdd(tray.TrayNum, tray); TrayInfoMap.TryAdd(tray.TrayNum, tray);
if (tray.InOrOutStore.Equals(1)&&tray.InoutPar.InStoreNg.Equals(false) && (!tray.InoutPar.PosId.Equals("")) && (!tray.InoutPar.WareCode.Equals("")))
{
int storeId = tray.InoutPar.GetStoreId();
if (storeId > 0 && LineManager.Line.MoveEquipMap.ContainsKey(storeId))
{
MoveEquip moveEquip = LineManager.Line.MoveEquipMap[storeId];
lock (moveEquip.waitInListLock)
{
//如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(moveEquip.Name + " 将托盘入库任务["+tray.TrayNum+"]： " + tray.InoutPar.ToStr() + "加入等待列表中！");
moveEquip.waitInStoreList.Add(tray.InoutPar);
}
}
}
} }
} }
LogUtil.info("托盘加载完成"); LogUtil.info("托盘加载完成");
...@@ -195,7 +217,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -195,7 +217,7 @@ namespace OnlineStore.DeviceLibrary
public static void SaveMapToFile() public static void SaveMapToFile()
{ {
try try
{ {
List<TrayInfo> trayList = new List<TrayInfo>(); List<TrayInfo> trayList = new List<TrayInfo>();
List<string> lineList = new List<string>(); List<string> lineList = new List<string>();
foreach (TrayInfo tray in trayList) foreach (TrayInfo tray in trayList)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!