(1)修改DbFind的输入框，将点击图片移到框外，输入框的长度随父窗体变化，(2)上料采集获取采集物料时对pr_tracekind为空的进行了除了

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.Designer.cs

@@ -28,11 +28,25 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.TextBox = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Search_Icon = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.TextBox = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).BeginInit();
             this.SuspendLayout();
             // 
+            // Search_Icon
+            // 
+            this.Search_Icon.AllPower = null;
+            this.Search_Icon.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Search_Icon.Dock = System.Windows.Forms.DockStyle.Right;
+            this.Search_Icon.Image = global::UAS_MES.Properties.Resources.search;
+            this.Search_Icon.Location = new System.Drawing.Point(183, 0);
+            this.Search_Icon.Name = "Search_Icon";
+            this.Search_Icon.Power = "";
+            this.Search_Icon.Size = new System.Drawing.Size(21, 21);
+            this.Search_Icon.TabIndex = 1;
+            this.Search_Icon.TabStop = false;
+            this.Search_Icon.Click += new System.EventHandler(this.Search_Icon_Click);
+            // 
             // TextBox
             // 
             this.TextBox.AllPower = null;
@@ -42,7 +56,7 @@
             this.TextBox.Location = new System.Drawing.Point(0, 0);
             this.TextBox.Name = "TextBox";
             this.TextBox.Power = null;
-            this.TextBox.Size = new System.Drawing.Size(225, 25);
+            this.TextBox.Size = new System.Drawing.Size(178, 21);
             this.TextBox.Str = null;
             this.TextBox.Str1 = null;
             this.TextBox.Str2 = null;
@@ -52,28 +66,14 @@
             this.TextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBox_KeyDown);
             this.TextBox.Leave += new System.EventHandler(this.TextBox_Leave);
             // 
-            // Search_Icon
-            // 
-            this.Search_Icon.AllPower = null;
-            this.Search_Icon.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.Search_Icon.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Search_Icon.Image = global::UAS_MES.Properties.Resources.search;
-            this.Search_Icon.Location = new System.Drawing.Point(227, 1);
-            this.Search_Icon.Name = "Search_Icon";
-            this.Search_Icon.Power = "";
-            this.Search_Icon.Size = new System.Drawing.Size(19, 23);
-            this.Search_Icon.TabIndex = 1;
-            this.Search_Icon.TabStop = false;
-            this.Search_Icon.Click += new System.EventHandler(this.Search_Icon_Click);
-            // 
             // SearchTextBox
             // 
             this.Controls.Add(this.Search_Icon);
             this.Controls.Add(this.TextBox);
             this.Name = "SearchTextBox";
-            this.Size = new System.Drawing.Size(247, 25);
+            this.Size = new System.Drawing.Size(204, 21);
             this.Load += new System.EventHandler(this.SearchTextBox_Load);
+            this.SizeChanged += new System.EventHandler(this.SearchTextBox_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -82,7 +82,7 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox TextBox;
         private ClickPicBox.ClickPicBox Search_Icon;
+        private EnterTextBox TextBox;
     }
 }

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -316,5 +316,10 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 TextBox.BackColor = System.Drawing.Color.White;
             TextBox.Enabled = TextBoxEnable1;
         }
+
+        private void SearchTextBox_SizeChanged(object sender, EventArgs e)
+        {
+            TextBox.Width = this.Width - Search_Icon.Width-3;
+        }
     }
 }

UAS-MES/Form1.Designer.cs

@@ -35,12 +35,14 @@
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
             this.ct_coll = new System.Windows.Forms.DataVisualization.Charting.Chart();
+            this.searchTextBox2 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.searchTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.serialPortCombox1 = new UAS_MES.CustomControl.ComBoxWithFocus.SerialPortCombox();
+            this.normalButton3 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.normalButton2 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.TestDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.numOnlyTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.blurSearch1 = new UAS_MES.CustomControl.TextBoxWithIcon.BlurSearch();
-            this.normalButton2 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.normalButton3 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.serialPortCombox1 = new UAS_MES.CustomControl.ComBoxWithFocus.SerialPortCombox();
             ((System.ComponentModel.ISupportInitialize)(this.ct_coll)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.TestDGV)).BeginInit();
             this.SuspendLayout();
@@ -76,7 +78,7 @@
             legend1.Enabled = false;
             legend1.Name = "Legend1";
             this.ct_coll.Legends.Add(legend1);
-            this.ct_coll.Location = new System.Drawing.Point(532, 66);
+            this.ct_coll.Location = new System.Drawing.Point(622, 167);
             this.ct_coll.Margin = new System.Windows.Forms.Padding(2);
             this.ct_coll.Name = "ct_coll";
             this.ct_coll.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.None;
@@ -92,6 +94,84 @@
             this.ct_coll.TabIndex = 5;
             this.ct_coll.Text = "chart1";
             // 
