修改DBFinde的赋值方式

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

@@ -57,7 +57,6 @@
             this.TextBox.Lock = false;
             this.TextBox.Name = "TextBox";
             this.TextBox.Power = null;
-            this.TextBox.Size = new System.Drawing.Size(178, 28);
             this.TextBox.Size = new System.Drawing.Size(178, 21);
             this.TextBox.Str = null;
             this.TextBox.Str1 = null;

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -258,7 +258,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             LockCheckBox = ctl;
         }
 
-        private void GetData()
+        public void GetData()
         {
             if (TextBox.Text != "")
             {
@@ -299,7 +299,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     LeaveFindData = false;
                 //不允许工单号为空的情况
                 LockCheckBox.Checked = true;
-                AfterDBFindSetValue(new object(),new EventArgs());
+                AfterDBFindSetValue(new object(), new EventArgs());
             }
         }
 

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -265,11 +265,13 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         public void RefreshDB(object sender, EventArgs e)
         {
             TextBox_Leave(sender, e);
+            GetData();
         }
 
         public void TextBox_Leave(object sender, EventArgs e)
         {
             TextBox.BackColor = System.Drawing.Color.White;
+            GetData();
         }
 
         private void SearchTextBox_Load(object sender, EventArgs e)
@@ -281,7 +283,47 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
 
         private void SearchTextBox_SizeChanged(object sender, EventArgs e)
         {
-            TextBox.Width = this.Width - Search_Icon.Width-3;
+            TextBox.Width = this.Width - Search_Icon.Width - 3;
+        }
+
+        public void GetData()
+        {
+            if (TextBox.Text != "")
+            {
+                DataHelper dh = new DataHelper();
+                List<string> fields = new List<string>();
+                //获取查询的字段
+                string[] field = selectField.Replace(",", "#").Trim().Split('#');
+                for (int i = 0; i < field.Length; i++)
+                {
+                    if (i % 2 == 0)
+                        fields.Add(field[i]);
+                }
+                //将查询到的结果返回界面
+                string sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Tag + "='" + TextBox.Text + "'";
+                if (condition != null)
+                {
+                    sql += " and " + condition;
+                }
+                DataTable dt = (DataTable)dh.ExecuteSql(sql, "select");
+                FormCollection fmCollection = Application.OpenForms;
+                if (dt.Rows.Count > 0)
+                {
+                    for (int i = 0; i < dt.Columns.Count; i++)
+                    {
+                        for (int j = 0; j < SetValueField.Length; j++)
+                        {
+                            object tag = fmCollection[FormName].Controls[SetValueField[j]].Tag;
+                            //利用字段的Tag属性来和列名进行比对
+                            if (SetValueField[j] == dt.Columns[i].ColumnName.ToLower() || (tag != null && tag.ToString() == dt.Columns[i].ColumnName.ToLower()))
+                                fmCollection[FormName].Controls[SetValueField[j]].Text = dt.Rows[0][dt.Columns[i].ColumnName].ToString();
+                        }
+                    }
+                    LeaveFindData = true;
+                }
+                else
+                    LeaveFindData = false;
+            }
         }
     }
 }

UAS-MES/DataOperate/DataHelper.cs

@@ -943,8 +943,9 @@ namespace UAS_MES.DataOperate
         /// <param name="param"></param>
         public void CallProcedure(string ProcedureName, ref string[] param)
         {
-            command = new OracleCommand(ProcedureName, connection);
-            Reconnect(command);
+            command = new OracleCommand(ProcedureName);
+            command.Connection = connection;
+            //Reconnect(command);
             command.CommandText = ProcedureName;
             command.CommandType = CommandType.StoredProcedure;
             for (int i = 0; i < param.Length; i++)
@@ -1083,9 +1084,7 @@ namespace UAS_MES.DataOperate
         private void Reconnect(OracleCommand cmd)
         {
             if (cmd.Connection.State == ConnectionState.Closed)
-            {
                 cmd.Connection.Open();
-            }
         }
     }
 }

UAS-MES/DbFind.cs

@@ -70,7 +70,6 @@ namespace UAS_MES
                 Caller = caller;
                 Condition = condition + "";
                 BindTable = tablename;
