From 1bc2df66bc88a6405df345dccc24a5031e18b592 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 21 十二月 2020 09:54:48 +0800
Subject: [PATCH] 1. gocator添加byte2/byte4的配置,目前测试byte4不成功,暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码上传功能

---
 src/Bro.UI.Config/MenuForms/FrmOperation.Designer.cs |  157 ++++++++++++++++++++++++---------------------------
 1 files changed, 74 insertions(+), 83 deletions(-)

diff --git a/src/Bro.UI.Config/MenuForms/FrmOperation.Designer.cs b/src/Bro.UI.Config/MenuForms/FrmOperation.Designer.cs
index 6e021e7..8377642 100644
--- a/src/Bro.UI.Config/MenuForms/FrmOperation.Designer.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmOperation.Designer.cs
@@ -31,39 +31,71 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmOperation));
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.btnStart = new System.Windows.Forms.Button();
+            this.imgList = new System.Windows.Forms.ImageList(this.components);
             this.plProcess = new System.Windows.Forms.Panel();
             this.cboProcessCode = new System.Windows.Forms.ComboBox();
             this.lblProcessCode = new System.Windows.Forms.Label();
+            this.btnLoad = new System.Windows.Forms.Button();
+            this.imgListLoad = new System.Windows.Forms.ImageList(this.components);
             this.plProduct = new System.Windows.Forms.Panel();
             this.cboProductionCode = new System.Windows.Forms.ComboBox();
             this.lblProductionCode = new System.Windows.Forms.Label();
-            this.plOperation = new System.Windows.Forms.Panel();
-            this.btnStart = new System.Windows.Forms.Button();
-            this.imgList = new System.Windows.Forms.ImageList(this.components);
-            this.btnLoad = new System.Windows.Forms.Button();
-            this.imgListLoad = new System.Windows.Forms.ImageList(this.components);
             this.tableLayoutPanel1.SuspendLayout();
             this.plProcess.SuspendLayout();
             this.plProduct.SuspendLayout();
-            this.plOperation.SuspendLayout();
             this.SuspendLayout();
             // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 1;
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Controls.Add(this.plProcess, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.plProduct, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.plOperation, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.btnStart, 0, 7);
+            this.tableLayoutPanel1.Controls.Add(this.plProcess, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.btnLoad, 0, 5);
+            this.tableLayoutPanel1.Controls.Add(this.plProduct, 0, 3);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(15, 3, 15, 3);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
+            this.tableLayoutPanel1.RowCount = 9;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 5F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(184, 214);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(184, 427);
             this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // btnStart
+            // 
+            this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnStart.AutoSize = true;
+            this.btnStart.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnStart.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnStart.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btnStart.ImageIndex = 0;
+            this.btnStart.ImageList = this.imgList;
+            this.btnStart.Location = new System.Drawing.Point(3, 132);
+            this.btnStart.Name = "btnStart";
+            this.btnStart.Size = new System.Drawing.Size(178, 35);
+            this.btnStart.TabIndex = 1;
+            this.btnStart.Text = "  鍚�  鍔�";
+            this.btnStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.btnStart.UseVisualStyleBackColor = true;
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // imgList
+            // 
+            this.imgList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList.ImageStream")));
+            this.imgList.TransparentColor = System.Drawing.Color.Transparent;
+            this.imgList.Images.SetKeyName(0, "start_32px.png");
+            this.imgList.Images.SetKeyName(1, "stop_32px.png");
             // 
             // plProcess
             // 
@@ -71,7 +103,7 @@
             this.plProcess.Controls.Add(this.cboProcessCode);
             this.plProcess.Controls.Add(this.lblProcessCode);
             this.plProcess.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.plProcess.Location = new System.Drawing.Point(3, 3);
+            this.plProcess.Location = new System.Drawing.Point(3, 8);
             this.plProcess.Name = "plProcess";
             this.plProcess.Size = new System.Drawing.Size(178, 29);
             this.plProcess.TabIndex = 0;
@@ -90,11 +122,36 @@
             // lblProcessCode
             // 
             this.lblProcessCode.AutoSize = true;
-            this.lblProcessCode.Location = new System.Drawing.Point(4, 11);
+            this.lblProcessCode.Location = new System.Drawing.Point(4, 8);
             this.lblProcessCode.Name = "lblProcessCode";
             this.lblProcessCode.Size = new System.Drawing.Size(67, 13);
             this.lblProcessCode.TabIndex = 0;
             this.lblProcessCode.Text = "娴佺▼浠g爜锛�";