+            // searchTextBox2
+            // 
+            this.searchTextBox2.AllPower = null;
+            this.searchTextBox2.Caller = null;
+            this.searchTextBox2.Condition = null;
+            this.searchTextBox2.DBTitle = null;
+            this.searchTextBox2.FormName = null;
+            this.searchTextBox2.Location = new System.Drawing.Point(396, 67);
+            this.searchTextBox2.Name = "searchTextBox2";
+            this.searchTextBox2.Power = null;
+            this.searchTextBox2.SelectField = null;
+            this.searchTextBox2.SetValueField = null;
+            this.searchTextBox2.Size = new System.Drawing.Size(210, 21);
+            this.searchTextBox2.TabIndex = 14;
+            this.searchTextBox2.TableName = null;
+            this.searchTextBox2.TextBoxEnable = false;
+            // 
+            // searchTextBox1
+            // 
+            this.searchTextBox1.AllPower = null;
+            this.searchTextBox1.Caller = null;
+            this.searchTextBox1.Condition = null;
+            this.searchTextBox1.DBTitle = null;
+            this.searchTextBox1.FormName = null;
+            this.searchTextBox1.Location = new System.Drawing.Point(396, 40);
+            this.searchTextBox1.Name = "searchTextBox1";
+            this.searchTextBox1.Power = null;
+            this.searchTextBox1.SelectField = null;
+            this.searchTextBox1.SetValueField = null;
+            this.searchTextBox1.Size = new System.Drawing.Size(115, 21);
+            this.searchTextBox1.TabIndex = 13;
+            this.searchTextBox1.TableName = null;
+            this.searchTextBox1.TextBoxEnable = false;
+            // 
+            // serialPortCombox1
+            // 
+            this.serialPortCombox1.Location = new System.Drawing.Point(622, 516);
+            this.serialPortCombox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.serialPortCombox1.Name = "serialPortCombox1";
+            this.serialPortCombox1.Size = new System.Drawing.Size(140, 20);
+            this.serialPortCombox1.TabIndex = 12;
+            // 
+            // normalButton3
+            // 
+            this.normalButton3.AllPower = null;
+            this.normalButton3.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton3.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.DownImage")));
+            this.normalButton3.Image = null;
+            this.normalButton3.IsShowBorder = true;
+            this.normalButton3.Location = new System.Drawing.Point(396, 473);
+            this.normalButton3.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.MoveImage")));
+            this.normalButton3.Name = "normalButton3";
+            this.normalButton3.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.NormalImage")));
+            this.normalButton3.Power = null;
+            this.normalButton3.Size = new System.Drawing.Size(91, 28);
+            this.normalButton3.TabIndex = 11;
+            this.normalButton3.Text = "normalButton3";
+            this.normalButton3.UseVisualStyleBackColor = false;
+            this.normalButton3.Click += new System.EventHandler(this.normalButton3_Click);
+            // 
+            // normalButton2
+            // 
+            this.normalButton2.AllPower = null;
+            this.normalButton2.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton2.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.DownImage")));
+            this.normalButton2.Image = null;
+            this.normalButton2.IsShowBorder = true;
+            this.normalButton2.Location = new System.Drawing.Point(396, 424);
+            this.normalButton2.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.MoveImage")));
+            this.normalButton2.Name = "normalButton2";
+            this.normalButton2.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.NormalImage")));
+            this.normalButton2.Power = null;
+            this.normalButton2.Size = new System.Drawing.Size(91, 28);
+            this.normalButton2.TabIndex = 10;
+            this.normalButton2.Text = "normalButton2";
+            this.normalButton2.UseVisualStyleBackColor = false;
+            this.normalButton2.Click += new System.EventHandler(this.normalButton2_Click);
+            // 
             // TestDGV
             // 
             this.TestDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -129,55 +209,13 @@
             this.blurSearch1.TabIndex = 0;
             this.blurSearch1.TableName = null;
             // 
-            // normalButton2
-            // 
-            this.normalButton2.AllPower = null;
-            this.normalButton2.BackColor = System.Drawing.Color.Transparent;
-            this.normalButton2.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.DownImage")));
-            this.normalButton2.Image = null;
-            this.normalButton2.IsShowBorder = true;
-            this.normalButton2.Location = new System.Drawing.Point(390, 425);
-            this.normalButton2.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.MoveImage")));
-            this.normalButton2.Name = "normalButton2";
-            this.normalButton2.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.NormalImage")));
-            this.normalButton2.Power = null;
-            this.normalButton2.Size = new System.Drawing.Size(91, 28);
-            this.normalButton2.TabIndex = 10;
-            this.normalButton2.Text = "normalButton2";
-            this.normalButton2.UseVisualStyleBackColor = false;
-            this.normalButton2.Click += new System.EventHandler(this.normalButton2_Click);
-            // 
-            // normalButton3
-            // 
-            this.normalButton3.AllPower = null;
-            this.normalButton3.BackColor = System.Drawing.Color.Transparent;
-            this.normalButton3.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.DownImage")));
-            this.normalButton3.Image = null;
-            this.normalButton3.IsShowBorder = true;
-            this.normalButton3.Location = new System.Drawing.Point(390, 474);
-            this.normalButton3.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.MoveImage")));
-            this.normalButton3.Name = "normalButton3";
-            this.normalButton3.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.NormalImage")));
-            this.normalButton3.Power = null;
-            this.normalButton3.Size = new System.Drawing.Size(91, 28);
-            this.normalButton3.TabIndex = 11;
-            this.normalButton3.Text = "normalButton3";
-            this.normalButton3.UseVisualStyleBackColor = false;
-            this.normalButton3.Click += new System.EventHandler(this.normalButton3_Click);
-            // 
-            // serialPortCombox1
-            // 
-            this.serialPortCombox1.Location = new System.Drawing.Point(597, 425);
-            this.serialPortCombox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.serialPortCombox1.Name = "serialPortCombox1";
-            this.serialPortCombox1.Size = new System.Drawing.Size(140, 20);
-            this.serialPortCombox1.TabIndex = 12;
-            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(929, 590);
+            this.Controls.Add(this.searchTextBox2);
+            this.Controls.Add(this.searchTextBox1);
             this.Controls.Add(this.serialPortCombox1);
             this.Controls.Add(this.normalButton3);
             this.Controls.Add(this.normalButton2);