-
                 SelectField = selectfield.Replace("#", " as ");
                 //返回一个带有结构的空的DataTable
                 dt = (DataTable)dh.ExecuteSql("select " + SelectField + " from " + tablename + " where ROWNUM<20", "select");
@@ -167,53 +166,67 @@ namespace UAS_MES
                 Boolean groupcontains = false;
                 //先判断DataTable里面是否有这个字段，然后从打开的窗口里面去获取到这个Form，从Form中的指定Panel获取到指定字段的控件
                 FormCollection fmCollection = Application.OpenForms;
+                //SuccessReturnData = true;
+                //ControlCollection controls = (ControlCollection)fmCollection[FormName].Controls;
+                //for (int i = 0; i < dt.Columns.Count; i++)
+                //{
+                //    for (int k = 0; k < controls.Count; k++)
+                //    {
+                //        Control ctl = controls[k];
+                //        if (ctl.Controls.Count > 0)
+                //        {
+                //            for (int j = 0; j < SetValueField.Length; j++)
+                //            {
+                //                Control ct2 = ctl.Controls[SetValueField[j]];
+                //                if (ct2 != null)
+                //                {
+                //                    if (SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ct2 != null && ct2.Tag != null && ct2.Tag.ToString() == dt.Columns[i].Caption))
+                //                        ct2.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
+                //                    groupcontains = true;
+                //                }
+                //            }
+                //        }
+                //        break;
+                //    }
+                //}
+                //if (!groupcontains)
+                //{
+                //    for (int i = 0; i < dt.Columns.Count; i++)
+                //    {
+                //        for (int j = 0; j < SetValueField.Length; j++)
+                //        {
+                //            Control ctl = fmCollection[FormName].Controls[SetValueField[j]];
+                //            if (SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ctl != null && ctl.Tag != null && ctl.Tag.ToString() == dt.Columns[i].Caption))
+                //                fmCollection[FormName].Controls[SetValueField[j]].Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
+                //        }
+                //    }
+                //}
+                //发起DBFind的控件
                 SuccessReturnData = true;
-                ControlCollection controls = (ControlCollection)fmCollection[FormName].Controls;
+                MainControl = fmCollection[FormName].Controls[MainField];
                 for (int i = 0; i < dt.Columns.Count; i++)
                 {
-                    for (int k = 0; k < controls.Count; k++)
+                    if (MainControl.Name == dt.Columns[i].Caption.ToLower() || (MainControl.Tag != null && MainControl.Tag.ToString() == dt.Columns[i].Caption.ToLower()))
                     {
-                        Control ctl = controls[k];
-                        if (ctl.Controls.Count > 0)
-                        {
-                            for (int j = 0; j < SetValueField.Length; j++)
-                            {
-                                Control ct2 = ctl.Controls[SetValueField[j]];
-                                if (ct2 != null)
-                                {
-                                    if (SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ct2 != null && ct2.Tag != null && ct2.Tag.ToString() == dt.Columns[i].Caption))
-                                        ct2.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
-                                    groupcontains = true;
-                                }
-                            }
-                        }
+                        MainControl.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                         break;
                     }
                 }
-                if (!groupcontains)
-                {
-                    for (int i = 0; i < dt.Columns.Count; i++)
-                    {
-                        for (int j = 0; j < SetValueField.Length; j++)
-                        {
-                            Control ctl = fmCollection[FormName].Controls[SetValueField[j]];
-                            if (SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ctl != null && ctl.Tag != null && ctl.Tag.ToString() == dt.Columns[i].Caption))
-                                fmCollection[FormName].Controls[SetValueField[j]].Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
-                        }
-                    }
-                }
-                //发起DBFind的控件
-                MainControl = fmCollection[FormName].Controls[MainField];
-                MainControl.Focus();
                 if (MainControl is MaCodeSearchTextBox)
                 {
                     MaCodeSearchTextBox ctl = (MainControl as MaCodeSearchTextBox);
+                    ctl.GetData();
                     ctl.AfterDbFind += DbFind_AfterDbFind;
                     ctl.AfterDBFindSetValue(new object(), new EventArgs());
                 }
