Skip to content

孙克 / RC1250-AssemblyLine

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

界面调整

1 个父辈 2338a745
内嵌 并排
正在显示 3 个修改的文件 包含 144 行增加 和 114 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.logBox = new System.Windows.Forms.RichTextBox(); this.logBox = new System.Windows.Forms.RichTextBox();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label5 = new System.Windows.Forms.Label();
this.chbInStoNG = new System.Windows.Forms.CheckBox(); this.chbInStoNG = new System.Windows.Forms.CheckBox();
this.cmbTrayType = new System.Windows.Forms.ComboBox(); this.cmbTrayType = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
...@@ -44,17 +43,14 @@ ...@@ -44,17 +43,14 @@
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.txtTrayPosid = new System.Windows.Forms.TextBox(); this.txtTrayPosid = new System.Windows.Forms.TextBox();
this.cmbTray = new System.Windows.Forms.ComboBox(); this.cmbTray = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.btnUpdateTray = new System.Windows.Forms.Button(); this.btnUpdateTray = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btnClearTray = new System.Windows.Forms.Button();
this.btnTrayInfo = new System.Windows.Forms.Button(); this.btnTrayInfo = new System.Windows.Forms.Button();
this.lblCID = new System.Windows.Forms.Label(); this.lblCID = new System.Windows.Forms.Label();
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.chkDebug = new System.Windows.Forms.CheckBox(); this.chkDebug = new System.Windows.Forms.CheckBox();
this.btnClearLog = new System.Windows.Forms.Button(); this.btnClearLog = new System.Windows.Forms.Button();
this.btnCopyLog = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label(); this.lblPosId = new System.Windows.Forms.Label();
this.btnUpdateStatus = new System.Windows.Forms.Button(); this.btnUpdateStatus = new System.Windows.Forms.Button();
...@@ -86,7 +82,13 @@ ...@@ -86,7 +82,13 @@
this.托盘初始化ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.托盘初始化ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.iO模块状态ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.iO模块状态ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.清空托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.清空日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.复制日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
...@@ -122,6 +124,7 @@ ...@@ -122,6 +124,7 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Controls.Add(this.lblCID);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.lblMoveInfo); this.tabPage1.Controls.Add(this.lblMoveInfo);
this.tabPage1.Controls.Add(this.groupBox2); this.tabPage1.Controls.Add(this.groupBox2);
...@@ -140,18 +143,15 @@ ...@@ -140,18 +143,15 @@
| 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(448, 153); this.logBox.Location = new System.Drawing.Point(448, 144);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(872, 453); this.logBox.Size = new System.Drawing.Size(872, 462);
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);
// //
// groupBox3 // groupBox3
// //
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.label5);
this.groupBox3.Controls.Add(this.chbInStoNG); this.groupBox3.Controls.Add(this.chbInStoNG);
this.groupBox3.Controls.Add(this.cmbTrayType); this.groupBox3.Controls.Add(this.cmbTrayType);
this.groupBox3.Controls.Add(this.label4); this.groupBox3.Controls.Add(this.label4);
...@@ -161,32 +161,23 @@ ...@@ -161,32 +161,23 @@
this.groupBox3.Controls.Add(this.label2); this.groupBox3.Controls.Add(this.label2);
this.groupBox3.Controls.Add(this.txtTrayPosid); this.groupBox3.Controls.Add(this.txtTrayPosid);
this.groupBox3.Controls.Add(this.cmbTray); this.groupBox3.Controls.Add(this.cmbTray);
this.groupBox3.Controls.Add(this.label1);
this.groupBox3.Controls.Add(this.btnUpdateTray); this.groupBox3.Controls.Add(this.btnUpdateTray);
this.groupBox3.Location = new System.Drawing.Point(448, 77); this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(448, 72);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(872, 68); this.groupBox3.Size = new System.Drawing.Size(600, 61);
this.groupBox3.TabIndex = 197; this.groupBox3.TabIndex = 197;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "托盘信息编辑"; this.groupBox3.Text = "操作信息";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(135, 31);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(68, 20);
this.label5.TabIndex = 206;
this.label5.Text = "料盘类型:";
// //
// chbInStoNG // chbInStoNG
// //
this.chbInStoNG.AutoSize = true; this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(650, 29); this.chbInStoNG.Location = new System.Drawing.Point(414, 24);
this.chbInStoNG.Name = "chbInStoNG"; this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(84, 24); this.chbInStoNG.Size = new System.Drawing.Size(70, 21);
this.chbInStoNG.TabIndex = 205; this.chbInStoNG.TabIndex = 205;
this.chbInStoNG.Text = "入库失败"; this.chbInStoNG.Text = "入库NG";
this.chbInStoNG.UseVisualStyleBackColor = true; this.chbInStoNG.UseVisualStyleBackColor = true;
// //
// cmbTrayType // cmbTrayType
...@@ -197,59 +188,61 @@ ...@@ -197,59 +188,61 @@
"无", "无",
"入库", "入库",
"出库"}); "出库"});
this.cmbTrayType.Location = new System.Drawing.Point(207, 27); this.cmbTrayType.Location = new System.Drawing.Point(64, 22);
this.cmbTrayType.Name = "cmbTrayType"; this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 28); this.cmbTrayType.Size = new System.Drawing.Size(78, 25);
this.cmbTrayType.TabIndex = 204; this.cmbTrayType.TabIndex = 204;
// //
// label4 // label4
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(557, 31); this.label4.Location = new System.Drawing.Point(354, 26);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(26, 20); this.label4.Size = new System.Drawing.Size(23, 17);
this.label4.TabIndex = 203; this.label4.TabIndex = 203;
this.label4.Text = "宽:"; this.label4.Text = "宽:";
// //
// txtTrayW // txtTrayW
// //
this.txtTrayW.Location = new System.Drawing.Point(587, 28); this.txtTrayW.Location = new System.Drawing.Point(381, 23);
this.txtTrayW.MaxLength = 2;
this.txtTrayW.Name = "txtTrayW"; this.txtTrayW.Name = "txtTrayW";
this.txtTrayW.Size = new System.Drawing.Size(48, 26); this.txtTrayW.Size = new System.Drawing.Size(29, 23);
this.txtTrayW.TabIndex = 202; this.txtTrayW.TabIndex = 202;
this.txtTrayW.Text = "7"; this.txtTrayW.Text = "7";
// //
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(464, 31); this.label3.Location = new System.Drawing.Point(294, 26);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(26, 20); this.label3.Size = new System.Drawing.Size(23, 17);
this.label3.TabIndex = 201; this.label3.TabIndex = 201;
this.label3.Text = "高:"; this.label3.Text = "高:";
// //
// txtTrayH // txtTrayH
// //
this.txtTrayH.Location = new System.Drawing.Point(494, 28); this.txtTrayH.Location = new System.Drawing.Point(321, 23);
this.txtTrayH.MaxLength = 2;
this.txtTrayH.Name = "txtTrayH"; this.txtTrayH.Name = "txtTrayH";
this.txtTrayH.Size = new System.Drawing.Size(48, 26); this.txtTrayH.Size = new System.Drawing.Size(29, 23);
this.txtTrayH.TabIndex = 200; this.txtTrayH.TabIndex = 200;
this.txtTrayH.Text = "8"; this.txtTrayH.Text = "8";
// //
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(300, 31); this.label2.Location = new System.Drawing.Point(146, 26);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(40, 20); this.label2.Size = new System.Drawing.Size(35, 17);
this.label2.TabIndex = 199; this.label2.TabIndex = 199;
this.label2.Text = "库位:"; this.label2.Text = "库位:";
// //
// txtTrayPosid // txtTrayPosid
// //
this.txtTrayPosid.Location = new System.Drawing.Point(344, 28); this.txtTrayPosid.Location = new System.Drawing.Point(185, 23);
this.txtTrayPosid.Name = "txtTrayPosid"; this.txtTrayPosid.Name = "txtTrayPosid";
this.txtTrayPosid.Size = new System.Drawing.Size(105, 26); this.txtTrayPosid.Size = new System.Drawing.Size(105, 23);
this.txtTrayPosid.TabIndex = 198; this.txtTrayPosid.TabIndex = 198;
this.txtTrayPosid.Text = "11#AC1_1_1"; this.txtTrayPosid.Text = "11#AC1_1_1";
// //
...@@ -257,38 +250,28 @@ ...@@ -257,38 +250,28 @@
// //
this.cmbTray.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbTray.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbTray.FormattingEnabled = true; this.cmbTray.FormattingEnabled = true;
this.cmbTray.Location = new System.Drawing.Point(69, 27); this.cmbTray.Location = new System.Drawing.Point(9, 22);
this.cmbTray.Name = "cmbTray"; this.cmbTray.Name = "cmbTray";
this.cmbTray.Size = new System.Drawing.Size(51, 28); this.cmbTray.Size = new System.Drawing.Size(51, 25);
this.cmbTray.TabIndex = 194; this.cmbTray.TabIndex = 194;
// //
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(11, 31);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(54, 20);
this.label1.TabIndex = 193;
this.label1.Text = "托盘号:";
//
// btnUpdateTray // btnUpdateTray
// //
this.btnUpdateTray.BackColor = System.Drawing.Color.White; this.btnUpdateTray.BackColor = System.Drawing.Color.White;
this.btnUpdateTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdateTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateTray.Location = new System.Drawing.Point(738, 24); this.btnUpdateTray.Location = new System.Drawing.Point(488, 17);
this.btnUpdateTray.Name = "btnUpdateTray"; this.btnUpdateTray.Name = "btnUpdateTray";
this.btnUpdateTray.Size = new System.Drawing.Size(105, 35); this.btnUpdateTray.Size = new System.Drawing.Size(105, 35);
this.btnUpdateTray.TabIndex = 192; this.btnUpdateTray.TabIndex = 192;
this.btnUpdateTray.Text = "更新托盘信息"; this.btnUpdateTray.Text = "更新托盘";
this.btnUpdateTray.UseVisualStyleBackColor = false; this.btnUpdateTray.UseVisualStyleBackColor = false;
this.btnUpdateTray.Click += new System.EventHandler(this.btnUpdateTray_Click); this.btnUpdateTray.Click += new System.EventHandler(this.btnUpdateTray_Click);
// //
// lblMoveInfo // lblMoveInfo
// //
this.lblMoveInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(18, 471); this.lblMoveInfo.Location = new System.Drawing.Point(1056, 7);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17); this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196; this.lblMoveInfo.TabIndex = 196;
...@@ -296,41 +279,22 @@ ...@@ -296,41 +279,22 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.btnClearTray);
this.groupBox2.Controls.Add(this.btnTrayInfo); this.groupBox2.Controls.Add(this.btnTrayInfo);
this.groupBox2.Controls.Add(this.lblCID);
this.groupBox2.Controls.Add(this.chbAutoRun); this.groupBox2.Controls.Add(this.chbAutoRun);
this.groupBox2.Controls.Add(this.chkDebug); this.groupBox2.Controls.Add(this.chkDebug);
this.groupBox2.Controls.Add(this.btnClearLog); this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Controls.Add(this.btnCopyLog); this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(448, 4); this.groupBox2.Location = new System.Drawing.Point(448, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(872, 71); this.groupBox2.Size = new System.Drawing.Size(600, 66);
this.groupBox2.TabIndex = 196; this.groupBox2.TabIndex = 196;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "状态信息";
//
// btnClearTray
//
this.btnClearTray.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearTray.BackColor = System.Drawing.Color.White;
this.btnClearTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearTray.Location = new System.Drawing.Point(346, 21);
this.btnClearTray.Name = "btnClearTray";
this.btnClearTray.Size = new System.Drawing.Size(105, 35);
this.btnClearTray.TabIndex = 196;
this.btnClearTray.Text = "清空托盘信息";
this.btnClearTray.UseVisualStyleBackColor = false;
this.btnClearTray.Click += new System.EventHandler(this.btnClearTray_Click);
// //
// btnTrayInfo // btnTrayInfo
// //
this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTrayInfo.BackColor = System.Drawing.Color.White; this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(457, 22); this.btnTrayInfo.Location = new System.Drawing.Point(379, 20);
this.btnTrayInfo.Name = "btnTrayInfo"; this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35); this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195; this.btnTrayInfo.TabIndex = 195;
...@@ -342,30 +306,30 @@ ...@@ -342,30 +306,30 @@
// //
this.lblCID.AutoSize = true; this.lblCID.AutoSize = true;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(19, 34); this.lblCID.Location = new System.Drawing.Point(1287, 4);
this.lblCID.Name = "lblCID"; this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20); this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95; this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID"; this.lblCID.Text = "CID";
this.lblCID.Visible = false;
// //
// chbAutoRun // chbAutoRun
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(137, 32); this.chbAutoRun.Location = new System.Drawing.Point(32, 25);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24); this.chbAutoRun.Size = new System.Drawing.Size(112, 24);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
this.chbAutoRun.Text = "开机自动启动软件"; this.chbAutoRun.Text = "开机自动启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged); this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
// //
// chkDebug // chkDebug
// //
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true; this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(793, 27); this.chkDebug.Location = new System.Drawing.Point(211, 25);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24); this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -374,10 +338,9 @@ ...@@ -374,10 +338,9 @@
// //
// btnClearLog // btnClearLog
// //
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(681, 22); this.btnClearLog.Location = new System.Drawing.Point(488, 20);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
...@@ -385,19 +348,6 @@ ...@@ -385,19 +348,6 @@
this.btnClearLog.UseVisualStyleBackColor = false; this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click); this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
// //
// btnCopyLog
//
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(569, 22);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191;
this.btnCopyLog.Text = "复制日志";
this.btnCopyLog.UseVisualStyleBackColor = false;
this.btnCopyLog.Click += new System.EventHandler(this.btnCopyLog_Click);
//
// groupBox1 // groupBox1
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -409,7 +359,7 @@ ...@@ -409,7 +359,7 @@
this.groupBox1.Controls.Add(this.btnInStoreTset); this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(448, 101); this.groupBox1.Location = new System.Drawing.Point(448, 167);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(872, 61); this.groupBox1.Size = new System.Drawing.Size(872, 61);
this.groupBox1.TabIndex = 195; this.groupBox1.TabIndex = 195;
...@@ -502,7 +452,7 @@ ...@@ -502,7 +452,7 @@
this.listView1.Location = new System.Drawing.Point(9, 7); this.listView1.Location = new System.Drawing.Point(9, 7);
this.listView1.MultiSelect = false; this.listView1.MultiSelect = false;
this.listView1.Name = "listView1"; this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(433, 460); this.listView1.Size = new System.Drawing.Size(433, 599);
this.listView1.TabIndex = 191; this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details; this.listView1.View = System.Windows.Forms.View.Details;
...@@ -633,7 +583,9 @@ ...@@ -633,7 +583,9 @@
this.toolStripSeparator7, this.toolStripSeparator7,
this.托盘初始化ToolStripMenuItem, this.托盘初始化ToolStripMenuItem,
this.toolStripSeparator9, this.toolStripSeparator9,
this.iO模块状态ToolStripMenuItem}); this.iO模块状态ToolStripMenuItem,
this.toolStripSeparator12,
this.清空托盘信息ToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem"; this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25); this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
this.设置TToolStripMenuItem.Text = "设备调试 "; this.设置TToolStripMenuItem.Text = "设备调试 ";
...@@ -641,7 +593,7 @@ ...@@ -641,7 +593,7 @@
// 扫码测试ToolStripMenuItem // 扫码测试ToolStripMenuItem
// //
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem"; this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(162, 26); this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试"; this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Visible = false; this.扫码测试ToolStripMenuItem.Visible = false;
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click); this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
...@@ -649,48 +601,88 @@ ...@@ -649,48 +601,88 @@
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(159, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Visible = false; this.toolStripSeparator6.Visible = false;
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(162, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(159, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
// //
// 托盘初始化ToolStripMenuItem // 托盘初始化ToolStripMenuItem
// //
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem"; this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(162, 26); this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码"; this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click); this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(159, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
// //
// iO模块状态ToolStripMenuItem // iO模块状态ToolStripMenuItem
// //
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem"; this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(162, 26); this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.iO模块状态ToolStripMenuItem.Text = "IO模块状态"; this.iO模块状态ToolStripMenuItem.Text = "IO模块状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click); this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
// //
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
//
// 清空托盘信息ToolStripMenuItem
//
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
//
// 帮助ToolStripMenuItem // 帮助ToolStripMenuItem
// //
this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.清空日志ToolStripMenuItem,
this.toolStripSeparator10,
this.复制日志ToolStripMenuItem,
this.toolStripSeparator11,
this.版本号ToolStripMenuItem}); this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem"; this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25); this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25);
this.帮助ToolStripMenuItem.Text = " 系统 "; this.帮助ToolStripMenuItem.Text = " 系统 ";
// //
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
//
// 版本号ToolStripMenuItem // 版本号ToolStripMenuItem
// //
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem"; this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
...@@ -737,7 +729,7 @@ ...@@ -737,7 +729,7 @@
// //
// timer1 // timer1
// //
this.timer1.Interval = 1000; this.timer1.Interval = 2000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// FrmLineStore // FrmLineStore
...@@ -793,7 +785,6 @@ ...@@ -793,7 +785,6 @@
internal System.Windows.Forms.RichTextBox logBox; internal System.Windows.Forms.RichTextBox logBox;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripMenuItem 入库模式ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 入库模式ToolStripMenuItem;
private System.Windows.Forms.Button btnCopyLog;
private System.Windows.Forms.Button btnClearLog; private System.Windows.Forms.Button btnClearLog;
private System.Windows.Forms.Label lblStatus; private System.Windows.Forms.Label lblStatus;
private System.Windows.Forms.CheckBox chbAutoRun; private System.Windows.Forms.CheckBox chbAutoRun;
...@@ -829,7 +820,6 @@ ...@@ -829,7 +820,6 @@
private System.Windows.Forms.Label lblMoveInfo; private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnTrayInfo; private System.Windows.Forms.Button btnTrayInfo;
private System.Windows.Forms.Button btnClearTray;
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox chbInStoNG; private System.Windows.Forms.CheckBox chbInStoNG;
private System.Windows.Forms.ComboBox cmbTrayType; private System.Windows.Forms.ComboBox cmbTrayType;
...@@ -840,9 +830,13 @@ ...@@ -840,9 +830,13 @@
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtTrayPosid; private System.Windows.Forms.TextBox txtTrayPosid;
private System.Windows.Forms.ComboBox cmbTray; private System.Windows.Forms.ComboBox cmbTray;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnUpdateTray; private System.Windows.Forms.Button btnUpdateTray;
private System.Windows.Forms.Label label5; private System.Windows.Forms.ToolStripMenuItem 清空日志ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
private System.Windows.Forms.ToolStripMenuItem 复制日志ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripMenuItem 清空托盘信息ToolStripMenuItem;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -847,5 +847,34 @@ namespace OnlineStore.AssemblyLine ...@@ -847,5 +847,34 @@ namespace OnlineStore.AssemblyLine
LogUtil.UpdateLogbox(); LogUtil.UpdateLogbox();
} }
} }
private void 清空日志ToolStripMenuItem_Click(object sender, EventArgs e)
{
LogUtil.ClearLog();
}
private void 复制日志ToolStripMenuItem_Click(object sender, EventArgs e)
{
Clipboard.SetDataObject(logBox.Text);
MessageBox.Show("已复制日志到粘贴板！");
}
private void 清空托盘信息ToolStripMenuItem_Click(object sender, EventArgs e)
{
DialogResult resut = MessageBox.Show("确定手动清空所有托盘信息？", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
List<TrayInfo> tray = TrayManager.getTrayList();
LogUtil.info("-------------------点击：清空托盘。清空前打印托盘信息：");
foreach (TrayInfo t in tray)
{
LogUtil.info(t.ToStr());
}
TrayManager.ClearTrayInfo();
LogUtil.info("-------------------点击：清空托盘。托盘内容已清空");
}
}
} }
} }
source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
...@@ -376,11 +376,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -376,11 +376,13 @@ namespace OnlineStore.DeviceLibrary
while (true) while (true)
{ {
Thread.Sleep(50); Thread.Sleep(50);
if (IOManager.IOValue(moveDO, subType).Equals(IO_VALUE.LOW))
TimeSpan span = DateTime.Now - startTime;
if (span.TotalSeconds > 1 && IOManager.IOValue(moveDO, subType).Equals(IO_VALUE.LOW))
{ {
LogUtil.error(subType + " LineRunAndWait1 转动[" + moveDO + "][" + checkDI + "]，已等待[" + FormUtil.GetSpanStr(span) + "]，重写IO：" + moveDO);
IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType); IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType);
} }
TimeSpan span = DateTime.Now - startTime;
if (!InTurn) if (!InTurn)
{ {
isStop = true; isStop = true;
...@@ -416,6 +418,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -416,6 +418,11 @@ namespace OnlineStore.DeviceLibrary
{ {
Thread.Sleep(50); Thread.Sleep(50);
TimeSpan span = DateTime.Now - startTime; TimeSpan span = DateTime.Now - startTime;
if (span.TotalSeconds > 2 && IOManager.IOValue(moveDO, subType).Equals(IO_VALUE.LOW))
{
LogUtil.error(subType + " LineRunAndWait2 转动[" + moveDO + "][" + checkDI + "]，已等待[" + FormUtil.GetSpanStr(span) + "]，重写IO：" + moveDO);
IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType);
}
if (!InTurn) if (!InTurn)
{ {
isStop = true; isStop = true;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!