@@ -210,5 +248,7 @@
         private CustomControl.ButtonUtil.NormalButton normalButton2;
         private CustomControl.ButtonUtil.NormalButton normalButton3;
         private CustomControl.ComBoxWithFocus.SerialPortCombox serialPortCombox1;
+        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox1;
+        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox2;
     }
 }

UAS-MES/Form1.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="normalButton2.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="normalButton3.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -130,7 +130,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="normalButton2.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="normalButton3.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -143,7 +143,7 @@
         gg==
 </value>
   </data>
-  <data name="normalButton2.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="normalButton3.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -156,7 +156,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="normalButton3.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="normalButton2.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -168,7 +168,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="normalButton3.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="normalButton2.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -181,7 +181,7 @@
         gg==
 </value>
   </data>
-  <data name="normalButton3.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="normalButton2.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.Designer.cs

@@ -43,8 +43,6 @@
             this.em_name2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ScreenOutGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ScreenInGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.em_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.em_code3 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.OutGroupUser = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.em_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -58,6 +56,8 @@
             this.em_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_recorder = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_code3 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.em_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.OutGroupUser)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.InGroupUser)).BeginInit();
             this.SuspendLayout();
@@ -168,7 +168,7 @@
             this.em_name3.BackColor = System.Drawing.Color.White;
             this.em_name3.ID = null;
             this.em_name3.Location = new System.Drawing.Point(118, 108);
-            this.em_name3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.em_name3.Margin = new System.Windows.Forms.Padding(2);
             this.em_name3.Name = "em_name3";
             this.em_name3.Power = null;
             this.em_name3.Size = new System.Drawing.Size(148, 21);
@@ -184,7 +184,7 @@
             this.em_name2.BackColor = System.Drawing.Color.White;
             this.em_name2.ID = null;
             this.em_name2.Location = new System.Drawing.Point(579, 104);
-            this.em_name2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.em_name2.Margin = new System.Windows.Forms.Padding(2);
             this.em_name2.Name = "em_name2";
             this.em_name2.Power = null;
             this.em_name2.Size = new System.Drawing.Size(148, 21);
@@ -202,8 +202,8 @@
             this.ScreenOutGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ScreenOutGroup.Image = null;
             this.ScreenOutGroup.IsShowBorder = true;
-            this.ScreenOutGroup.Location = new System.Drawing.Point(754, 70);
-            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ScreenOutGroup.Location = new System.Drawing.Point(782, 72);
+            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(2);
             this.ScreenOutGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("ScreenOutGroup.MoveImage")));
             this.ScreenOutGroup.Name = "ScreenOutGroup";
             this.ScreenOutGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("ScreenOutGroup.NormalImage")));
@@ -222,8 +222,8 @@
             this.ScreenInGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ScreenInGroup.Image = null;
             this.ScreenInGroup.IsShowBorder = true;
-            this.ScreenInGroup.Location = new System.Drawing.Point(299, 70);
-            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ScreenInGroup.Location = new System.Drawing.Point(319, 70);
+            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(2);
             this.ScreenInGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("ScreenInGroup.MoveImage")));
             this.ScreenInGroup.Name = "ScreenInGroup";
             this.ScreenInGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("ScreenInGroup.NormalImage")));
@@ -234,44 +234,6 @@
             this.ScreenInGroup.UseVisualStyleBackColor = false;
             this.ScreenInGroup.Click += new System.EventHandler(this.ScreenInGroup_Click);
             // 
