Skip to content

李娜 / SO664-AssemblyLine

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

进仓显示顺序修改

1 个父辈 46fb9bbd
内嵌 并排
正在显示 2 个修改的文件 包含 390 行增加 和 117 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -53,14 +53,6 @@ ...@@ -53,14 +53,6 @@
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();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.lblOpText = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
...@@ -75,6 +67,14 @@ ...@@ -75,6 +67,14 @@
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();
this.panel1 = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.lblOpText = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.lblStatus = new System.Windows.Forms.Label(); this.lblStatus = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
...@@ -134,6 +134,24 @@ ...@@ -134,6 +134,24 @@
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.label8 = new System.Windows.Forms.Label();
this.panel6 = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
this.panel7 = new System.Windows.Forms.Panel();
this.label15 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.panel8 = new System.Windows.Forms.Panel();
this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.panel9 = new System.Windows.Forms.Panel();
this.label19 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.panel10 = new System.Windows.Forms.Panel();
this.label21 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.panel11 = new System.Windows.Forms.Panel();
this.label23 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -141,7 +159,6 @@ ...@@ -141,7 +159,6 @@
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout();
...@@ -149,9 +166,16 @@ ...@@ -149,9 +166,16 @@
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.panel5.SuspendLayout(); this.panel5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit();
this.panel1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.contextMenuStrip_control.SuspendLayout(); this.contextMenuStrip_control.SuspendLayout();
this.panel6.SuspendLayout();
this.panel7.SuspendLayout();
this.panel8.SuspendLayout();
this.panel9.SuspendLayout();
this.panel10.SuspendLayout();
this.panel11.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tabControl1 // tabControl1
...@@ -412,116 +436,31 @@ ...@@ -412,116 +436,31 @@
// //
// tableLayoutPanel1 // tableLayoutPanel1
// //
this.tableLayoutPanel1.ColumnCount = 5; this.tableLayoutPanel1.ColumnCount = 6;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.Controls.Add(this.panel1, 4, 4); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.Controls.Add(this.panel11, 4, 2);
this.tableLayoutPanel1.Controls.Add(this.panel6, 1, 2);
this.tableLayoutPanel1.Controls.Add(this.panel7, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.panel8, 2, 2);
this.tableLayoutPanel1.Controls.Add(this.panel9, 3, 2);
this.tableLayoutPanel1.Controls.Add(this.panel10, 5, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 5; this.tableLayoutPanel1.RowCount = 5;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1328, 641); this.tableLayoutPanel1.Size = new System.Drawing.Size(1328, 641);
this.tableLayoutPanel1.TabIndex = 10; this.tableLayoutPanel1.TabIndex = 10;
// //
// panel1
//
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.lblOpText);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.lblCID);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Location = new System.Drawing.Point(1063, 515);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(262, 119);
this.panel1.TabIndex = 202;
//
// label3
//
this.label3.BackColor = System.Drawing.Color.LightGray;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label3.Location = new System.Drawing.Point(7, 98);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 18);
this.label3.TabIndex = 202;
this.label3.Text = "灰色：暂未启用";
//
// lblOpText
//
this.lblOpText.BackColor = System.Drawing.Color.White;
this.lblOpText.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText.Location = new System.Drawing.Point(122, 98);
this.lblOpText.Name = "lblOpText";
this.lblOpText.Size = new System.Drawing.Size(109, 18);
this.lblOpText.TabIndex = 201;
this.lblOpText.Text = "双击进入详情界面";
//
// label1
//
this.label1.BackColor = System.Drawing.Color.LightBlue;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label1.Location = new System.Drawing.Point(7, 3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 18);
this.label1.TabIndex = 197;
this.label1.Text = "蓝色：正常待机中";
//
// label7
//
this.label7.BackColor = System.Drawing.Color.Red;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label7.Location = new System.Drawing.Point(7, 79);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(109, 18);
this.label7.TabIndex = 200;
this.label7.Text = "红色：严重报警";
//
// lblCID
//
this.lblCID.BackColor = System.Drawing.Color.Orange;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblCID.Location = new System.Drawing.Point(7, 41);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(109, 18);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "橘色：复位中";
//
// label6
//
this.label6.BackColor = System.Drawing.Color.LightCoral;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label6.Location = new System.Drawing.Point(7, 60);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 18);
this.label6.TabIndex = 199;
this.label6.Text = "珊瑚色：信号超时报警";
//
// label5
//
this.label5.BackColor = System.Drawing.Color.LightGreen;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label5.Location = new System.Drawing.Point(7, 22);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(109, 18);
this.label5.TabIndex = 198;
this.label5.Text = "绿色：忙碌中";
//
// tabPage3 // tabPage3
// //
this.tabPage3.Controls.Add(this.panel3); this.tabPage3.Controls.Add(this.panel3);
...@@ -685,6 +624,98 @@ ...@@ -685,6 +624,98 @@
this.picLine.TabIndex = 107; this.picLine.TabIndex = 107;
this.picLine.TabStop = false; this.picLine.TabStop = false;
// //
// panel1
//
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.lblOpText);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.lblCID);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Location = new System.Drawing.Point(1007, 32);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(215, 119);
this.panel1.TabIndex = 202;
this.panel1.Visible = false;
//
// label3
//
this.label3.BackColor = System.Drawing.Color.LightGray;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label3.Location = new System.Drawing.Point(7, 98);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 18);
this.label3.TabIndex = 202;
this.label3.Text = "灰色：暂未启用";
//
// lblOpText
//
this.lblOpText.BackColor = System.Drawing.Color.White;
this.lblOpText.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText.Location = new System.Drawing.Point(122, 98);
this.lblOpText.Name = "lblOpText";
this.lblOpText.Size = new System.Drawing.Size(109, 18);
this.lblOpText.TabIndex = 201;
this.lblOpText.Text = "双击进入详情界面";
//
// label1
//
this.label1.BackColor = System.Drawing.Color.LightBlue;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label1.Location = new System.Drawing.Point(7, 3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 18);
this.label1.TabIndex = 197;
this.label1.Text = "蓝色：正常待机中";
//
// label7
//
this.label7.BackColor = System.Drawing.Color.Red;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label7.Location = new System.Drawing.Point(7, 79);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(109, 18);
this.label7.TabIndex = 200;
this.label7.Text = "红色：严重报警";
//
// lblCID
//
this.lblCID.BackColor = System.Drawing.Color.Orange;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblCID.Location = new System.Drawing.Point(7, 41);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(109, 18);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "橘色：复位中";
//
// label6
//
this.label6.BackColor = System.Drawing.Color.LightCoral;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label6.Location = new System.Drawing.Point(7, 60);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 18);
this.label6.TabIndex = 199;
this.label6.Text = "珊瑚色：信号超时报警";
//
// label5
//
this.label5.BackColor = System.Drawing.Color.LightGreen;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label5.Location = new System.Drawing.Point(7, 22);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(109, 18);
this.label5.TabIndex = 198;
this.label5.Text = "绿色：忙碌中";
//
// lblStatus // lblStatus
// //
this.lblStatus.AutoSize = true; this.lblStatus.AutoSize = true;
...@@ -1120,11 +1151,222 @@ ...@@ -1120,11 +1151,222 @@
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);
// //
// label8
//
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(28, 5);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(70, 35);
this.label8.TabIndex = 0;
this.label8.Text = "D2 ↑";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel6
//
this.panel6.BackColor = System.Drawing.Color.Transparent;
this.panel6.Controls.Add(this.label9);
this.panel6.Controls.Add(this.label8);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel6.Location = new System.Drawing.Point(224, 297);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(215, 45);
this.panel6.TabIndex = 1;
//
// label9
//
this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(103, 5);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(70, 35);
this.label9.TabIndex = 1;
this.label9.Text = "D8 ↓";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel7
//
this.panel7.BackColor = System.Drawing.Color.Transparent;
this.panel7.Controls.Add(this.label15);
this.panel7.Controls.Add(this.label16);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel7.Location = new System.Drawing.Point(3, 297);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(215, 45);
this.panel7.TabIndex = 2;
//
// label15
//
this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.Location = new System.Drawing.Point(103, 5);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(70, 35);
this.label15.TabIndex = 1;
this.label15.Text = "D7 ↓";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label16
//
this.label16.BackColor = System.Drawing.Color.Transparent;
this.label16.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.Location = new System.Drawing.Point(28, 5);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(70, 35);
this.label16.TabIndex = 0;
this.label16.Text = "D1 ↑";
this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel8
//
this.panel8.BackColor = System.Drawing.Color.Transparent;
this.panel8.Controls.Add(this.label17);
this.panel8.Controls.Add(this.label18);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel8.Location = new System.Drawing.Point(445, 297);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(215, 45);
this.panel8.TabIndex = 3;
//
// label17
//
this.label17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Location = new System.Drawing.Point(103, 5);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(70, 35);
this.label17.TabIndex = 1;
this.label17.Text = "D9 ↓";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label18
//
this.label18.BackColor = System.Drawing.Color.Transparent;
this.label18.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(28, 5);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(70, 35);
this.label18.TabIndex = 0;
this.label18.Text = "D3 ↑";
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel9
//
this.panel9.BackColor = System.Drawing.Color.Transparent;
this.panel9.Controls.Add(this.label19);
this.panel9.Controls.Add(this.label20);
this.panel9.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel9.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel9.Location = new System.Drawing.Point(666, 297);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(215, 45);
this.panel9.TabIndex = 4;
//
// label19
//
this.label19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.Location = new System.Drawing.Point(103, 5);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(76, 35);
this.label19.TabIndex = 1;
this.label19.Text = "D10 ↓";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label20
//
this.label20.BackColor = System.Drawing.Color.Transparent;
this.label20.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.Location = new System.Drawing.Point(28, 5);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(70, 35);
this.label20.TabIndex = 0;
this.label20.Text = "D4 ↑";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel10
//
this.panel10.BackColor = System.Drawing.Color.Transparent;
this.panel10.Controls.Add(this.label21);
this.panel10.Controls.Add(this.label22);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel10.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel10.Location = new System.Drawing.Point(1108, 297);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(217, 45);
this.panel10.TabIndex = 5;
//
// label21
//
this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.Location = new System.Drawing.Point(105, 5);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(76, 35);
this.label21.TabIndex = 1;
this.label21.Text = "D12 ↓";
this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label22
//
this.label22.BackColor = System.Drawing.Color.Transparent;
this.label22.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.Location = new System.Drawing.Point(28, 5);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(70, 35);
this.label22.TabIndex = 0;
this.label22.Text = "D6 ↑";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel11
//
this.panel11.BackColor = System.Drawing.Color.Transparent;
this.panel11.Controls.Add(this.label23);
this.panel11.Controls.Add(this.label24);
this.panel11.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel11.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel11.Location = new System.Drawing.Point(887, 297);
this.panel11.Name = "panel11";
this.panel11.Size = new System.Drawing.Size(215, 45);
this.panel11.TabIndex = 2;
//
// label23
//
this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.Location = new System.Drawing.Point(103, 5);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(76, 35);
this.label23.TabIndex = 1;
this.label23.Text = "D11 ↓";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label24
//
this.label24.BackColor = System.Drawing.Color.Transparent;
this.label24.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.Location = new System.Drawing.Point(28, 5);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(70, 35);
this.label24.TabIndex = 0;
this.label24.Text = "D5 ↑";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmLineStore // FrmLineStore
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1350, 761); this.ClientSize = new System.Drawing.Size(1350, 761);
this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
...@@ -1149,7 +1391,6 @@ ...@@ -1149,7 +1391,6 @@
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.panel3.ResumeLayout(false); this.panel3.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false);
...@@ -1158,10 +1399,17 @@ ...@@ -1158,10 +1399,17 @@
this.tabPage5.PerformLayout(); this.tabPage5.PerformLayout();
this.panel5.ResumeLayout(false); this.panel5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picLine)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picLine)).EndInit();
this.panel1.ResumeLayout(false);
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.contextMenuStrip_control.ResumeLayout(false); this.contextMenuStrip_control.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.panel7.ResumeLayout(false);
this.panel8.ResumeLayout(false);
this.panel9.ResumeLayout(false);
this.panel10.ResumeLayout(false);
this.panel11.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -1273,6 +1521,24 @@ ...@@ -1273,6 +1521,24 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox chbTrayTest; private System.Windows.Forms.CheckBox chbTrayTest;
private System.Windows.Forms.Panel panel6;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Panel panel11;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Panel panel8;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.Panel panel9;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Panel panel10;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.Label label22;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -795,16 +795,23 @@ namespace OnlineStore.AssemblyLine ...@@ -795,16 +795,23 @@ namespace OnlineStore.AssemblyLine
List<HYEquipBase> hyList = new List<HYEquipBase>(lineBean.HYEquipMap.Values); List<HYEquipBase> hyList = new List<HYEquipBase>(lineBean.HYEquipMap.Values);
int num = 0; int num = 0;
for (int i = 0; i < moveEquipList.Count; i++) List<int> moveIDList = new List<int>() { 1,3,5,7,9,11,2,4,6,8,10,12,13,15,17,19,21,23,14,16,18,20,22,24 };
//for (int i = 0; i < moveEquipList.Count; i++)
foreach(int i in moveIDList)
{ {
MoveEquip equip = moveEquipList[i]; int index = i - 1;
MoveEquip equip = moveEquipList[index];
EquipControl control = EquipControl.NewControl(equip); EquipControl control = EquipControl.NewControl(equip);
control.DoubleClick += Control_DoubleClick; control.DoubleClick += Control_DoubleClick;
control.ContextMenuStrip = contextMenuStrip_control; control.ContextMenuStrip = contextMenuStrip_control;
control.MouseEnter += Control_Click; control.MouseEnter += Control_Click;
int row = num / 5; int row = num / 6;
int col = num % 5; int col = num % 6;
if (row > 1)
{
row = row + 1;
}
this.tableLayoutPanel1.Controls.Add(control, col, row); this.tableLayoutPanel1.Controls.Add(control, col, row);
equipControls1.Add(equip.DeviceID, control); equipControls1.Add(equip.DeviceID, control);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!