-
+                if (MainControl is SearchTextBox)
+                {
+                    SearchTextBox ctl = (MainControl as SearchTextBox);
+                    ctl.GetData();
+                }
+                MainControl.Focus();
             }
-            catch (Exception exa)
+            catch (Exception)
             {
                 SuccessReturnData = false;
             }

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

@@ -39,6 +39,8 @@
             this.em_code2_label = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.ug_name_title_label = new System.Windows.Forms.Label();
+            this.em_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.em_code3 = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.em_name3 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.em_name2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ScreenOutGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -56,8 +58,6 @@
             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();
@@ -66,20 +66,18 @@
             // 
             this.ug_code_title.AutoSize = true;
             this.ug_code_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_title.Location = new System.Drawing.Point(155, 12);
-            this.ug_code_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ug_code_title.Location = new System.Drawing.Point(116, 10);
             this.ug_code_title.Name = "ug_code_title";
-            this.ug_code_title.Size = new System.Drawing.Size(0, 27);
+            this.ug_code_title.Size = new System.Drawing.Size(0, 21);
             this.ug_code_title.TabIndex = 235;
             // 
             // ug_code_title_label
             // 
             this.ug_code_title_label.AutoSize = true;
             this.ug_code_title_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_title_label.Location = new System.Drawing.Point(31, 12);
-            this.ug_code_title_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ug_code_title_label.Location = new System.Drawing.Point(23, 10);
             this.ug_code_title_label.Name = "ug_code_title_label";
-            this.ug_code_title_label.Size = new System.Drawing.Size(112, 27);
+            this.ug_code_title_label.Size = new System.Drawing.Size(90, 21);
             this.ug_code_title_label.TabIndex = 236;
             this.ug_code_title_label.Text = "用户组编号";
             // 
@@ -87,10 +85,9 @@
             // 
             this.ug_name_title.AutoSize = true;
             this.ug_name_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_title.Location = new System.Drawing.Point(155, 52);
-            this.ug_name_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ug_name_title.Location = new System.Drawing.Point(116, 42);
             this.ug_name_title.Name = "ug_name_title";
-            this.ug_name_title.Size = new System.Drawing.Size(0, 27);
+            this.ug_name_title.Size = new System.Drawing.Size(0, 21);
             this.ug_name_title.TabIndex = 238;
             // 
             // label2
@@ -98,10 +95,9 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(31, 168);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(23, 134);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 242;
             this.label2.Text = "组内成员";
             // 
@@ -109,10 +105,9 @@
             // 
             this.em_name3_label.AutoSize = true;
             this.em_name3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name3_label.Location = new System.Drawing.Point(31, 130);
-            this.em_name3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_name3_label.Location = new System.Drawing.Point(23, 104);
             this.em_name3_label.Name = "em_name3_label";
-            this.em_name3_label.Size = new System.Drawing.Size(92, 27);
+            this.em_name3_label.Size = new System.Drawing.Size(74, 21);
             this.em_name3_label.TabIndex = 246;
             this.em_name3_label.Text = "用户名称";
             // 
@@ -120,10 +115,9 @@
             // 
             this.em_code3_label.AutoSize = true;
             this.em_code3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code3_label.Location = new System.Drawing.Point(31, 90);
-            this.em_code3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_code3_label.Location = new System.Drawing.Point(23, 72);
             this.em_code3_label.Name = "em_code3_label";
-            this.em_code3_label.Size = new System.Drawing.Size(92, 27);
+            this.em_code3_label.Size = new System.Drawing.Size(74, 21);
             this.em_code3_label.TabIndex = 244;
             this.em_code3_label.Text = "用户编号";
             // 
@@ -131,10 +125,9 @@
             // 
             this.em_name2_label.AutoSize = true;
             this.em_name2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name2_label.Location = new System.Drawing.Point(640, 130);
-            this.em_name2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_name2_label.Location = new System.Drawing.Point(480, 104);
             this.em_name2_label.Name = "em_name2_label";