+            // 
+            // btnLoad
+            // 
+            this.btnLoad.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnLoad.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnLoad.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnLoad.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.btnLoad.ImageKey = "load_32px.png";
+            this.btnLoad.ImageList = this.imgListLoad;
+            this.btnLoad.Location = new System.Drawing.Point(3, 86);
+            this.btnLoad.Name = "btnLoad";
+            this.btnLoad.Size = new System.Drawing.Size(178, 35);
+            this.btnLoad.TabIndex = 0;
+            this.btnLoad.Text = "  杞�  鍏�";
+            this.btnLoad.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.btnLoad.UseMnemonic = false;
+            this.btnLoad.UseVisualStyleBackColor = false;
+            this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click);
+            // 
+            // imgListLoad
+            // 
+            this.imgListLoad.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgListLoad.ImageStream")));
+            this.imgListLoad.TransparentColor = System.Drawing.Color.Transparent;
+            this.imgListLoad.Images.SetKeyName(0, "load_32px.png");
             // 
             // plProduct
             // 
@@ -102,7 +159,7 @@
             this.plProduct.Controls.Add(this.cboProductionCode);
             this.plProduct.Controls.Add(this.lblProductionCode);
             this.plProduct.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.plProduct.Location = new System.Drawing.Point(3, 38);
+            this.plProduct.Location = new System.Drawing.Point(3, 48);
             this.plProduct.Name = "plProduct";
             this.plProduct.Size = new System.Drawing.Size(178, 27);
             this.plProduct.TabIndex = 1;
@@ -121,79 +178,16 @@
             // lblProductionCode
             // 
             this.lblProductionCode.AutoSize = true;
-            this.lblProductionCode.Location = new System.Drawing.Point(4, 9);
+            this.lblProductionCode.Location = new System.Drawing.Point(4, 6);
             this.lblProductionCode.Name = "lblProductionCode";
             this.lblProductionCode.Size = new System.Drawing.Size(67, 13);
             this.lblProductionCode.TabIndex = 0;
             this.lblProductionCode.Text = "浜у搧浠g爜锛�";
             // 
-            // plOperation
-            // 
-            this.plOperation.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.plOperation.Controls.Add(this.btnStart);
-            this.plOperation.Controls.Add(this.btnLoad);
-            this.plOperation.Location = new System.Drawing.Point(3, 71);
-            this.plOperation.Name = "plOperation";
-            this.plOperation.Size = new System.Drawing.Size(178, 140);
-            this.plOperation.TabIndex = 2;
-            // 
-            // btnStart
-            // 
-            this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnStart.AutoSize = true;
-            this.btnStart.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnStart.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStart.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.btnStart.ImageIndex = 0;
-            this.btnStart.ImageList = this.imgList;
-            this.btnStart.Location = new System.Drawing.Point(10, 82);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(150, 35);
-            this.btnStart.TabIndex = 1;
-            this.btnStart.Text = "  鍚�  鍔�";
-            this.btnStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-            this.btnStart.UseVisualStyleBackColor = true;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
-            // imgList
-            // 
-            this.imgList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList.ImageStream")));
-            this.imgList.TransparentColor = System.Drawing.Color.Transparent;
-            this.imgList.Images.SetKeyName(0, "start_32px.png");
-            this.imgList.Images.SetKeyName(1, "stop_32px.png");
-            // 
-            // btnLoad
-            // 
-            this.btnLoad.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLoad.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnLoad.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnLoad.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.btnLoad.ImageKey = "load_32px.png";
-            this.btnLoad.ImageList = this.imgListLoad;
-            this.btnLoad.Location = new System.Drawing.Point(10, 24);
-            this.btnLoad.Name = "btnLoad";
-            this.btnLoad.Size = new System.Drawing.Size(150, 35);
-            this.btnLoad.TabIndex = 0;
-            this.btnLoad.Text = "  杞�  鍏�";
-            this.btnLoad.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-            this.btnLoad.UseMnemonic = false;
-            this.btnLoad.UseVisualStyleBackColor = false;
-            this.btnLoad.Click += new System.EventHandler(this.btnLoad_Click);
-            // 
-            // imgListLoad
-            // 
-            this.imgListLoad.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgListLoad.ImageStream")));
-            this.imgListLoad.TransparentColor = System.Drawing.Color.Transparent;
-            this.imgListLoad.Images.SetKeyName(0, "load_32px.png");
-            // 
             // FrmOperation
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.ClientSize = new System.Drawing.Size(184, 214);
+            this.ClientSize = new System.Drawing.Size(184, 427);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Name = "FrmOperation";
             this.Text = "FrmOperation";
@@ -204,8 +198,6 @@
             this.plProcess.PerformLayout();
             this.plProduct.ResumeLayout(false);
             this.plProduct.PerformLayout();
-            this.plOperation.ResumeLayout(false);
-            this.plOperation.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -215,7 +207,6 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.Panel plProcess;
         private System.Windows.Forms.Panel plProduct;
-        private System.Windows.Forms.Panel plOperation;
         private System.Windows.Forms.ComboBox cboProcessCode;
         private System.Windows.Forms.Label lblProcessCode;
         private System.Windows.Forms.ComboBox cboProductionCode;

--
Gitblit v1.8.0