-            // em_code2
-            // 
-            this.em_code2.AllPower = null;
-            this.em_code2.Caller = null;
-            this.em_code2.Condition = null;
-            this.em_code2.DBTitle = null;
-            this.em_code2.FormName = null;
-            this.em_code2.Location = new System.Drawing.Point(579, 74);
-            this.em_code2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.em_code2.Name = "em_code2";
-            this.em_code2.Power = null;
-            this.em_code2.SelectField = null;
-            this.em_code2.SetValueField = null;
-            this.em_code2.Size = new System.Drawing.Size(148, 20);
-            this.em_code2.TabIndex = 250;
-            this.em_code2.TableName = null;
-            this.em_code2.Tag = "em_code";
-            this.em_code2.TextBoxEnable = true;
-            // 
-            // em_code3
-            // 
-            this.em_code3.AllPower = null;
-            this.em_code3.Caller = null;
-            this.em_code3.Condition = null;
-            this.em_code3.DBTitle = null;
-            this.em_code3.FormName = null;
-            this.em_code3.Location = new System.Drawing.Point(118, 74);
-            this.em_code3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.em_code3.Name = "em_code3";
-            this.em_code3.Power = null;
-            this.em_code3.SelectField = null;
-            this.em_code3.SetValueField = null;
-            this.em_code3.Size = new System.Drawing.Size(148, 20);
-            this.em_code3.TabIndex = 245;
-            this.em_code3.TableName = null;
-            this.em_code3.Tag = "em_code";
-            this.em_code3.TextBoxEnable = true;
-            // 
             // OutGroupUser
             // 
             this.OutGroupUser.AllowUserToAddRows = false;
@@ -282,7 +244,7 @@
             this.em_depart,
             this.em_position});
             this.OutGroupUser.Location = new System.Drawing.Point(478, 158);
-            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(2);
             this.OutGroupUser.Name = "OutGroupUser";
             this.OutGroupUser.RowTemplate.Height = 27;
             this.OutGroupUser.Size = new System.Drawing.Size(375, 444);
@@ -322,7 +284,7 @@
             // 
             this.UserOut.Image = ((System.Drawing.Image)(resources.GetObject("UserOut.Image")));
             this.UserOut.Location = new System.Drawing.Point(408, 417);
-            this.UserOut.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.UserOut.Margin = new System.Windows.Forms.Padding(2);
             this.UserOut.Name = "UserOut";
             this.UserOut.Size = new System.Drawing.Size(56, 24);
             this.UserOut.TabIndex = 241;
@@ -333,7 +295,7 @@
             // 
             this.UserIn.Image = ((System.Drawing.Image)(resources.GetObject("UserIn.Image")));
             this.UserIn.Location = new System.Drawing.Point(408, 356);
-            this.UserIn.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.UserIn.Margin = new System.Windows.Forms.Padding(2);
             this.UserIn.Name = "UserIn";
             this.UserIn.Size = new System.Drawing.Size(56, 24);
             this.UserIn.TabIndex = 240;
@@ -351,7 +313,7 @@
             this.em_indate,
             this.em_recorder});
             this.InGroupUser.Location = new System.Drawing.Point(20, 158);
-            this.InGroupUser.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.InGroupUser.Margin = new System.Windows.Forms.Padding(2);
             this.InGroupUser.Name = "InGroupUser";
             this.InGroupUser.RowTemplate.Height = 27;
             this.InGroupUser.Size = new System.Drawing.Size(375, 444);
@@ -396,22 +358,56 @@
             this.em_recorder.ReadOnly = true;
             this.em_recorder.Width = 81;
             // 
-            // 人员选择
+            // em_code3
+            // 
+            this.em_code3.AllPower = null;
+            this.em_code3.Caller = null;
+            this.em_code3.Condition = null;
+            this.em_code3.DBTitle = null;
+            this.em_code3.FormName = null;
+            this.em_code3.Location = new System.Drawing.Point(115, 72);
+            this.em_code3.Name = "em_code3";
+            this.em_code3.Power = null;
+            this.em_code3.SelectField = null;
+            this.em_code3.SetValueField = null;
+            this.em_code3.Size = new System.Drawing.Size(176, 21);
+            this.em_code3.TabIndex = 258;
+            this.em_code3.TableName = null;
+            this.em_code3.TextBoxEnable = false;
+            // 
+            // em_code2
+            // 
+            this.em_code2.AllPower = null;
+            this.em_code2.Caller = null;
+            this.em_code2.Condition = null;
+            this.em_code2.DBTitle = null;
+            this.em_code2.FormName = null;
+            this.em_code2.Location = new System.Drawing.Point(579, 72);
+            this.em_code2.Name = "em_code2";
+            this.em_code2.Power = null;
+            this.em_code2.SelectField = null;
+            this.em_code2.SetValueField = null;
+            this.em_code2.Size = new System.Drawing.Size(172, 21);
+            this.em_code2.TabIndex = 259;
+            this.em_code2.TableName = null;
+            this.em_code2.TextBoxEnable = false;
+            // 
+            // Employee_ChooseUserToGroup
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(876, 612);
+            this.Controls.Add(this.em_code2);
+            this.Controls.Add(this.em_code3);
             this.Controls.Add(this.ug_name_title_label);
             this.Controls.Add(this.em_name3);
             this.Controls.Add(this.em_name2);
             this.Controls.Add(this.ScreenOutGroup);
             this.Controls.Add(this.ScreenInGroup);
             this.Controls.Add(this.em_name2_label);
