Skip to content

孙克 / RC1250-AssemblyLine

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

增加单个托盘清空功能，方便处理。

1 个父辈 f39622e9
内嵌 并排
正在显示 6 个修改的文件 包含 353 行增加 和 87 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -32,13 +32,20 @@ ...@@ -32,13 +32,20 @@
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.numTrayNum = new System.Windows.Forms.NumericUpDown();
this.btnClear = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label();
this.lblSelTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.chbShunt = new System.Windows.Forms.CheckBox();
this.chbSaveImage = new System.Windows.Forms.CheckBox(); this.chbSaveImage = new System.Windows.Forms.CheckBox();
this.chbShunt2 = new System.Windows.Forms.CheckBox(); this.chbShunt2 = new System.Windows.Forms.CheckBox();
this.btnShunt2Reset = new System.Windows.Forms.Button(); this.btnShunt2Reset = new System.Windows.Forms.Button();
this.btnShuntReset = new System.Windows.Forms.Button(); this.btnShuntReset = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.chbShunt = new System.Windows.Forms.CheckBox();
this.chbTrayCheck = new System.Windows.Forms.CheckBox(); this.chbTrayCheck = new System.Windows.Forms.CheckBox();
this.chbBuzzer = new System.Windows.Forms.CheckBox(); this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.btnClearLog = new System.Windows.Forms.Button(); this.btnClearLog = new System.Windows.Forms.Button();
...@@ -46,7 +53,6 @@ ...@@ -46,7 +53,6 @@
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.listView1 = new System.Windows.Forms.ListView(); this.listView1 = new System.Windows.Forms.ListView();
this.logBox = new System.Windows.Forms.RichTextBox(); this.logBox = new System.Windows.Forms.RichTextBox();
this.lblCID = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
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();
...@@ -58,7 +64,6 @@ ...@@ -58,7 +64,6 @@
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.btnUpdateTray = new System.Windows.Forms.Button(); this.btnUpdateTray = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.picLine = new System.Windows.Forms.PictureBox(); this.picLine = new System.Windows.Forms.PictureBox();
this.lblStatus = new System.Windows.Forms.Label(); this.lblStatus = new System.Windows.Forms.Label();
...@@ -108,8 +113,13 @@ ...@@ -108,8 +113,13 @@
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.启用分流横移1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
this.启用分流横移2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numTrayNum)).BeginInit();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -138,13 +148,14 @@ ...@@ -138,13 +148,14 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Controls.Add(this.groupBox2); this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.lblCID);
this.tabPage1.Controls.Add(this.lblMoveInfo);
this.tabPage1.Controls.Add(this.listView1); this.tabPage1.Controls.Add(this.listView1);
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.lblCID);
this.tabPage1.Controls.Add(this.lblMoveInfo);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1328, 609); this.tabPage1.Size = new System.Drawing.Size(1328, 609);
...@@ -152,22 +163,90 @@ ...@@ -152,22 +163,90 @@
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.numTrayNum);
this.groupBox1.Controls.Add(this.btnClear);
this.groupBox1.Controls.Add(this.label10);
this.groupBox1.Controls.Add(this.lblSelTrayNum);
this.groupBox1.Location = new System.Drawing.Point(720, 148);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(602, 81);
this.groupBox1.TabIndex = 284;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "托盘信息编辑";
//
// numTrayNum
//
this.numTrayNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numTrayNum.Location = new System.Drawing.Point(66, 29);
this.numTrayNum.Name = "numTrayNum";
this.numTrayNum.Size = new System.Drawing.Size(71, 26);
this.numTrayNum.TabIndex = 283;
this.numTrayNum.ValueChanged += new System.EventHandler(this.numTrayNum_ValueChanged);
//
// btnClear
//
this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(142, 25);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 282;
this.btnClear.Text = "清空此托盘";
this.btnClear.UseVisualStyleBackColor = false;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(7, 32);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(54, 20);
this.label10.TabIndex = 207;
this.label10.Text = "托盘号:";
//
// lblSelTrayNum
//
this.lblSelTrayNum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblSelTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSelTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblSelTrayNum.Location = new System.Drawing.Point(253, 14);
this.lblSelTrayNum.Name = "lblSelTrayNum";
this.lblSelTrayNum.Size = new System.Drawing.Size(341, 61);
this.lblSelTrayNum.TabIndex = 276;
this.lblSelTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// panel1 // panel1
// //
this.panel1.Controls.Add(this.chbSaveImage); this.panel1.Controls.Add(this.chbSaveImage);
this.panel1.Controls.Add(this.chbShunt2);
this.panel1.Controls.Add(this.btnShunt2Reset); this.panel1.Controls.Add(this.btnShunt2Reset);
this.panel1.Controls.Add(this.btnShuntReset); this.panel1.Controls.Add(this.btnShuntReset);
this.panel1.Location = new System.Drawing.Point(720, 4); this.panel1.Location = new System.Drawing.Point(720, 4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(179, 157); this.panel1.Size = new System.Drawing.Size(165, 140);
this.panel1.TabIndex = 199; this.panel1.TabIndex = 199;
// //
// chbShunt
//
this.chbShunt.AutoSize = true;
this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt.Location = new System.Drawing.Point(8, 61);
this.chbShunt.Name = "chbShunt";
this.chbShunt.Size = new System.Drawing.Size(120, 24);
this.chbShunt.TabIndex = 200;
this.chbShunt.Text = "禁用分流横移1";
this.chbShunt.UseVisualStyleBackColor = true;
this.chbShunt.CheckedChanged += new System.EventHandler(this.chbShunt_CheckedChanged);
//
// chbSaveImage // chbSaveImage
// //
this.chbSaveImage.AutoSize = true; this.chbSaveImage.AutoSize = true;
this.chbSaveImage.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbSaveImage.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbSaveImage.Location = new System.Drawing.Point(19, 125); this.chbSaveImage.Location = new System.Drawing.Point(16, 10);
this.chbSaveImage.Name = "chbSaveImage"; this.chbSaveImage.Name = "chbSaveImage";
this.chbSaveImage.Size = new System.Drawing.Size(112, 24); this.chbSaveImage.Size = new System.Drawing.Size(112, 24);
this.chbSaveImage.TabIndex = 203; this.chbSaveImage.TabIndex = 203;
...@@ -179,7 +258,7 @@ ...@@ -179,7 +258,7 @@
// //
this.chbShunt2.AutoSize = true; this.chbShunt2.AutoSize = true;
this.chbShunt2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbShunt2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt2.Location = new System.Drawing.Point(19, 51); this.chbShunt2.Location = new System.Drawing.Point(8, 86);
this.chbShunt2.Name = "chbShunt2"; this.chbShunt2.Name = "chbShunt2";
this.chbShunt2.Size = new System.Drawing.Size(120, 24); this.chbShunt2.Size = new System.Drawing.Size(120, 24);
this.chbShunt2.TabIndex = 202; this.chbShunt2.TabIndex = 202;
...@@ -191,7 +270,8 @@ ...@@ -191,7 +270,8 @@
// //
this.btnShunt2Reset.BackColor = System.Drawing.Color.White; this.btnShunt2Reset.BackColor = System.Drawing.Color.White;
this.btnShunt2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnShunt2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShunt2Reset.Location = new System.Drawing.Point(19, 80); this.btnShunt2Reset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShunt2Reset.Location = new System.Drawing.Point(16, 88);
this.btnShunt2Reset.Name = "btnShunt2Reset"; this.btnShunt2Reset.Name = "btnShunt2Reset";
this.btnShunt2Reset.Size = new System.Drawing.Size(133, 40); this.btnShunt2Reset.Size = new System.Drawing.Size(133, 40);
this.btnShunt2Reset.TabIndex = 201; this.btnShunt2Reset.TabIndex = 201;
...@@ -203,7 +283,8 @@ ...@@ -203,7 +283,8 @@
// //
this.btnShuntReset.BackColor = System.Drawing.Color.White; this.btnShuntReset.BackColor = System.Drawing.Color.White;
this.btnShuntReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnShuntReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShuntReset.Location = new System.Drawing.Point(19, 6); this.btnShuntReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShuntReset.Location = new System.Drawing.Point(16, 41);
this.btnShuntReset.Name = "btnShuntReset"; this.btnShuntReset.Name = "btnShuntReset";
this.btnShuntReset.Size = new System.Drawing.Size(133, 40); this.btnShuntReset.Size = new System.Drawing.Size(133, 40);
this.btnShuntReset.TabIndex = 199; this.btnShuntReset.TabIndex = 199;
...@@ -211,9 +292,31 @@ ...@@ -211,9 +292,31 @@
this.btnShuntReset.UseVisualStyleBackColor = false; this.btnShuntReset.UseVisualStyleBackColor = false;
this.btnShuntReset.Click += new System.EventHandler(this.btnShuntReset_Click); this.btnShuntReset.Click += new System.EventHandler(this.btnShuntReset_Click);
// //
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(906, 9);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196;
this.lblMoveInfo.Text = "CID";
//
// lblCID
//
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.Location = new System.Drawing.Point(1230, 7);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID";
this.lblCID.Visible = false;
//
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.chbShunt); this.groupBox2.Controls.Add(this.chbShunt);
this.groupBox2.Controls.Add(this.chbShunt2);
this.groupBox2.Controls.Add(this.chbTrayCheck); this.groupBox2.Controls.Add(this.chbTrayCheck);
this.groupBox2.Controls.Add(this.chbBuzzer); this.groupBox2.Controls.Add(this.chbBuzzer);
this.groupBox2.Controls.Add(this.btnClearLog); this.groupBox2.Controls.Add(this.btnClearLog);
...@@ -227,18 +330,6 @@ ...@@ -227,18 +330,6 @@
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Visible = false; this.groupBox2.Visible = false;
// //
// chbShunt
//
this.chbShunt.AutoSize = true;
this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt.Location = new System.Drawing.Point(8, 77);
this.chbShunt.Name = "chbShunt";
this.chbShunt.Size = new System.Drawing.Size(130, 21);
this.chbShunt.TabIndex = 200;
this.chbShunt.Text = "禁用分流横移1功能";
this.chbShunt.UseVisualStyleBackColor = true;
this.chbShunt.CheckedChanged += new System.EventHandler(this.chbShunt_CheckedChanged);
//
// chbTrayCheck // chbTrayCheck
// //
this.chbTrayCheck.AutoSize = true; this.chbTrayCheck.AutoSize = true;
...@@ -256,7 +347,7 @@ ...@@ -256,7 +347,7 @@
// //
this.chbBuzzer.AutoSize = true; this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(8, 47); this.chbBuzzer.Location = new System.Drawing.Point(8, 39);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(87, 21); this.chbBuzzer.Size = new System.Drawing.Size(87, 21);
this.chbBuzzer.TabIndex = 196; this.chbBuzzer.TabIndex = 196;
...@@ -325,24 +416,13 @@ ...@@ -325,24 +416,13 @@
| 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(720, 167); this.logBox.Location = new System.Drawing.Point(720, 235);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(600, 439); this.logBox.Size = new System.Drawing.Size(600, 371);
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);
// //
// lblCID
//
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.Location = new System.Drawing.Point(1287, 4);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID";
this.lblCID.Visible = false;
//
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.chbInStoNG); this.groupBox3.Controls.Add(this.chbInStoNG);
...@@ -356,7 +436,7 @@ ...@@ -356,7 +436,7 @@
this.groupBox3.Controls.Add(this.cmbTray); this.groupBox3.Controls.Add(this.cmbTray);
this.groupBox3.Controls.Add(this.btnUpdateTray); this.groupBox3.Controls.Add(this.btnUpdateTray);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(720, 167); this.groupBox3.Location = new System.Drawing.Point(720, 275);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(600, 61); this.groupBox3.Size = new System.Drawing.Size(600, 61);
this.groupBox3.TabIndex = 197; this.groupBox3.TabIndex = 197;
...@@ -461,16 +541,6 @@ ...@@ -461,16 +541,6 @@
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
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(925, 7);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196;
this.lblMoveInfo.Text = "CID";
//
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.picLine); this.tabPage2.Controls.Add(this.picLine);
...@@ -806,7 +876,10 @@ ...@@ -806,7 +876,10 @@
this.启用蜂鸣器ToolStripMenuItem, this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator16, this.toolStripSeparator16,
this.aGVCancelStateToolStripMenuItem, this.aGVCancelStateToolStripMenuItem,
this.toolStripSeparator17}); this.toolStripSeparator17,
this.启用分流横移1ToolStripMenuItem,
this.toolStripSeparator18,
this.启用分流横移2ToolStripMenuItem});
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 = "运行参数";
...@@ -814,39 +887,57 @@ ...@@ -814,39 +887,57 @@
// 开机自动启动ToolStripMenuItem // 开机自动启动ToolStripMenuItem
// //
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem"; this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(206, 26); this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(207, 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);
// //
// toolStripSeparator15 // toolStripSeparator15
// //
this.toolStripSeparator15.Name = "toolStripSeparator15"; this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(203, 6); this.toolStripSeparator15.Size = new System.Drawing.Size(204, 6);
// //
// 启用蜂鸣器ToolStripMenuItem // 启用蜂鸣器ToolStripMenuItem
// //
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem"; this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(206, 26); this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(207, 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);
// //
// toolStripSeparator16 // toolStripSeparator16
// //
this.toolStripSeparator16.Name = "toolStripSeparator16"; this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(203, 6); this.toolStripSeparator16.Size = new System.Drawing.Size(204, 6);
// //
// aGVCancelStateToolStripMenuItem // aGVCancelStateToolStripMenuItem
// //
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem"; this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(206, 26); this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(207, 26);
this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState"; this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click); this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
// //
// toolStripSeparator17 // toolStripSeparator17
// //
this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6); this.toolStripSeparator17.Size = new System.Drawing.Size(204, 6);
this.toolStripSeparator17.Visible = false; //
// 启用分流横移1ToolStripMenuItem
//
this.启用分流横移1ToolStripMenuItem.Name = "启用分流横移1ToolStripMenuItem";
this.启用分流横移1ToolStripMenuItem.Size = new System.Drawing.Size(207, 26);
this.启用分流横移1ToolStripMenuItem.Text = "✔启用分流横移1";
this.启用分流横移1ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移1ToolStripMenuItem_Click);
//
// toolStripSeparator18
//
this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(204, 6);
//
// 启用分流横移2ToolStripMenuItem
//
this.启用分流横移2ToolStripMenuItem.Name = "启用分流横移2ToolStripMenuItem";
this.启用分流横移2ToolStripMenuItem.Size = new System.Drawing.Size(207, 26);
this.启用分流横移2ToolStripMenuItem.Text = "✔启用分流横移2";
this.启用分流横移2ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移2ToolStripMenuItem_Click);
// //
// FrmLineStore // FrmLineStore
// //
...@@ -871,6 +962,9 @@ ...@@ -871,6 +962,9 @@
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout(); this.tabPage1.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numTrayNum)).EndInit();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
...@@ -967,6 +1061,14 @@ ...@@ -967,6 +1061,14 @@
private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.PictureBox picLine; private System.Windows.Forms.PictureBox picLine;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.NumericUpDown numTrayNum;
private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label lblSelTrayNum;
private System.Windows.Forms.ToolStripMenuItem 启用分流横移1ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator18;
private System.Windows.Forms.ToolStripMenuItem 启用分流横移2ToolStripMenuItem;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -136,7 +136,7 @@ namespace OnlineStore.AssemblyLine ...@@ -136,7 +136,7 @@ namespace OnlineStore.AssemblyLine
} }
if (LineManager.UseBuzzer) if (LineManager.UseBuzzer)
{ {
启用蜂鸣器ToolStripMenuItem.Text =gouStr+ "启用蜂鸣器"; 启用蜂鸣器ToolStripMenuItem.Text = gouStr + "启用蜂鸣器";
} }
else else
{ {
...@@ -177,7 +177,7 @@ namespace OnlineStore.AssemblyLine ...@@ -177,7 +177,7 @@ namespace OnlineStore.AssemblyLine
{ {
string online = "✘"; string online = "✘";
lvi.SubItems.Add(box.CId.ToString()); lvi.SubItems.Add(box.CId.ToString());
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond) if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{ {
online = "✔"; online = "✔";
...@@ -291,14 +291,14 @@ namespace OnlineStore.AssemblyLine ...@@ -291,14 +291,14 @@ namespace OnlineStore.AssemblyLine
//如果料仓还在运行状态，先关闭料仓 //如果料仓还在运行状态，先关闭料仓
if (!lineBean.runStatus.Equals(LineRunStatus.Wait)) if (!lineBean.runStatus.Equals(LineRunStatus.Wait))
{ {
LogUtil.info( "即将退出程序，停止" + lineBean.Name + "运行 "); LogUtil.info("即将退出程序，停止" + lineBean.Name + "运行 ");
lineBean.StopRun(); lineBean.StopRun();
} }
foreach (EquipBase equip in lineBean.AllEquipMap.Values) foreach (EquipBase equip in lineBean.AllEquipMap.Values)
{ {
if (equip.runStatus > LineRunStatus.Wait) if (equip.runStatus > LineRunStatus.Wait)
{ {
LogUtil.info( "即将退出程序，停止" + equip.Name + "运行 "); LogUtil.info("即将退出程序，停止" + equip.Name + "运行 ");
equip.StopRun(); equip.StopRun();
} }
} }
...@@ -352,7 +352,7 @@ namespace OnlineStore.AssemblyLine ...@@ -352,7 +352,7 @@ namespace OnlineStore.AssemblyLine
MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！"); MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！");
return; return;
} }
LogUtil.info( "点击 开始启动"); LogUtil.info("点击 开始启动");
startTimer.Interval = 300; startTimer.Interval = 300;
startTimer.Elapsed += timer_Elapsed; startTimer.Elapsed += timer_Elapsed;
startTimer.AutoReset = false; startTimer.AutoReset = false;
...@@ -454,7 +454,7 @@ namespace OnlineStore.AssemblyLine ...@@ -454,7 +454,7 @@ namespace OnlineStore.AssemblyLine
private void btnClearLog_Click(object sender, EventArgs e) private void btnClearLog_Click(object sender, EventArgs e)
{ {
LogUtil.ClearLog(); LogUtil.ClearLog();
} }
private void btnCopyLog_Click(object sender, EventArgs e) private void btnCopyLog_Click(object sender, EventArgs e)
{ {
...@@ -506,10 +506,10 @@ namespace OnlineStore.AssemblyLine ...@@ -506,10 +506,10 @@ namespace OnlineStore.AssemblyLine
if (process != null) if (process != null)
{ {
StringBuilder sbResult = new StringBuilder(); StringBuilder sbResult = new StringBuilder();
PerformanceCounter pf1 = new PerformanceCounter("Process", "Working Set - Private", process.ProcessName); PerformanceCounter pf1 = new PerformanceCounter("Process", "Working Set - Private", process.ProcessName);
sbResult.AppendFormat(DateTime.Now.ToLongTimeString() + ", 名称：{0} 内存：{1}M ", process.ProcessName, Math.Round(pf1.NextValue() / 1024 / 1024F, 2)); sbResult.AppendFormat(DateTime.Now.ToLongTimeString() + ", 名称：{0} 内存：{1}M ", process.ProcessName, Math.Round(pf1.NextValue() / 1024 / 1024F, 2));
float cpu = curtime.NextValue() / Environment.ProcessorCount; float cpu = curtime.NextValue() / Environment.ProcessorCount;
sbResult.AppendFormat("， CPU : {0} %",cpu); sbResult.AppendFormat("， CPU : {0} %", cpu);
if (cpu >= 10) if (cpu >= 10)
{ {
logMinute = 1; logMinute = 1;
...@@ -535,7 +535,7 @@ namespace OnlineStore.AssemblyLine ...@@ -535,7 +535,7 @@ namespace OnlineStore.AssemblyLine
{ {
return; return;
} }
string canScanCode = ""; string canScanCode = "";
if (AgvClient.CurrCancelState) if (AgvClient.CurrCancelState)
{ {
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState"; aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
...@@ -546,7 +546,7 @@ namespace OnlineStore.AssemblyLine ...@@ -546,7 +546,7 @@ namespace OnlineStore.AssemblyLine
} }
lblStatus.Text = lineBean.GetRunStr() + canScanCode; lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString(); string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time+ LineManager.Line.WarnMsg + "\r\n"; string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n";
lblMoveInfo.Text = LineManager.Line.GetMoveStr(); lblMoveInfo.Text = LineManager.Line.GetMoveStr();
if (TrayManager.TrayErrorMsg.Equals("").Equals(false)) if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
...@@ -561,7 +561,7 @@ namespace OnlineStore.AssemblyLine ...@@ -561,7 +561,7 @@ namespace OnlineStore.AssemblyLine
if (move.alarmType.Equals(LineAlarmType.None).Equals(false)) if (move.alarmType.Equals(LineAlarmType.None).Equals(false))
{ {
warnMsg +=move.LastAlarmTime.ToLongTimeString()+" "+ move.WarnMsg + "\r\n"; warnMsg += move.LastAlarmTime.ToLongTimeString() + " " + move.WarnMsg + "\r\n";
} }
else else
{ {
...@@ -569,7 +569,7 @@ namespace OnlineStore.AssemblyLine ...@@ -569,7 +569,7 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
lblWarnMsg.Text = warnMsg; lblWarnMsg.Text = warnMsg;
if (!listView1.Visible) if (!listView1.Visible)
{ {
...@@ -606,12 +606,12 @@ namespace OnlineStore.AssemblyLine ...@@ -606,12 +606,12 @@ namespace OnlineStore.AssemblyLine
} }
else else
{ {
SetItemText(i, item_cid_index, ""); SetItemText(i, item_cid_index, "");
SetItemText(i, item_LastMsgTime_index, ""); SetItemText(i, item_LastMsgTime_index, "");
SetItemText(i, item_SAlarmType_index, ""); SetItemText(i, item_SAlarmType_index, "");
SetItemText(i, item_BoxStr_index, ""); SetItemText(i, item_BoxStr_index, "");
} }
SetItemColor(i, move.runStatus,move.alarmType); SetItemColor(i, move.runStatus, move.alarmType);
i++; i++;
} }
i++; i++;
...@@ -668,6 +668,7 @@ namespace OnlineStore.AssemblyLine ...@@ -668,6 +668,7 @@ namespace OnlineStore.AssemblyLine
{ {
chbAGV.Checked = AgvClient.CurrCancelState; chbAGV.Checked = AgvClient.CurrCancelState;
} }
numTrayNum_ValueChanged(null, null);
} }
private void SetItemColor(int i, LineRunStatus runStatus, LineAlarmType alarmType) private void SetItemColor(int i, LineRunStatus runStatus, LineAlarmType alarmType)
...@@ -924,11 +925,11 @@ namespace OnlineStore.AssemblyLine ...@@ -924,11 +925,11 @@ namespace OnlineStore.AssemblyLine
foreach (TrayInfo t in tray) foreach (TrayInfo t in tray)
{ {
LogUtil.info(t.ToStr()); LogUtil.info(t.ToStr());
msg += t.ToStr()+ "\r\n"; msg += t.ToStr() + "\r\n";
} }
LogUtil.info("-------------------结束打印托盘信息"); LogUtil.info("-------------------结束打印托盘信息");
msg += "-------------------结束打印托盘信息"; msg += "-------------------结束打印托盘信息";
MessageBox.Show(msg,"托盘信息列表"); MessageBox.Show(msg, "托盘信息列表");
} }
//private void btnClearTray_Click(object sender, EventArgs e) //private void btnClearTray_Click(object sender, EventArgs e)
...@@ -1092,7 +1093,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1092,7 +1093,7 @@ namespace OnlineStore.AssemblyLine
{ {
return; return;
} }
lineBean.DisableShunt = (chbShunt.Checked); lineBean.DisableShunt = (chbShunt.Checked);
LogUtil.info("勾选 禁用分流横移1功能：lineBean.DisableShunt =" + lineBean.DisableShunt); LogUtil.info("勾选 禁用分流横移1功能：lineBean.DisableShunt =" + lineBean.DisableShunt);
} }
...@@ -1212,5 +1213,81 @@ namespace OnlineStore.AssemblyLine ...@@ -1212,5 +1213,81 @@ namespace OnlineStore.AssemblyLine
FrmDisableTray frm = new FrmDisableTray(); FrmDisableTray frm = new FrmDisableTray();
frm.ShowDialog(); frm.ShowDialog();
} }
private void numTrayNum_ValueChanged(object sender, EventArgs e)
{
try
{
int trayNum = (int)numTrayNum.Value;
if (trayNum >= 0)
{
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
lblSelTrayNum.Text = tray.ToStr();
}
}catch(Exception ex)
{
}
}
private void btnClear_Click(object sender, EventArgs e)
{
int num = (int)numTrayNum.Value;
if (num < 1)
{
MessageBox.Show("请输入大于1的托盘号", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
return;
}
TrayInfo tray = TrayManager.GetTrayInfo(num);
DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
TrayManager.ClearInstore(tray,"手动清空托盘");
TrayManager.UpdateTrayInfo(num);
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("界面点击手动清空托盘，清空前【" + tray.ToStr() + "】，清空后：" + info.ToStr());
}
}
private void 启用分流横移1ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (启用分流横移1ToolStripMenuItem.Text.Contains(gouStr))
{
启用分流横移1ToolStripMenuItem.Text = "启用分流横移1";
lineBean.DisableShunt = true;
}
else
{
启用分流横移1ToolStripMenuItem.Text = gouStr + "启用分流横移1";
lineBean.DisableShunt = false ;
}
LogUtil.info(Name + " 点击：" + 启用分流横移1ToolStripMenuItem.Text + "，lineBean.DisableShunt=" + lineBean.DisableShunt);
}
private void 启用分流横移2ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (启用分流横移2ToolStripMenuItem.Text.Contains(gouStr))
{
启用分流横移2ToolStripMenuItem.Text = "启用分流横移2";
lineBean.DisableShunt2 = true;
}
else
{
启用分流横移2ToolStripMenuItem.Text = gouStr + "启用分流横移2";
lineBean.DisableShunt2 = false;
}
LogUtil.info(Name + " 点击：" + 启用分流横移2ToolStripMenuItem.Text+ "，lineBean.DisableShunt2="+ lineBean.DisableShunt2);
}
} }
} }
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -88,6 +88,10 @@ ...@@ -88,6 +88,10 @@
this.txtP2 = new System.Windows.Forms.TextBox(); this.txtP2 = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.lblName = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.txtPosId = new System.Windows.Forms.TextBox();
this.btnClear = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -100,6 +104,7 @@ ...@@ -100,6 +104,7 @@
this.groupDetial.SuspendLayout(); this.groupDetial.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.groupBox8.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -255,7 +260,7 @@ ...@@ -255,7 +260,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6); this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 467); this.groupBox4.Size = new System.Drawing.Size(240, 469);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -273,7 +278,7 @@ ...@@ -273,7 +278,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 447); this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 449);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -283,7 +288,7 @@ ...@@ -283,7 +288,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6); this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 467); this.groupBox3.Size = new System.Drawing.Size(240, 469);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -301,7 +306,7 @@ ...@@ -301,7 +306,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 447); this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 449);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
...@@ -434,7 +439,7 @@ ...@@ -434,7 +439,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(274, 64); this.lblThisSta.Location = new System.Drawing.Point(274, 64);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(528, 132); this.lblThisSta.Size = new System.Drawing.Size(528, 75);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -525,14 +530,15 @@ ...@@ -525,14 +530,15 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(5, 54); this.tabControl1.Location = new System.Drawing.Point(5, 53);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1323, 513); this.tabControl1.Size = new System.Drawing.Size(1323, 515);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.groupBox8);
this.tabPage1.Controls.Add(this.groupBox6); this.tabPage1.Controls.Add(this.groupBox6);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
...@@ -541,7 +547,7 @@ ...@@ -541,7 +547,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1315, 480); this.tabPage1.Size = new System.Drawing.Size(1315, 485);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -556,9 +562,9 @@ ...@@ -556,9 +562,9 @@
this.groupBox6.Controls.Add(this.lblMoveInfo); this.groupBox6.Controls.Add(this.lblMoveInfo);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(498, 156); this.groupBox6.Location = new System.Drawing.Point(498, 155);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(808, 314); this.groupBox6.Size = new System.Drawing.Size(808, 259);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
...@@ -567,7 +573,7 @@ ...@@ -567,7 +573,7 @@
// //
this.chbUseTrayCheck.AutoSize = true; this.chbUseTrayCheck.AutoSize = true;
this.chbUseTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbUseTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseTrayCheck.Location = new System.Drawing.Point(9, 271); this.chbUseTrayCheck.Location = new System.Drawing.Point(9, 228);
this.chbUseTrayCheck.Name = "chbUseTrayCheck"; this.chbUseTrayCheck.Name = "chbUseTrayCheck";
this.chbUseTrayCheck.Size = new System.Drawing.Size(112, 24); this.chbUseTrayCheck.Size = new System.Drawing.Size(112, 24);
this.chbUseTrayCheck.TabIndex = 282; this.chbUseTrayCheck.TabIndex = 282;
...@@ -602,7 +608,7 @@ ...@@ -602,7 +608,7 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(274, 180); this.lblInstoreList.Location = new System.Drawing.Point(274, 137);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(528, 115); this.lblInstoreList.Size = new System.Drawing.Size(528, 115);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
...@@ -1023,6 +1029,48 @@ ...@@ -1023,6 +1029,48 @@
this.lblName.Text = "出料流水线"; this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// groupBox8
//
this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox8.Controls.Add(this.label7);
this.groupBox8.Controls.Add(this.txtPosId);
this.groupBox8.Controls.Add(this.btnClear);
this.groupBox8.Location = new System.Drawing.Point(498, 414);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(808, 63);
this.groupBox8.TabIndex = 280;
this.groupBox8.TabStop = false;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(14, 28);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(47, 17);
this.label7.TabIndex = 284;
this.label7.Text = "库位号:";
//
// txtPosId
//
this.txtPosId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosId.Location = new System.Drawing.Point(72, 23);
this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(150, 26);
this.txtPosId.TabIndex = 283;
//
// btnClear
//
this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(233, 19);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 286;
this.btnClear.Text = "清空入库任务";
this.btnClear.UseVisualStyleBackColor = false;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// FrmMoveEquip // FrmMoveEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -1056,6 +1104,8 @@ ...@@ -1056,6 +1104,8 @@
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.groupBox8.ResumeLayout(false);
this.groupBox8.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -1133,6 +1183,10 @@ ...@@ -1133,6 +1183,10 @@
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.ComboBox cmbP3Width; private System.Windows.Forms.ComboBox cmbP3Width;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.Windows.Forms.GroupBox groupBox8;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtPosId;
private System.Windows.Forms.Button btnClear;
} }
} }
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -679,6 +679,39 @@ namespace OnlineStore.AssemblyLine ...@@ -679,6 +679,39 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
private void btnClear_Click(object sender, EventArgs e)
{
string posId = txtPosId.Text.Trim();
if (String.IsNullOrEmpty(posId))
{
MessageBox.Show("请输入正确的库位号", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
txtPosId.Focus();
return;
}
LogUtil.info("点击 " + btnClear.Text + " , 库位号[" + posId + "]");
InOutParam param = null;
List<InOutParam> paramList = new List<InOutParam>(equipBean.waitInStoreList);
foreach (InOutParam p in paramList)
{
if (p.PosId.Equals(posId))
{
param = p;
break;
}
}
if (param == null)
{
MessageBox.Show("未找到对应的任务，请输入正确的库位号", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
txtPosId.Focus();
return;
}
else
{
equipBean.RemoveInStore(param, "手动清除入库任务");
txtPosId.Clear();
}
}
} }
} }
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -385,7 +385,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -385,7 +385,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
#endregion #endregion
} }
} }
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -677,7 +677,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -677,7 +677,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
internal bool RemoveInStore(InOutParam param, string logName = "料盘已移走") public bool RemoveInStore(InOutParam param, string logName = "料盘已移走")
{ {
if (waitInStoreList.Count > 0) if (waitInStoreList.Count > 0)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!