-            this.em_name2_label.Size = new System.Drawing.Size(92, 27);
+            this.em_name2_label.Size = new System.Drawing.Size(74, 21);
             this.em_name2_label.TabIndex = 251;
             this.em_name2_label.Text = "用户名称";
             // 
@@ -142,10 +135,9 @@
             // 
             this.em_code2_label.AutoSize = true;
             this.em_code2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code2_label.Location = new System.Drawing.Point(640, 90);
-            this.em_code2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_code2_label.Location = new System.Drawing.Point(480, 72);
             this.em_code2_label.Name = "em_code2_label";
-            this.em_code2_label.Size = new System.Drawing.Size(92, 27);
+            this.em_code2_label.Size = new System.Drawing.Size(74, 21);
             this.em_code2_label.TabIndex = 249;
             this.em_code2_label.Text = "用户编号";
             // 
@@ -154,10 +146,9 @@
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.Blue;
-            this.label6.Location = new System.Drawing.Point(640, 168);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(480, 134);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(92, 27);
+            this.label6.Size = new System.Drawing.Size(74, 21);
             this.label6.TabIndex = 248;
             this.label6.Text = "组外成员";
             // 
@@ -165,23 +156,58 @@
             // 
             this.ug_name_title_label.AutoSize = true;
             this.ug_name_title_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_title_label.Location = new System.Drawing.Point(31, 52);
-            this.ug_name_title_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ug_name_title_label.Location = new System.Drawing.Point(23, 42);
             this.ug_name_title_label.Name = "ug_name_title_label";
-            this.ug_name_title_label.Size = new System.Drawing.Size(72, 27);
+            this.ug_name_title_label.Size = new System.Drawing.Size(58, 21);
             this.ug_name_title_label.TabIndex = 257;
             this.ug_name_title_label.Text = "用户组";
             // 
+            // 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(164, 20);
+            this.em_code2.TabIndex = 259;
+            this.em_code2.TableName = null;
+            this.em_code2.Tag = "em_code";
+            this.em_code2.TextBoxEnable = false;
+            // 
+            // 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(167, 21);
+            this.em_code3.TabIndex = 258;
+            this.em_code3.TableName = null;
+            this.em_code3.Tag = "em_code";
+            this.em_code3.TextBoxEnable = false;
+            // 
             // em_name3
             // 
             this.em_name3.AllPower = null;
             this.em_name3.BackColor = System.Drawing.Color.White;
             this.em_name3.ID = null;
-            this.em_name3.Location = new System.Drawing.Point(153, 135);
-            this.em_name3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.em_name3.Location = new System.Drawing.Point(115, 108);
+            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(200, 25);
+            this.em_name3.Size = new System.Drawing.Size(151, 21);
             this.em_name3.Str = null;
             this.em_name3.Str1 = null;
             this.em_name3.Str2 = null;
@@ -193,11 +219,11 @@
             this.em_name2.AllPower = null;
             this.em_name2.BackColor = System.Drawing.Color.White;
             this.em_name2.ID = null;
-            this.em_name2.Location = new System.Drawing.Point(772, 130);
-            this.em_name2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.em_name2.Location = new System.Drawing.Point(579, 104);
+            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(196, 25);
+            this.em_name2.Size = new System.Drawing.Size(148, 21);
             this.em_name2.Str = null;
             this.em_name2.Str1 = null;
             this.em_name2.Str2 = null;
@@ -212,13 +238,13 @@
             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(1043, 90);
-            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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")));
             this.ScreenOutGroup.Power = null;
-            this.ScreenOutGroup.Size = new System.Drawing.Size(75, 34);
+            this.ScreenOutGroup.Size = new System.Drawing.Size(56, 27);
             this.ScreenOutGroup.TabIndex = 254;
             this.ScreenOutGroup.Text = "筛选";
             this.ScreenOutGroup.UseVisualStyleBackColor = false;
@@ -232,13 +258,13 @@
             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(425, 88);
-            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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")));
             this.ScreenInGroup.Power = null;