-            this.Controls.Add(this.em_code2);
             this.Controls.Add(this.em_code2_label);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.em_name3_label);
-            this.Controls.Add(this.em_code3);
             this.Controls.Add(this.em_code3_label);
             this.Controls.Add(this.OutGroupUser);
             this.Controls.Add(this.label2);
@@ -422,7 +418,7 @@
             this.Controls.Add(this.ug_code_title_label);
             this.Controls.Add(this.ug_code_title);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "人员选择";
+            this.Name = "Employee_ChooseUserToGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "人员选择";
             this.Load += new System.EventHandler(this.人员选择_Load);
@@ -445,10 +441,8 @@
         private System.Windows.Forms.Label label2;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum OutGroupUser;
         private System.Windows.Forms.Label em_name3_label;
-        private CustomControl.TextBoxWithIcon.SearchTextBox em_code3;
         private System.Windows.Forms.Label em_code3_label;
         private System.Windows.Forms.Label em_name2_label;
-        private CustomControl.TextBoxWithIcon.SearchTextBox em_code2;
         private System.Windows.Forms.Label em_code2_label;
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.NormalButton ScreenInGroup;
@@ -465,5 +459,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn em_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_indate;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_recorder;
+        private CustomControl.TextBoxWithIcon.SearchTextBox em_code3;
+        private CustomControl.TextBoxWithIcon.SearchTextBox em_code2;
     }
 }

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.resx

@@ -206,6 +206,18 @@
   <metadata name="em_position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="em_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_depart.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="UserOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -259,4 +271,19 @@
   <metadata name="em_recorder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="em_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="eg_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_recorder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS-MES/FunctionCode/Employee/Employee_Group.Designer.cs

@@ -28,22 +28,22 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Employee_Group));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.ug_code_label = new System.Windows.Forms.Label();
             this.ug_name_label = new System.Windows.Forms.Label();
             this.UserGroupDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.NewGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.DeleteGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Screen = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ug_name1 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.ug_code1 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.ug_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ug_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ug_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserSetting = new System.Windows.Forms.DataGridViewLinkColumn();
             this.PowerSetting = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.NewGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.DeleteGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Screen = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ug_name1 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ug_code1 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.UserGroupDGV)).BeginInit();
             this.SuspendLayout();
             // 
@@ -51,10 +51,9 @@
             // 
             this.ug_code_label.AutoSize = true;
             this.ug_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_label.Location = new System.Drawing.Point(12, 25);
-            this.ug_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ug_code_label.Location = new System.Drawing.Point(9, 24);
             this.ug_code_label.Name = "ug_code_label";
-            this.ug_code_label.Size = new System.Drawing.Size(112, 27);
+            this.ug_code_label.Size = new System.Drawing.Size(90, 21);
             this.ug_code_label.TabIndex = 237;
             this.ug_code_label.Text = "用户组代码";
             // 
@@ -62,10 +61,9 @@
             // 
             this.ug_name_label.AutoSize = true;
             this.ug_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_label.Location = new System.Drawing.Point(315, 25);
-            this.ug_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ug_name_label.Location = new System.Drawing.Point(256, 24);
             this.ug_name_label.Name = "ug_name_label";
-            this.ug_name_label.Size = new System.Drawing.Size(72, 27);
+            this.ug_name_label.Size = new System.Drawing.Size(58, 21);
             this.ug_name_label.TabIndex = 239;
             this.ug_name_label.Text = "用户组";
             // 
@@ -79,13 +77,54 @@
             this.ug_name,
             this.UserSetting,
             this.PowerSetting});
-            this.UserGroupDGV.Location = new System.Drawing.Point(12, 71);
+            this.UserGroupDGV.Location = new System.Drawing.Point(9, 57);
+            this.UserGroupDGV.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.UserGroupDGV.Name = "UserGroupDGV";
             this.UserGroupDGV.RowTemplate.Height = 27;
-            this.UserGroupDGV.Size = new System.Drawing.Size(777, 598);
+            this.UserGroupDGV.Size = new System.Drawing.Size(625, 478);
             this.UserGroupDGV.TabIndex = 244;
             this.UserGroupDGV.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.UserGroupDGV_CellClick);
             // 
+            // ug_id
+            // 
+            this.ug_id.DataPropertyName = "ug_id";
+            this.ug_id.HeaderText = "ug_id";
+            this.ug_id.Name = "ug_id";
+            this.ug_id.Visible = false;
+            // 
+            // ug_code
+            // 
+            this.ug_code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ug_code.DataPropertyName = "ug_code";
+            this.ug_code.HeaderText = "用户组代码";
+            this.ug_code.Name = "ug_code";
+            // 
+            // ug_name
+            // 
+            this.ug_name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ug_name.DataPropertyName = "ug_name";
+            this.ug_name.HeaderText = "用户组";
+            this.ug_name.Name = "ug_name";
+            // 
+            // UserSetting
+            // 
+            this.UserSetting.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.UserSetting.DataPropertyName = "UserSetting";
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.UserSetting.DefaultCellStyle = dataGridViewCellStyle21;
+            this.UserSetting.HeaderText = "成员设置";
+            this.UserSetting.Name = "UserSetting";
+            this.UserSetting.Width = 120;
+            // 
+            // PowerSetting
+            // 
+            this.PowerSetting.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.PowerSetting.DataPropertyName = "PowerSetting";
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.PowerSetting.DefaultCellStyle = dataGridViewCellStyle22;
+            this.PowerSetting.HeaderText = "权限分配";
+            this.PowerSetting.Name = "PowerSetting";
+            // 
             // NewGroup
             // 
             this.NewGroup.AllPower = null;
@@ -94,12 +133,13 @@
             this.NewGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NewGroup.Image = null;
             this.NewGroup.IsShowBorder = true;
-            this.NewGroup.Location = new System.Drawing.Point(650, 24);
+            this.NewGroup.Location = new System.Drawing.Point(530, 22);
+            this.NewGroup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.NewGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewGroup.MoveImage")));
             this.NewGroup.Name = "NewGroup";
             this.NewGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewGroup.NormalImage")));
             this.NewGroup.Power = null;
-            this.NewGroup.Size = new System.Drawing.Size(60, 32);
+            this.NewGroup.Size = new System.Drawing.Size(45, 26);
             this.NewGroup.TabIndex = 243;
             this.NewGroup.Tag = "ShowDialogWindow";
             this.NewGroup.Text = "新增";
@@ -114,12 +154,13 @@
             this.DeleteGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.DeleteGroup.Image = null;
             this.DeleteGroup.IsShowBorder = true;
-            this.DeleteGroup.Location = new System.Drawing.Point(729, 24);
+            this.DeleteGroup.Location = new System.Drawing.Point(589, 22);
+            this.DeleteGroup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.DeleteGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteGroup.MoveImage")));
             this.DeleteGroup.Name = "DeleteGroup";
             this.DeleteGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteGroup.NormalImage")));
             this.DeleteGroup.Power = null;
-            this.DeleteGroup.Size = new System.Drawing.Size(60, 32);
+            this.DeleteGroup.Size = new System.Drawing.Size(45, 26);
             this.DeleteGroup.TabIndex = 242;
             this.DeleteGroup.Text = "删除";
             this.DeleteGroup.UseVisualStyleBackColor = false;
@@ -133,12 +174,13 @@
             this.Screen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Screen.Image = null;
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(575, 24);
+            this.Screen.Location = new System.Drawing.Point(473, 22);
+            this.Screen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
             this.Screen.Power = null;
-            this.Screen.Size = new System.Drawing.Size(60, 32);
+            this.Screen.Size = new System.Drawing.Size(45, 26);
             this.Screen.TabIndex = 241;
             this.Screen.Text = "筛选";
             this.Screen.UseVisualStyleBackColor = false;
@@ -151,12 +193,13 @@
             this.ug_name1.Condition = null;
             this.ug_name1.DBTitle = null;
             this.ug_name1.FormName = null;
-            this.ug_name1.Location = new System.Drawing.Point(406, 28);
+            this.ug_name1.Location = new System.Drawing.Point(324, 24);
+            this.ug_name1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ug_name1.Name = "ug_name1";
             this.ug_name1.Power = null;
             this.ug_name1.SelectField = null;
             this.ug_name1.SetValueField = null;
-            this.ug_name1.Size = new System.Drawing.Size(159, 25);
+            this.ug_name1.Size = new System.Drawing.Size(135, 21);
             this.ug_name1.TabIndex = 240;
             this.ug_name1.TableName = null;
             this.ug_name1.Tag = "ug_code";
@@ -169,62 +212,23 @@
             this.ug_code1.Condition = null;
             this.ug_code1.DBTitle = null;
             this.ug_code1.FormName = null;
-            this.ug_code1.Location = new System.Drawing.Point(138, 28);
+            this.ug_code1.Location = new System.Drawing.Point(104, 24);
+            this.ug_code1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ug_code1.Name = "ug_code1";
             this.ug_code1.Power = null;
             this.ug_code1.SelectField = null;
             this.ug_code1.SetValueField = null;
-            this.ug_code1.Size = new System.Drawing.Size(159, 25);
+            this.ug_code1.Size = new System.Drawing.Size(135, 21);
             this.ug_code1.TabIndex = 238;
             this.ug_code1.TableName = null;
             this.ug_code1.Tag = "ug_code";
             this.ug_code1.TextBoxEnable = true;
             // 