-            this.ScreenInGroup.Size = new System.Drawing.Size(75, 34);
+            this.ScreenInGroup.Size = new System.Drawing.Size(56, 27);
             this.ScreenInGroup.TabIndex = 253;
             this.ScreenInGroup.Text = "筛选";
             this.ScreenInGroup.UseVisualStyleBackColor = false;
@@ -253,11 +279,11 @@
             this.em_name1,
             this.em_depart,
             this.em_position});
-            this.OutGroupUser.Location = new System.Drawing.Point(637, 198);
-            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.OutGroupUser.Location = new System.Drawing.Point(478, 158);
+            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(500, 555);
+            this.OutGroupUser.Size = new System.Drawing.Size(375, 444);
             this.OutGroupUser.TabIndex = 243;
             // 
             // em_code1
@@ -293,10 +319,10 @@
             // UserOut
             // 
             this.UserOut.Image = ((System.Drawing.Image)(resources.GetObject("UserOut.Image")));
-            this.UserOut.Location = new System.Drawing.Point(544, 521);
-            this.UserOut.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.UserOut.Location = new System.Drawing.Point(408, 417);
+            this.UserOut.Margin = new System.Windows.Forms.Padding(2);
             this.UserOut.Name = "UserOut";
-            this.UserOut.Size = new System.Drawing.Size(75, 30);
+            this.UserOut.Size = new System.Drawing.Size(56, 24);
             this.UserOut.TabIndex = 241;
             this.UserOut.UseVisualStyleBackColor = true;
             this.UserOut.Click += new System.EventHandler(this.UserOut_Click);
@@ -304,10 +330,10 @@
             // UserIn
             // 
             this.UserIn.Image = ((System.Drawing.Image)(resources.GetObject("UserIn.Image")));
-            this.UserIn.Location = new System.Drawing.Point(544, 445);
-            this.UserIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.UserIn.Location = new System.Drawing.Point(408, 356);
+            this.UserIn.Margin = new System.Windows.Forms.Padding(2);
             this.UserIn.Name = "UserIn";
-            this.UserIn.Size = new System.Drawing.Size(75, 30);
+            this.UserIn.Size = new System.Drawing.Size(56, 24);
             this.UserIn.TabIndex = 240;
             this.UserIn.UseVisualStyleBackColor = true;
             this.UserIn.Click += new System.EventHandler(this.UserIn_Click);
@@ -322,11 +348,11 @@
             this.em_name,
             this.em_indate,
             this.em_recorder});
-            this.InGroupUser.Location = new System.Drawing.Point(27, 198);
-            this.InGroupUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.InGroupUser.Location = new System.Drawing.Point(20, 158);
+            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(500, 555);
+            this.InGroupUser.Size = new System.Drawing.Size(375, 444);
             this.InGroupUser.TabIndex = 239;
             // 
             // em_code
@@ -368,49 +394,11 @@
             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(153, 90);
-            this.em_code3.Margin = new System.Windows.Forms.Padding(4);
-            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(223, 25);
-            this.em_code3.TabIndex = 258;
-            this.em_code3.TableName = null;
-            this.em_code3.Tag = "em_code";
-            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(772, 90);
-            this.em_code2.Margin = new System.Windows.Forms.Padding(4);
-            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(219, 25);
-            this.em_code2.TabIndex = 259;
-            this.em_code2.TableName = null;
-            this.em_code2.Tag = "em_code";
-            this.em_code2.TextBoxEnable = false;
-            // 
             // Employee_ChooseUserToGroup
             // 
-            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(1168, 765);
+            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);
@@ -432,7 +420,6 @@
             this.Controls.Add(this.ug_code_title_label);
             this.Controls.Add(this.ug_code_title);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Employee_ChooseUserToGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "人员选择";

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.resx

@@ -206,18 +206,6 @@
   <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
@@ -271,19 +259,4 @@
   <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/Make/Make_TestCollection.cs