-            // ug_id
-            // 
-            this.ug_id.DataPropertyName = "ug_id";
-            this.ug_id.HeaderText = "ug_id";
-            this.ug_id.Name = "ug_id";
-            this.ug_id.Visible = false;
-            // 
-            // ug_code
-            // 
-            this.ug_code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ug_code.DataPropertyName = "ug_code";
-            this.ug_code.HeaderText = "用户组代码";
-            this.ug_code.Name = "ug_code";
-            // 
-            // ug_name
-            // 
-            this.ug_name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ug_name.DataPropertyName = "ug_name";
-            this.ug_name.HeaderText = "用户组";
-            this.ug_name.Name = "ug_name";
-            // 
-            // UserSetting
-            // 
-            this.UserSetting.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.UserSetting.DataPropertyName = "UserSetting";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.UserSetting.DefaultCellStyle = dataGridViewCellStyle1;
-            this.UserSetting.HeaderText = "成员设置";
-            this.UserSetting.Name = "UserSetting";
-            this.UserSetting.Width = 120;
-            // 
-            // PowerSetting
-            // 
-            this.PowerSetting.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.PowerSetting.DataPropertyName = "PowerSetting";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.PowerSetting.DefaultCellStyle = dataGridViewCellStyle2;
-            this.PowerSetting.HeaderText = "权限分配";
-            this.PowerSetting.Name = "PowerSetting";
-            // 
-            // 人员分组
+            // Employee_Group
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(914, 695);
+            this.ClientSize = new System.Drawing.Size(686, 556);
             this.Controls.Add(this.UserGroupDGV);
             this.Controls.Add(this.NewGroup);
             this.Controls.Add(this.DeleteGroup);
@@ -234,8 +238,7 @@
             this.Controls.Add(this.ug_code1);
             this.Controls.Add(this.ug_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "人员分组";
+            this.Name = "Employee_Group";
             this.Tag = "Employee!Data";
             this.Text = "人员资料";
             this.Load += new System.EventHandler(this.人员分组_Load);

UAS-MES/FunctionCode/Employee/Employee_Group.resx

@@ -132,6 +132,21 @@
   <metadata name="PowerSetting.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ug_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ug_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ug_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserSetting.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PowerSetting.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="NewGroup.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

UAS-MES/FunctionCode/Employee/Employee_Power.Designer.cs

@@ -48,10 +48,9 @@
             // 
             this.sn_module_label.AutoSize = true;
             this.sn_module_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_module_label.Location = new System.Drawing.Point(363, 18);
-            this.sn_module_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_module_label.Location = new System.Drawing.Point(272, 14);
             this.sn_module_label.Name = "sn_module_label";
-            this.sn_module_label.Size = new System.Drawing.Size(92, 27);
+            this.sn_module_label.Size = new System.Drawing.Size(74, 21);
             this.sn_module_label.TabIndex = 211;
             this.sn_module_label.Text = "对应模块";
             // 
@@ -59,10 +58,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(21, 18);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(16, 14);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(72, 27);
+            this.label1.Size = new System.Drawing.Size(58, 21);
             this.label1.TabIndex = 212;
             this.label1.Text = "用户组";
             // 
@@ -70,10 +68,10 @@
             // 
             this.sn_module.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.sn_module.FormattingEnabled = true;
-            this.sn_module.Location = new System.Drawing.Point(491, 22);
-            this.sn_module.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sn_module.Location = new System.Drawing.Point(368, 18);
+            this.sn_module.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sn_module.Name = "sn_module";
-            this.sn_module.Size = new System.Drawing.Size(185, 23);
+            this.sn_module.Size = new System.Drawing.Size(140, 20);
             this.sn_module.TabIndex = 237;
             this.sn_module.Tag = "sn_classname";
             this.sn_module.SelectedIndexChanged += new System.EventHandler(this.sn_module_SelectedIndexChanged);
@@ -85,13 +83,13 @@
             this.ug_code.Condition = null;
             this.ug_code.DBTitle = null;
             this.ug_code.FormName = null;
-            this.ug_code.Location = new System.Drawing.Point(127, 20);
-            this.ug_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ug_code.Location = new System.Drawing.Point(95, 16);
+            this.ug_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ug_code.Name = "ug_code";
             this.ug_code.Power = null;
             this.ug_code.SelectField = null;
             this.ug_code.SetValueField = null;
-            this.ug_code.Size = new System.Drawing.Size(197, 25);
+            this.ug_code.Size = new System.Drawing.Size(152, 23);
             this.ug_code.TabIndex = 236;
             this.ug_code.TableName = null;
             this.ug_code.Tag = "ug_code";
@@ -105,13 +103,12 @@
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(707, 19);
-            this.Screen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Screen.Location = new System.Drawing.Point(530, 15);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
             this.Screen.Power = null;
-            this.Screen.Size = new System.Drawing.Size(69, 30);
+            this.Screen.Size = new System.Drawing.Size(52, 24);
             this.Screen.TabIndex = 232;
             this.Screen.Tag = "IfRead|ifAll";
             this.Screen.Text = "筛选";
@@ -125,13 +122,12 @@
             this.SavePower.DownImage = ((System.Drawing.Image)(resources.GetObject("SavePower.DownImage")));
             this.SavePower.Image = ((System.Drawing.Image)(resources.GetObject("SavePower.Image")));
             this.SavePower.IsShowBorder = true;
-            this.SavePower.Location = new System.Drawing.Point(535, 598);
-            this.SavePower.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SavePower.Location = new System.Drawing.Point(401, 478);
             this.SavePower.MoveImage = ((System.Drawing.Image)(resources.GetObject("SavePower.MoveImage")));
             this.SavePower.Name = "SavePower";
             this.SavePower.NormalImage = ((System.Drawing.Image)(resources.GetObject("SavePower.NormalImage")));
             this.SavePower.Power = "ifwrite";
-            this.SavePower.Size = new System.Drawing.Size(80, 30);
+            this.SavePower.Size = new System.Drawing.Size(60, 24);
             this.SavePower.TabIndex = 1;
             this.SavePower.Tag = "";
             this.SavePower.Text = "保存";
@@ -149,11 +145,10 @@
             this.ugp_id,
             this.Column1,
             this.Column2});
-            this.GroupPowerDGV.Location = new System.Drawing.Point(4, 88);
-            this.GroupPowerDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GroupPowerDGV.Location = new System.Drawing.Point(3, 70);
             this.GroupPowerDGV.Name = "GroupPowerDGV";
             this.GroupPowerDGV.RowTemplate.Height = 23;
-            this.GroupPowerDGV.Size = new System.Drawing.Size(1140, 500);
+            this.GroupPowerDGV.Size = new System.Drawing.Size(855, 400);
             this.GroupPowerDGV.TabIndex = 0;
             this.GroupPowerDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.GroupPower_DataError);
             // 
@@ -196,9 +191,9 @@
             // 
             // Employee_Power
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1149, 635);
+            this.ClientSize = new System.Drawing.Size(862, 508);
             this.Controls.Add(this.sn_module);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.Screen);
@@ -207,7 +202,6 @@
             this.Controls.Add(this.SavePower);
             this.Controls.Add(this.GroupPowerDGV);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Employee_Power";
             this.Tag = "Employee!Power";
             this.Text = "权限控制";

UAS-MES/FunctionCode/Employee/Employee_PowerSarch.Designer.cs

@@ -74,7 +74,7 @@
             this.sn_module.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.sn_module.FormattingEnabled = true;
             this.sn_module.Location = new System.Drawing.Point(352, 26);
-            this.sn_module.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.sn_module.Margin = new System.Windows.Forms.Padding(2);
             this.sn_module.Name = "sn_module";
             this.sn_module.Size = new System.Drawing.Size(126, 20);
             this.sn_module.TabIndex = 217;
@@ -200,7 +200,7 @@
             this.Screen.Image = null;
             this.Screen.IsShowBorder = true;
             this.Screen.Location = new System.Drawing.Point(511, 27);
-            this.Screen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Screen.Margin = new System.Windows.Forms.Padding(2);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
@@ -219,12 +219,12 @@
             this.ug_code.DBTitle = null;
             this.ug_code.FormName = null;
             this.ug_code.Location = new System.Drawing.Point(84, 26);
-            this.ug_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ug_code.Margin = new System.Windows.Forms.Padding(2);
             this.ug_code.Name = "ug_code";
             this.ug_code.Power = null;
             this.ug_code.SelectField = null;
             this.ug_code.SetValueField = null;
-            this.ug_code.Size = new System.Drawing.Size(148, 20);
+            this.ug_code.Size = new System.Drawing.Size(148, 21);
             this.ug_code.TabIndex = 218;
             this.ug_code.TableName = null;
             this.ug_code.Tag = "ug_code";
@@ -232,7 +232,7 @@
             this.ug_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ug_code_UserControlTextChanged);
             this.ug_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ug_code_KeyDown);
             // 
-            // 权限查看
+            // Employee_PowerSarch
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -244,8 +244,8 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.Group_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.Name = "权限查看";
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Name = "Employee_PowerSarch";
             this.Tag = "Employee!PowerSarch";
             this.Text = "权限查看";
             this.Load += new System.EventHandler(this.权限查看_Load);

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -466,7 +466,7 @@ namespace UAS_MES.Make
                         sql.Append("sp_type,case when (sp_type='物料' and sp_soncode=pr_code) then '已采集' else '未采集' end sp_ifpick ,sp_prefix,");
                         sql.Append("sp_length,sp_regex,sp_ifforsn from stepproduct left join product on pr_code=sp_soncode where ");
                         sql.Append("sp_craftcode='" + ms_craftcode + "' and sp_stepcode='" + User.CurrentStepCode + "' And sp_mothercode ='" + make_prodcode + "' ");
-                        sql.Append("and((sp_type = '物料' and pr_tracekind <> 2)or sp_type <> '物料') order by SP_DETNO asc");
+                        sql.Append("and((sp_type = '物料' and( pr_tracekind <> 2 or pr_tracekind is null))or sp_type <> '物料') order by SP_DETNO asc");
                         dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         sn_code.Text = code.Text;
                         code.Clear();

UAS-MES/Program.cs

@@ -45,7 +45,6 @@ namespace UAS_MES
                     Application.Run(new Login());
                 else
                 {
-                    Console.WriteLine("Test");
                     //创建启动对象
                     System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
                     // 设置运行文件