@@ -164,36 +164,45 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                bool ifFirst;
+                WaitRejectList.Items.Clear();
+                ChoosedRejectList.Items.Clear();
+                WaitList.Clear();
+                ChoosedList.Clear();
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    if (LogicHandler.GetMakeInfo(ms_sncode.Text, out oMakeCode, out ErrorMessage))
+                    //判断界面工单是否为空时的序列号是否自动归属工单
+                    if (!LogicHandler.GetMakeInfo(ms_sncode.Text, out oMakeCode, out ErrorMessage))
                     {
-                        if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                        if (ma_code.Text == "")
                         {
-                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
-                            if (dt.Rows.Count > 0)
-                            {
-                                BaseUtil.SetFormValue(this.Controls, dt);
-                                LockMakeCode.Checked = true;
-                            }
-                            if (GoodProduct.Checked)
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                            return;
+                        }
+                    }
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    {
+                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                            LockMakeCode.Checked = true;
+                        }
+                        if (GoodProduct.Checked)
+                        {
+                            dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_stepcode,ms_status from makeserial where ms_id='" + oMSID + "'", "select");
+                            string status = dt.Rows[0]["ms_status"].ToString();
+                            string nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
+                            string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
+                            if (stepcode == User.CurrentStepCode && (status == "1" || status == "2"))
                             {
-                                dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_stepcode,ms_status from makeserial where ms_id='" + oMSID + "'", "select");
-                                string status = dt.Rows[0]["ms_status"].ToString();
-                                string nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
-                                string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                                if (stepcode == User.CurrentStepCode && (status == "1" || status == "2"))
-                                {
-                                    OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
-                                    return;
-                                }
+                                OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
+                                return;
                             }
-                            bc_code.Focus();
-                            SetCollectResult();
                         }
-                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                        bc_code.Focus();
+                        SetCollectResult();
                     }
+                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                 }
                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
             }
@@ -250,7 +259,9 @@ namespace UAS_MES.Make
             ChoosedRejectList.EndUpdate();
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
-            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,bc_code,bc_note from badcode left join badgroup on bc_groupcode=bg_code where bc_groupcode='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
+            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_note ");
+            sql.Append("from badcode left join badgroup on bc_groupcode=bg_code  where ");
+            sql.Append("bc_groupcode='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //往listview中添加数据
             WaitRejectList.Items.Clear();
@@ -280,6 +291,7 @@ namespace UAS_MES.Make
             //如果勾选的是不良品
             if (Reject.Checked)
             {
+                LoadBadCodeListView();
                 //勾选了自动产生代码
                 if (AutoBadCode.Checked)
                     Save_Click(new object(), new EventArgs());

UAS-MES/PublicMethod/LogicHandler.cs

@@ -420,6 +420,7 @@ namespace UAS_MES.PublicMethod
 
         public static bool CheckStepSNAndMacode(string iMakeCode, string iSource, string iSN, string iUserCode, out string oMakeCode, out string oMsID, out string oErrorMessage)
         {
+            Console.WriteLine("iMakeCode" + iMakeCode);
             oErrorMessage = "";
             oMakeCode = "";
             oMsID = "";
@@ -650,7 +651,7 @@ namespace UAS_MES.PublicMethod
                 return true;
             else
             {
-                oErrorMessage = "当前序列号" + iSnCode + "不存在生产记录";
+                oErrorMessage = "当前序列号" + iSnCode + "未归属工单";
                 return false;
             }
         }

UAS-MES/UAS-MES.csproj

@@ -41,7 +41,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>210</ApplicationRevision>
+    <ApplicationRevision>214</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -1175,292 +1175,292 @@
   <ItemGroup>
     <PublishFile Include="BtSystem.Client">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.Client.Reader">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.Interfaces">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.Network">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.Reprint.Support">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.Strings">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.Support">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="BtSystem.UI">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevComponents.DotNetBar2">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.Data.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.Printing.v11.1.Core">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.Utils.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.Xpo.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.XtraBars.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.XtraEditors.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.XtraGrid.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="DevExpress.XtraLayout.v11.1">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Interop.BarTender">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Interop.DriverAutomationLibrary">
       <Visible>False</Visible>
-      <PublishState>Include</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Interop.NetFwTypeLib">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Maestro.Interface">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Maestro.Library">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.Framework">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.Framework.Interop">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.Interop">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.Librarian.Core">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.Security">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.Security.Interop">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Seagull.XpoDataAccess">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
   </ItemGroup>