欧度利方，亿道升级内容提交

UAS_MES_ODLF/CustomControl/TextBoxWithIcon/MultBlurSearch.Designer.cs

@@ -0,0 +1,88 @@
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
+{
+    partial class MultBlurSearch
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.ListBox = new System.Windows.Forms.ListBox();
+            this.EnterTextBox = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.SuspendLayout();
+            // 
+            // ListBox
+            // 
+            this.ListBox.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.ListBox.FormattingEnabled = true;
+            this.ListBox.ItemHeight = 12;
+            this.ListBox.Location = new System.Drawing.Point(0, 20);
+            this.ListBox.Margin = new System.Windows.Forms.Padding(2);
+            this.ListBox.Name = "ListBox";
+            this.ListBox.Size = new System.Drawing.Size(154, 100);
+            this.ListBox.TabIndex = 1;
+            this.ListBox.Click += new System.EventHandler(this.ListBox_Click);
+            // 
+            // EnterTextBox
+            // 
+            this.EnterTextBox.AllPower = null;
+            this.EnterTextBox.BackColor = System.Drawing.Color.White;
+            this.EnterTextBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.EnterTextBox.ID = null;
+            this.EnterTextBox.Location = new System.Drawing.Point(0, 0);
+            this.EnterTextBox.Margin = new System.Windows.Forms.Padding(2);
+            this.EnterTextBox.Name = "EnterTextBox";
+            this.EnterTextBox.Power = null;
+            this.EnterTextBox.Size = new System.Drawing.Size(154, 21);
+            this.EnterTextBox.Str = null;
+            this.EnterTextBox.Str1 = null;
+            this.EnterTextBox.Str2 = null;
+            this.EnterTextBox.TabIndex = 2;
+            this.EnterTextBox.TextChanged += new System.EventHandler(this.EnterTextBox_TextChanged);
+            this.EnterTextBox.Enter += new System.EventHandler(this.EnterTextBox_Enter);
+            this.EnterTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.EnterTextBox_KeyDown);
+            this.EnterTextBox.Leave += new System.EventHandler(this.EnterTextBox_Leave);
+            // 
+            // BlurSearch
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.EnterTextBox);
+            this.Controls.Add(this.ListBox);
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Name = "BlurSearch";
+            this.Size = new System.Drawing.Size(154, 120);
+            this.Load += new System.EventHandler(this.BlurSearch_Load);
+            this.Leave += new System.EventHandler(this.BlurSearch_Leave);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ListBox ListBox;
+        private SnCollectionBox EnterTextBox;
+    }
+}

UAS_MES_ODLF/CustomControl/TextBoxWithIcon/MultBlurSearch.cs

@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
+{
+    public partial class MultBlurSearch : UserControl
+    {
+        DataHelper dh = SystemInf.dh;
+
+        public delegate void OnTextChange(object sender, EventArgs e);
+
+        public event OnTextChange UserControlTextChanged;
+
+        string TableName1;
+
+        string Field1;
+
+        int ItemSelectIndex = 0;
+        DataTable dt;
+
+        public override string Text
+        {
+            get
+            {
+                return EnterTextBox.Text;
+            }
+
+            set
+            {
+                EnterTextBox.Text = value;
+            }
+        }
+
+        public MultBlurSearch()
+        {
+            InitializeComponent();
+        }
+
+        public string TableName
+        {
+            get
+            {
+                return TableName1;
+            }
+
+            set
+            {
+                TableName1 = value;
+            }
+        }
+
+        private string value;
+
+        public string Field
+        {
+            get
+            {
+                return Field1;
+            }
+
+            set
+            {
+                Field1 = value;
+            }
+        }
+
+        public string Condition
+        {
+            get
+            {
+                return condition;
+            }
+
+            set
+            {
+                condition = value;
+            }
+        }
+
+        public string ValueField
+        {
+            get
+            {
+                return valueField;
+            }
+
+            set
+            {
+                valueField = value;
+            }
+        }
+
+        public string Value
+        {
+            get
+            {
+                return value;
+            }
+
+            set
+            {
+                this.value = value;
+            }
+        }
+
+        private string valueField;
+
+        private string condition;
+
+        private void TextBox_Leave(object sender, EventArgs e)
+        {
+            Height = EnterTextBox.Height;
+            ListBox.Visible = false;
+        }
+
+        private void BlurSearch_Load(object sender, EventArgs e)
+        {
+            Height = EnterTextBox.Height;
+            ListBox.Visible = false;
+        }
+
+        private void EnterTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (TableName1 != null && EnterTextBox.Focused)
+            {
+                string con = Field1 + " like '%" + EnterTextBox.Text + "%'  ";
+                if (condition != "" && condition != null)
+                {
+                    con = Field1 + " like '%" + EnterTextBox.Text + "%' and " + condition;
+                }
+                dt = dh.getFieldsDatasByCondition(TableName1, new string[] { Field1, valueField, "rownum" }, con.ToUpper());
+                if (dt.Rows.Count > 0)
+                {
+                    ListBox.Items.Clear();
+                    for (int i = 0; i < dt.Rows.Count; i++)
+                    {
+                        ListBox.Items.Add(dt.Rows[i][Field1]);
+                    }
+                    //每次数据查询之后将索引重置
+                    ItemSelectIndex = 0;
+                    ListBox.Height = ListBox.ItemHeight  *10;
+                    ListBox.Visible = true;
+                    Height = ListBox.Height + EnterTextBox.Height;
+                }
+                if (dt.Rows.Count == 1)
+                {
+                    value = dt.Rows[0][valueField].ToString();
+                }
+            }
+            else
+            {
+                ListBox.Visible = false;
+                Height = EnterTextBox.Height;
+            }
+            UserControlTextChanged?.Invoke(sender, new EventArgs());
+        }
+
+        private void ListBox_Click(object sender, EventArgs e)
+        {
+            value = dt.Select("rownum=" + (ListBox.SelectedIndex + 1))[0][1].ToString();
+            EnterTextBox.Text = EnterTextBox.Text==""?ListBox.SelectedItem.ToString(): EnterTextBox.Text+","+ ListBox.SelectedItem.ToString();
+            ListBox.Visible = false;
+            Height = EnterTextBox.Height;
+        }
+
+        private void EnterTextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (ListBox.Items.Count > 0)
+            {
+                if (e.KeyCode == Keys.Down || e.KeyCode == Keys.Up)
+                {
+                    switch (e.KeyCode)
+                    {
+                        case Keys.Down:
+                            if (ListBox.Items.Count > ItemSelectIndex + 1)
+                                ItemSelectIndex = ItemSelectIndex + 1;
+                            break;
+                        case Keys.Up:
+                            if (ItemSelectIndex - 1 >= 0)
+                                ItemSelectIndex = ItemSelectIndex - 1;
+                            break;
+                        default:
+                            break;
+                    }
+                    ListBox.SelectedIndex = ItemSelectIndex;
+                }
+                if (e.KeyCode == Keys.Enter)
+                {
+                    try
+                    {
+                        EnterTextBox.Text = EnterTextBox.Text == "" ? ListBox.SelectedItem.ToString() : EnterTextBox.Text + "," + ListBox.SelectedItem.ToString();
+                        ListBox.Visible = false;
+                        Height = EnterTextBox.Height;
+                    }
+                    catch (Exception)
+                    {
+                    }
+                }
+            }
+        }
+
+        private void EnterTextBox_Enter(object sender, EventArgs e)
+        {
+            string con = Field1 + " like '%" + EnterTextBox.Text + "%' ";
+            if (condition != "" && condition != null)
+            {
+                con = Field1 + " like '%" + EnterTextBox.Text + "%' and " + condition;
+            }
+            dt = dh.getFieldsDatasByCondition(TableName1, new string[] { Field1, valueField, "rownum" }, con.ToUpper());
+            if (dt.Rows.Count > 0)
+            {
+                ListBox.Items.Clear();
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    ListBox.Items.Add(dt.Rows[i][Field1]);
+                }
+                //每次数据查询之后将索引重置
+                ItemSelectIndex = 0;
+                ListBox.Height = ListBox.ItemHeight * 10;
+                ListBox.Visible = true;
+                Height = ListBox.Height + EnterTextBox.Height;
+            }
+        }
+
+        private void EnterTextBox_Leave(object sender, EventArgs e)
+        {
+            //ListBox.Visible = false;
+        }
+
+        private void BlurSearch_Leave(object sender, EventArgs e)
+        {
+            ListBox.Height = 0;
+            ListBox.Visible = false;
+            Height = ListBox.Height + EnterTextBox.Height;
+        }
+    }
+}

UAS_MES_ODLF/CustomControl/TextBoxWithIcon/MultBlurSearch.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

UAS_MES_ODLF/FunctionCode/Special/Special_Repair.Designer.cs

@@ -1,4 +1,5 @@
 using UAS_MES_NEW.CustomControl.ComBoxWithFocus;
+using UAS_MES_NEW.CustomControl.TextBoxWithIcon;
 
 namespace UAS_MES_NEW.Special
 {
@@ -37,28 +38,6 @@ namespace UAS_MES_NEW.Special
             this.ComponentSource = new System.Windows.Forms.BindingSource(this.components);
             this.bc_code = new System.Windows.Forms.Label();
             this.Save = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.groupBoxWithBorder3 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.as_badpro = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.as_process = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_method = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_reason = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label21 = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.label19 = new System.Windows.Forms.Label();
-            this.groupBoxWithBorder2 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.as_lcdconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.as_shellconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.as_duty2 = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.as_recheck = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_changerconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
             this.groupBoxWithBorder1 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.AS_BADCODE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.as_sku = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
@@ -84,25 +63,38 @@ namespace UAS_MES_NEW.Special
             this.GetSNCode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.as_lcdconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
+            this.as_shellconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_duty2 = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_changerconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
+            this.label14 = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.as_recheck = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.label8 = new System.Windows.Forms.Label();
+            this.as_method = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.as_badpro = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.as_reason = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.as_process = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.label21 = new System.Windows.Forms.Label();
+            this.label20 = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).BeginInit();
-            this.groupBoxWithBorder3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.as_badpro.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_process.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_method.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_reason.Properties)).BeginInit();
-            this.groupBoxWithBorder2.SuspendLayout();
+            this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.as_lcdconfirm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_shellconfirm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_duty2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_recheck.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).BeginInit();
-            this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
             // 
             // GetSNCode_Label
             // 
-            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode_Label.AutoSize = true;
             this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -145,271 +137,6 @@ namespace UAS_MES_NEW.Special
             this.Save.UseVisualStyleBackColor = true;
             this.Save.Click += new System.EventHandler(this.Save_Click);
             // 
-            // groupBoxWithBorder3
-            // 
-            this.groupBoxWithBorder3.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder3.Controls.Add(this.as_badpro);
-            this.groupBoxWithBorder3.Controls.Add(this.as_process);
-            this.groupBoxWithBorder3.Controls.Add(this.as_method);
-            this.groupBoxWithBorder3.Controls.Add(this.as_reason);
-            this.groupBoxWithBorder3.Controls.Add(this.label9);
-            this.groupBoxWithBorder3.Controls.Add(this.label21);
-            this.groupBoxWithBorder3.Controls.Add(this.label20);
-            this.groupBoxWithBorder3.Controls.Add(this.label18);
-            this.groupBoxWithBorder3.Controls.Add(this.label19);
-            this.groupBoxWithBorder3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.groupBoxWithBorder3.Location = new System.Drawing.Point(16, 738);
-            this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(4);
-            this.groupBoxWithBorder3.Name = "groupBoxWithBorder3";
-            this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBoxWithBorder3.Size = new System.Drawing.Size(1321, 295);
-            this.groupBoxWithBorder3.TabIndex = 163;
-            this.groupBoxWithBorder3.TabStop = false;
-            this.groupBoxWithBorder3.Text = "工厂翻新及交付信息";
-            this.groupBoxWithBorder3.TextColor = System.Drawing.Color.Black;
-            // 
-            // as_badpro
-            // 
-            this.as_badpro.Location = new System.Drawing.Point(805, 182);
-            this.as_badpro.Name = "as_badpro";
-            this.as_badpro.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_badpro.Size = new System.Drawing.Size(306, 36);
-            this.as_badpro.TabIndex = 192;
-            // 
-            // as_process
-            // 
-            this.as_process.EditValue = "";
-            this.as_process.Location = new System.Drawing.Point(195, 98);
-            this.as_process.Name = "as_process";
-            this.as_process.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_process.Size = new System.Drawing.Size(306, 36);
-            this.as_process.TabIndex = 185;
-            // 
-            // as_method
-            // 
-            this.as_method.EditValue = "";
-            this.as_method.Location = new System.Drawing.Point(195, 185);
-            this.as_method.Name = "as_method";
-            this.as_method.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_method.Size = new System.Drawing.Size(306, 36);
-            this.as_method.TabIndex = 184;
-            // 
-            // as_reason
-            // 
-            this.as_reason.EditValue = "";
-            this.as_reason.Location = new System.Drawing.Point(805, 95);
-            this.as_reason.Name = "as_reason";
-            this.as_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_reason.Size = new System.Drawing.Size(306, 36);
-            this.as_reason.TabIndex = 164;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.ForeColor = System.Drawing.Color.Black;
-            this.label9.Location = new System.Drawing.Point(1687, 451);
-            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(0, 41);
-            this.label9.TabIndex = 125;
-            // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label21.ForeColor = System.Drawing.Color.Black;
-            this.label21.Location = new System.Drawing.Point(18, 99);
-            this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(146, 41);
-            this.label21.TabIndex = 175;
-            this.label21.Text = "分析过程";
-            // 
-            // label20
-            // 
-            this.label20.AutoSize = true;
-            this.label20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(590, 99);
-            this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(146, 41);
-            this.label20.TabIndex = 177;
-            this.label20.Text = "原因分析";
-            // 
-            // label18
-            // 
-            this.label18.AutoSize = true;
-            this.label18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.ForeColor = System.Drawing.Color.Black;
-            this.label18.Location = new System.Drawing.Point(590, 186);
-            this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(146, 41);
-            this.label18.TabIndex = 181;
-            this.label18.Text = "不良属性";
-            // 
-            // label19
-            // 
-            this.label19.AutoSize = true;
-            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label19.ForeColor = System.Drawing.Color.Black;
-            this.label19.Location = new System.Drawing.Point(18, 186);
-            this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(146, 41);
-            this.label19.TabIndex = 179;
-            this.label19.Text = "处理方法";
-            // 
-            // groupBoxWithBorder2
-            // 
-            this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder2.Controls.Add(this.as_lcdconfirm);
-            this.groupBoxWithBorder2.Controls.Add(this.as_shellconfirm);
-            this.groupBoxWithBorder2.Controls.Add(this.as_duty2);
-            this.groupBoxWithBorder2.Controls.Add(this.as_recheck);
-            this.groupBoxWithBorder2.Controls.Add(this.as_changerconfirm);
-            this.groupBoxWithBorder2.Controls.Add(this.label14);
-            this.groupBoxWithBorder2.Controls.Add(this.label13);
-            this.groupBoxWithBorder2.Controls.Add(this.label12);
-            this.groupBoxWithBorder2.Controls.Add(this.label11);
-            this.groupBoxWithBorder2.Controls.Add(this.label8);
-            this.groupBoxWithBorder2.Controls.Add(this.label10);
-            this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(16, 435);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(4);
-            this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(1321, 295);
-            this.groupBoxWithBorder2.TabIndex = 162;
-            this.groupBoxWithBorder2.TabStop = false;
-            this.groupBoxWithBorder2.Text = "工厂复测确认信息";
-            this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
-            // 
-            // as_lcdconfirm
-            // 
-            this.as_lcdconfirm.AllowHtmlTextInToolTip = DevExpress.Utils.DefaultBoolean.False;
-            this.as_lcdconfirm.Location = new System.Drawing.Point(808, 72);
-            this.as_lcdconfirm.Name = "as_lcdconfirm";
-            this.as_lcdconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_lcdconfirm.Size = new System.Drawing.Size(306, 36);
-            this.as_lcdconfirm.TabIndex = 193;
-            // 
-            // as_shellconfirm
-            // 
-            this.as_shellconfirm.Location = new System.Drawing.Point(249, 148);
-            this.as_shellconfirm.Name = "as_shellconfirm";
-            this.as_shellconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_shellconfirm.Size = new System.Drawing.Size(306, 36);
-            this.as_shellconfirm.TabIndex = 192;
-            // 
-            // as_duty2
-            // 
-            this.as_duty2.Location = new System.Drawing.Point(249, 223);
-            this.as_duty2.Name = "as_duty2";
-            this.as_duty2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_duty2.Size = new System.Drawing.Size(306, 36);
-            this.as_duty2.TabIndex = 191;
-            // 
-            // as_recheck
-            // 
-            this.as_recheck.EditValue = "";
-            this.as_recheck.Location = new System.Drawing.Point(249, 75);
-            this.as_recheck.Name = "as_recheck";
-            this.as_recheck.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_recheck.Size = new System.Drawing.Size(306, 36);
-            this.as_recheck.TabIndex = 190;
-            // 
-            // as_changerconfirm
-            // 
-            this.as_changerconfirm.EditValue = "";
-            this.as_changerconfirm.Location = new System.Drawing.Point(805, 148);
-            this.as_changerconfirm.Name = "as_changerconfirm";
-            this.as_changerconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_changerconfirm.Size = new System.Drawing.Size(306, 36);
-            this.as_changerconfirm.TabIndex = 187;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.ForeColor = System.Drawing.Color.Black;
-            this.label14.Location = new System.Drawing.Point(18, 219);
-            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(165, 41);
-            this.label14.TabIndex = 171;
-            this.label14.Text = "责任归属2";
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(590, 148);
-            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(146, 41);
-            this.label13.TabIndex = 169;
-            this.label13.Text = "配件确认";
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(18, 148);
-            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(210, 41);
-            this.label12.TabIndex = 167;
-            this.label12.Text = "壳体外观确认";
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(590, 76);
-            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(210, 41);
-            this.label11.TabIndex = 165;
-            this.label11.Text = "屏幕外观确认";
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(1687, 451);
-            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(0, 41);
-            this.label8.TabIndex = 125;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.ForeColor = System.Drawing.Color.Black;
-            this.label10.Location = new System.Drawing.Point(18, 76);
-            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(210, 41);
-            this.label10.TabIndex = 162;
-            this.label10.Text = "工厂复测确认";
-            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
@@ -448,13 +175,13 @@ namespace UAS_MES_NEW.Special
             // AS_BADCODE
             // 
             this.AS_BADCODE.AllPower = null;
-            this.AS_BADCODE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_BADCODE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_BADCODE.BackColor = System.Drawing.Color.White;
             this.AS_BADCODE.Enabled = false;
             this.AS_BADCODE.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_BADCODE.ID = null;
-            this.AS_BADCODE.Location = new System.Drawing.Point(1284, 62);
+            this.AS_BADCODE.Location = new System.Drawing.Point(1289, 67);
             this.AS_BADCODE.Margin = new System.Windows.Forms.Padding(6);
             this.AS_BADCODE.Name = "AS_BADCODE";
             this.AS_BADCODE.Power = null;
@@ -468,13 +195,13 @@ namespace UAS_MES_NEW.Special
             // as_sku
             // 
             this.as_sku.AllPower = null;
-            this.as_sku.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.as_sku.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.as_sku.BackColor = System.Drawing.Color.White;
             this.as_sku.Enabled = false;
             this.as_sku.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.as_sku.ID = null;
-            this.as_sku.Location = new System.Drawing.Point(1284, 132);
+            this.as_sku.Location = new System.Drawing.Point(1289, 137);
             this.as_sku.Margin = new System.Windows.Forms.Padding(6);
             this.as_sku.Name = "as_sku";
             this.as_sku.Power = null;
@@ -490,7 +217,7 @@ namespace UAS_MES_NEW.Special
             this.nr_code.AutoSize = true;
             this.nr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_code.ForeColor = System.Drawing.Color.Black;
-            this.nr_code.Location = new System.Drawing.Point(1687, 451);
+            this.nr_code.Location = new System.Drawing.Point(1692, 456);
             this.nr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.nr_code.Name = "nr_code";
             this.nr_code.Size = new System.Drawing.Size(0, 41);
@@ -500,7 +227,7 @@ namespace UAS_MES_NEW.Special
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(1126, 126);
+            this.label7.Location = new System.Drawing.Point(1131, 131);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(80, 41);
@@ -521,13 +248,13 @@ namespace UAS_MES_NEW.Special
             // AS_DUTY
             // 
             this.AS_DUTY.AllPower = null;
-            this.AS_DUTY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_DUTY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_DUTY.BackColor = System.Drawing.Color.White;
             this.AS_DUTY.Enabled = false;
             this.AS_DUTY.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_DUTY.ID = null;
-            this.AS_DUTY.Location = new System.Drawing.Point(1323, 371);
+            this.AS_DUTY.Location = new System.Drawing.Point(1328, 376);
             this.AS_DUTY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_DUTY.Name = "AS_DUTY";
             this.AS_DUTY.Power = null;
@@ -542,7 +269,7 @@ namespace UAS_MES_NEW.Special
             // 
             this.AS_BADCODE_label.AutoSize = true;
             this.AS_BADCODE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AS_BADCODE_label.Location = new System.Drawing.Point(1126, 57);
+            this.AS_BADCODE_label.Location = new System.Drawing.Point(1131, 62);
             this.AS_BADCODE_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.AS_BADCODE_label.Name = "AS_BADCODE_label";
             this.AS_BADCODE_label.Size = new System.Drawing.Size(146, 41);
@@ -552,13 +279,13 @@ namespace UAS_MES_NEW.Special
             // AS_FACTORY
             // 
             this.AS_FACTORY.AllPower = null;
-            this.AS_FACTORY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_FACTORY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_FACTORY.BackColor = System.Drawing.Color.White;
             this.AS_FACTORY.Enabled = false;
             this.AS_FACTORY.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_FACTORY.ID = null;
-            this.AS_FACTORY.Location = new System.Drawing.Point(805, 368);
+            this.AS_FACTORY.Location = new System.Drawing.Point(810, 373);
             this.AS_FACTORY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_FACTORY.Name = "AS_FACTORY";
             this.AS_FACTORY.Power = null;
@@ -572,13 +299,13 @@ namespace UAS_MES_NEW.Special
             // AS_WAY
             // 
             this.AS_WAY.AllPower = null;
-            this.AS_WAY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_WAY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_WAY.BackColor = System.Drawing.Color.White;
             this.AS_WAY.Enabled = false;
             this.AS_WAY.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_WAY.ID = null;
-            this.AS_WAY.Location = new System.Drawing.Point(256, 368);
+            this.AS_WAY.Location = new System.Drawing.Point(261, 373);
             this.AS_WAY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_WAY.Name = "AS_WAY";
             this.AS_WAY.Power = null;
@@ -594,7 +321,7 @@ namespace UAS_MES_NEW.Special
             this.nrg_code.AutoSize = true;
             this.nrg_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nrg_code.ForeColor = System.Drawing.Color.Black;
-            this.nrg_code.Location = new System.Drawing.Point(1617, 342);
+            this.nrg_code.Location = new System.Drawing.Point(1622, 347);
             this.nrg_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.nrg_code.Name = "nrg_code";
             this.nrg_code.Size = new System.Drawing.Size(0, 41);
@@ -604,13 +331,13 @@ namespace UAS_MES_NEW.Special
             // AS_CHARGER
             // 
             this.AS_CHARGER.AllPower = null;
-            this.AS_CHARGER.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_CHARGER.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_CHARGER.BackColor = System.Drawing.Color.White;
             this.AS_CHARGER.Enabled = false;
             this.AS_CHARGER.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_CHARGER.ID = null;
-            this.AS_CHARGER.Location = new System.Drawing.Point(1323, 301);
+            this.AS_CHARGER.Location = new System.Drawing.Point(1328, 306);
             this.AS_CHARGER.Margin = new System.Windows.Forms.Padding(6);
             this.AS_CHARGER.Name = "AS_CHARGER";
             this.AS_CHARGER.Power = null;
@@ -626,7 +353,7 @@ namespace UAS_MES_NEW.Special
             this.as_id.AutoSize = true;
             this.as_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.as_id.ForeColor = System.Drawing.Color.Black;
-            this.as_id.Location = new System.Drawing.Point(1659, 348);
+            this.as_id.Location = new System.Drawing.Point(1664, 353);
             this.as_id.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.as_id.Name = "as_id";
             this.as_id.Size = new System.Drawing.Size(0, 41);
@@ -636,13 +363,13 @@ namespace UAS_MES_NEW.Special
             // AS_SHELL
             // 
             this.AS_SHELL.AllPower = null;
-            this.AS_SHELL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_SHELL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_SHELL.BackColor = System.Drawing.Color.White;
             this.AS_SHELL.Enabled = false;
             this.AS_SHELL.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_SHELL.ID = null;
-            this.AS_SHELL.Location = new System.Drawing.Point(805, 301);
+            this.AS_SHELL.Location = new System.Drawing.Point(810, 306);
             this.AS_SHELL.Margin = new System.Windows.Forms.Padding(6);
             this.AS_SHELL.Name = "AS_SHELL";
             this.AS_SHELL.Power = null;
@@ -656,13 +383,13 @@ namespace UAS_MES_NEW.Special
             // AS_LCD
             // 
             this.AS_LCD.AllPower = null;
-            this.AS_LCD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.AS_LCD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_LCD.BackColor = System.Drawing.Color.White;
             this.AS_LCD.Enabled = false;
             this.AS_LCD.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_LCD.ID = null;
-            this.AS_LCD.Location = new System.Drawing.Point(256, 301);
+            this.AS_LCD.Location = new System.Drawing.Point(261, 306);
             this.AS_LCD.Margin = new System.Windows.Forms.Padding(6);
             this.AS_LCD.Name = "AS_LCD";
             this.AS_LCD.Power = null;
@@ -678,7 +405,7 @@ namespace UAS_MES_NEW.Special
             this.AS_DESCRIPTION_label.AutoSize = true;
             this.AS_DESCRIPTION_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.AS_DESCRIPTION_label.ForeColor = System.Drawing.Color.Black;
-            this.AS_DESCRIPTION_label.Location = new System.Drawing.Point(34, 55);
+            this.AS_DESCRIPTION_label.Location = new System.Drawing.Point(39, 60);
             this.AS_DESCRIPTION_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.AS_DESCRIPTION_label.Name = "AS_DESCRIPTION_label";
             this.AS_DESCRIPTION_label.Size = new System.Drawing.Size(210, 41);
@@ -690,7 +417,7 @@ namespace UAS_MES_NEW.Special
             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.Black;
-            this.label6.Location = new System.Drawing.Point(1143, 366);
+            this.label6.Location = new System.Drawing.Point(1148, 371);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(165, 41);
@@ -702,7 +429,7 @@ namespace UAS_MES_NEW.Special
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(26, 304);
+            this.label1.Location = new System.Drawing.Point(31, 309);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(232, 41);
@@ -714,7 +441,7 @@ namespace UAS_MES_NEW.Special
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(566, 366);
+            this.label5.Location = new System.Drawing.Point(571, 371);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(82, 41);
@@ -726,7 +453,7 @@ namespace UAS_MES_NEW.Special
             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.Black;
-            this.label2.Location = new System.Drawing.Point(566, 304);
+            this.label2.Location = new System.Drawing.Point(571, 309);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(232, 41);
@@ -738,7 +465,7 @@ namespace UAS_MES_NEW.Special
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(26, 366);
+            this.label4.Location = new System.Drawing.Point(31, 371);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(82, 41);
@@ -750,7 +477,7 @@ namespace UAS_MES_NEW.Special
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(1143, 304);
+            this.label3.Location = new System.Drawing.Point(1148, 309);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(168, 41);
@@ -760,7 +487,7 @@ namespace UAS_MES_NEW.Special
             // GetSNCode
             // 
             this.GetSNCode.AllPower = null;
-            this.GetSNCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.GetSNCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
@@ -806,14 +533,277 @@ namespace UAS_MES_NEW.Special
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
+            // as_lcdconfirm
+            // 
+            this.as_lcdconfirm.EditValue = "";
+            this.as_lcdconfirm.Location = new System.Drawing.Point(851, 502);
+            this.as_lcdconfirm.Name = "as_lcdconfirm";
+            this.as_lcdconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_lcdconfirm.Size = new System.Drawing.Size(306, 36);
+            this.as_lcdconfirm.TabIndex = 206;
+            // 
+            // as_shellconfirm
+            // 
+            this.as_shellconfirm.Location = new System.Drawing.Point(265, 566);
+            this.as_shellconfirm.Name = "as_shellconfirm";
+            this.as_shellconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_shellconfirm.Size = new System.Drawing.Size(306, 36);
+            this.as_shellconfirm.TabIndex = 205;
+            // 
+            // as_duty2
+            // 
+            this.as_duty2.Location = new System.Drawing.Point(265, 641);
+            this.as_duty2.Name = "as_duty2";
+            this.as_duty2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_duty2.Size = new System.Drawing.Size(306, 36);
+            this.as_duty2.TabIndex = 204;
+            // 
+            // as_changerconfirm
+            // 
+            this.as_changerconfirm.EditValue = "";
+            this.as_changerconfirm.Location = new System.Drawing.Point(847, 566);
+            this.as_changerconfirm.Name = "as_changerconfirm";
+            this.as_changerconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_changerconfirm.Size = new System.Drawing.Size(306, 36);
+            this.as_changerconfirm.TabIndex = 202;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label14.ForeColor = System.Drawing.Color.Black;
+            this.label14.Location = new System.Drawing.Point(38, 641);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(165, 41);
+            this.label14.TabIndex = 201;
+            this.label14.Text = "责任归属2";
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label13.ForeColor = System.Drawing.Color.Black;
+            this.label13.Location = new System.Drawing.Point(632, 569);
+            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(146, 41);
+            this.label13.TabIndex = 200;
+            this.label13.Text = "配件确认";
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label12.ForeColor = System.Drawing.Color.Black;
+            this.label12.Location = new System.Drawing.Point(38, 570);
+            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(210, 41);
+            this.label12.TabIndex = 199;
+            this.label12.Text = "壳体外观确认";
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label11.ForeColor = System.Drawing.Color.Black;
+            this.label11.Location = new System.Drawing.Point(632, 497);
+            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(210, 41);
+            this.label11.TabIndex = 198;
+            this.label11.Text = "屏幕外观确认";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label10.ForeColor = System.Drawing.Color.Black;
+            this.label10.Location = new System.Drawing.Point(38, 498);
+            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(210, 41);
+            this.label10.TabIndex = 197;
+            this.label10.Text = "工厂复测确认";
+            // 
+            // as_recheck
+            // 
+            this.as_recheck.Condition = null;
+            this.as_recheck.Field = null;
+            this.as_recheck.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_recheck.Location = new System.Drawing.Point(265, 493);
+            this.as_recheck.Margin = new System.Windows.Forms.Padding(4);
+            this.as_recheck.Name = "as_recheck";
+            this.as_recheck.Size = new System.Drawing.Size(306, 39);
+            this.as_recheck.TabIndex = 203;
+            this.as_recheck.TableName = null;
+            this.as_recheck.Value = null;
+            this.as_recheck.ValueField = null;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.ForeColor = System.Drawing.Color.Black;
+            this.label8.Location = new System.Drawing.Point(9, 437);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(210, 41);
+            this.label8.TabIndex = 163;
+            this.label8.Text = "工厂复测信息";
+            // 
+            // as_method
+            // 
+            this.as_method.Condition = null;
+            this.as_method.Field = null;
+            this.as_method.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_method.Location = new System.Drawing.Point(265, 911);
+            this.as_method.Margin = new System.Windows.Forms.Padding(4);
+            this.as_method.Name = "as_method";
+            this.as_method.Size = new System.Drawing.Size(306, 39);
+            this.as_method.TabIndex = 214;
+            this.as_method.TableName = null;
+            this.as_method.Value = null;
+            this.as_method.ValueField = null;
+            // 
+            // as_badpro
+            // 
+            this.as_badpro.Condition = null;
+            this.as_badpro.Field = null;
+            this.as_badpro.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_badpro.Location = new System.Drawing.Point(847, 911);
+            this.as_badpro.Margin = new System.Windows.Forms.Padding(4);
+            this.as_badpro.Name = "as_badpro";
+            this.as_badpro.Size = new System.Drawing.Size(306, 39);
+            this.as_badpro.TabIndex = 213;
+            this.as_badpro.TableName = null;
+            this.as_badpro.Value = null;
+            this.as_badpro.ValueField = null;
+            // 
+            // as_reason
+            // 
+            this.as_reason.Condition = null;
+            this.as_reason.Field = null;
+            this.as_reason.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_reason.Location = new System.Drawing.Point(847, 828);
+            this.as_reason.Margin = new System.Windows.Forms.Padding(4);
+            this.as_reason.Name = "as_reason";
+            this.as_reason.Size = new System.Drawing.Size(306, 39);
+            this.as_reason.TabIndex = 212;
+            this.as_reason.TableName = null;
+            this.as_reason.Value = null;
+            this.as_reason.ValueField = null;
+            // 
+            // as_process
+            // 
+            this.as_process.AllPower = null;
+            this.as_process.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.as_process.BackColor = System.Drawing.Color.White;
+            this.as_process.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_process.ID = null;
+            this.as_process.Location = new System.Drawing.Point(265, 826);
+            this.as_process.Margin = new System.Windows.Forms.Padding(6);
+            this.as_process.Name = "as_process";
+            this.as_process.Power = null;
+            this.as_process.Size = new System.Drawing.Size(306, 39);
+            this.as_process.Str = null;
+            this.as_process.Str1 = null;
+            this.as_process.Str2 = null;
+            this.as_process.TabIndex = 207;
+            this.as_process.Tag = "Read";
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label21.ForeColor = System.Drawing.Color.Black;
+            this.label21.Location = new System.Drawing.Point(38, 821);
+            this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(146, 41);
+            this.label21.TabIndex = 208;
+            this.label21.Text = "分析过程";
+            // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label20.ForeColor = System.Drawing.Color.Black;
+            this.label20.Location = new System.Drawing.Point(632, 828);
+            this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(146, 41);
+            this.label20.TabIndex = 209;
+            this.label20.Text = "原因分析";
+            // 
+            // label18
+            // 
+            this.label18.AutoSize = true;
+            this.label18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label18.ForeColor = System.Drawing.Color.Black;
+            this.label18.Location = new System.Drawing.Point(636, 911);
+            this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(146, 41);
+            this.label18.TabIndex = 211;
+            this.label18.Text = "不良属性";
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label19.ForeColor = System.Drawing.Color.Black;
+            this.label19.Location = new System.Drawing.Point(38, 911);
+            this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(146, 41);
+            this.label19.TabIndex = 210;
+            this.label19.Text = "处理方法";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.ForeColor = System.Drawing.Color.Black;
+            this.label9.Location = new System.Drawing.Point(9, 741);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(306, 41);
+            this.label9.TabIndex = 215;
+            this.label9.Text = "工厂翻新及交付信息";
+            // 
             // Special_Repair
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1800, 1158);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.as_method);
+            this.Controls.Add(this.as_badpro);
+            this.Controls.Add(this.as_reason);
+            this.Controls.Add(this.as_process);
+            this.Controls.Add(this.label21);
+            this.Controls.Add(this.label20);
+            this.Controls.Add(this.label18);
+            this.Controls.Add(this.label19);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.as_lcdconfirm);
+            this.Controls.Add(this.as_shellconfirm);
+            this.Controls.Add(this.as_duty2);
+            this.Controls.Add(this.as_changerconfirm);
+            this.Controls.Add(this.label14);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.label12);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.label10);
+            this.Controls.Add(this.as_recheck);
             this.Controls.Add(this.Save);
-            this.Controls.Add(this.groupBoxWithBorder3);
-            this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.bc_code);
             this.Controls.Add(this.GetSNCode);
@@ -830,21 +820,12 @@ namespace UAS_MES_NEW.Special
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();
-            this.groupBoxWithBorder3.ResumeLayout(true);
-            this.groupBoxWithBorder3.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.as_badpro.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_process.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_method.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_reason.Properties)).EndInit();
-            this.groupBoxWithBorder2.ResumeLayout(true);
-            this.groupBoxWithBorder2.PerformLayout();
+            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.as_lcdconfirm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_shellconfirm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_duty2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_recheck.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(true);
-            this.groupBoxWithBorder1.PerformLayout();
             this.ResumeLayout(true);
             this.PerformLayout();
 
@@ -878,30 +859,28 @@ namespace UAS_MES_NEW.Special
         private CustomControl.TextBoxWithIcon.SnCollectionBox AS_DUTY;
         private System.Windows.Forms.Label label7;
         private CustomControl.TextBoxWithIcon.SnCollectionBox as_sku;
-        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder2;
-        private System.Windows.Forms.Label label8;
-        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder3;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label10;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox AS_BADCODE;
+        private CustomControl.ButtonUtil.NormalButton Save;
+        private CustomControl.RichText.RichTextAutoBottom OperatResult;
+        private DevExpress.XtraEditors.CheckedComboBoxEdit as_lcdconfirm;
+        private DevExpress.XtraEditors.ComboBoxEdit as_shellconfirm;
+        private DevExpress.XtraEditors.ComboBoxEdit as_duty2;
+        private DevExpress.XtraEditors.CheckedComboBoxEdit as_changerconfirm;
         private System.Windows.Forms.Label label14;
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label label10;
+        private MultBlurSearch as_recheck;
+        private System.Windows.Forms.Label label8;
+        private MultBlurSearch as_method;
+        private MultBlurSearch as_badpro;
+        private MultBlurSearch as_reason;
+        private SnCollectionBox as_process;
         private System.Windows.Forms.Label label21;
         private System.Windows.Forms.Label label20;
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.Label label19;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_reason;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_process;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_method;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_recheck;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_changerconfirm;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox AS_BADCODE;
-        private CustomControl.ButtonUtil.NormalButton Save;
-        private CustomControl.RichText.RichTextAutoBottom OperatResult;
-        private DevExpress.XtraEditors.ComboBoxEdit as_duty2;
-        private DevExpress.XtraEditors.ComboBoxEdit as_badpro;
-        private DevExpress.XtraEditors.ComboBoxEdit as_lcdconfirm;
-        private DevExpress.XtraEditors.ComboBoxEdit as_shellconfirm;
+        private System.Windows.Forms.Label label9;
     }
 }

UAS_MES_ODLF/FunctionCode/Special/Special_Repair.cs

@@ -31,16 +31,28 @@ namespace UAS_MES_NEW.Special
             dh = SystemInf.dh;
             GetSNCode.Focus();
             //工厂复测确认
-            string[] str = new string[] { "检测无故障","缝隙段差","破屏","不充电","不开机","花屏","NTF","黑屏","白斑","气泡","摄像头故障","触摸失灵","自动重启"
-                                ,"进液","私拆","不进系统","自动关机","扬声器故障","联网故障","触屏不良","暗点","待机时间短","前摄像头无法打开","人为私拆","喇叭杂音","尾插坏","无法进入主界面","侧键故障"
-                                ,"麦克风故障","按键故障","闪屏","开裂","红斑","无发唤醒","语音无法唤醒","WIFI故障","偏色","无法进入系统","色斑","充电故障","后摄像头无法打开","机体发热","距离感应无用"
-                                ,"摄像头模糊","有异响","摄像头有异物","黑斑","拍照模糊","杂音","白屏","机体分离","摄像头脱落","气泡","死机","无前摄像头"
-                                ,"电源接口损坏","蓝斑","跳屏","无显示","充电慢","漏光","智能眼故障","亮点","充电发烫","烧机","无后摄像头","电池鼓包"};
-            for (int i = 0; i < str.Length; i++)
-            {
-                as_recheck.Properties.Items.Add(str[i]);
-            }
 
+        
+            as_recheck.TableName = "aftersaleinf";
+            as_recheck.Field = "ASI_VALUES";
+            as_recheck.ValueField = "ASI_VALUES";
+            as_recheck.Condition = " asi_type='工厂复测确认' ";
+
+            as_badpro.TableName = "aftersaleinf";
+            as_badpro.Field = "ASI_VALUES";
+            as_badpro.ValueField = "ASI_VALUES";
+            as_badpro.Condition = " asi_type='不良属性' ";
+
+            as_method.TableName = "aftersaleinf";
+            as_method.Field = "ASI_VALUES";
+            as_method.ValueField = "ASI_VALUES";
+            as_method.Condition = " asi_type='处理方法' ";
+
+            as_reason.TableName = "aftersaleinf";
+            as_reason.Field = "ASI_VALUES";
+            as_reason.ValueField = "ASI_VALUES";
+            as_reason.Condition = " asi_type='原因分析' ";
+          
             //屏幕外观确认
             as_lcdconfirm.Properties.Items.Add("有");
             as_lcdconfirm.Properties.Items.Add("无");
@@ -49,61 +61,26 @@ namespace UAS_MES_NEW.Special
             as_shellconfirm.Properties.Items.Add("无");
 
             //配件确认
-            string[] str3 = new string[] { "无支架", "无皮套", "无数据线", "无包装", "有适配器", "无适配器", "有支架", "有皮套" };
-            for (int i = 0; i < str3.Length; i++)
+            dt = (DataTable)dh.ExecuteSql("select ASI_VALUES from aftersaleinf where asi_type='配件确认'", "select");
+            for (int i = 0; i < dt.Rows.Count; i++)
             {
-                as_changerconfirm.Properties.Items.Add(str3[i]);
+                as_changerconfirm.Properties.Items.Add(dt.Rows[i][0].ToString());
             }
+
             //责任归属2
             as_duty2.Properties.Items.Add("小度");
             as_duty2.Properties.Items.Add("欧度利方");
-            //原因分析
-            string[] str4 = new string[] { "检测无故障闪屏","人为损坏", "屏失灵", "副板不良", "重装OK", "屏端排线没扣",
-                "屏气泡", "前摄不良", "进液少主排线", "进液", "重装副板OK","副板端排线没扣","花屏","黑屏","屏斑点",
-                "充电插口损坏","刷机","主板端排线没扣","NTF","不充电","电池故障","尾插坏","充电插口烧坏","主板升压烧坏",
-                "主板私修","充CPU虚焊电OK","DDP虚焊","私拆","后摄镜片划伤","充电IC不良","换膜OK","按键排线不良","电池松动",
-                "送话器排线不良","喇叭不良","电池耗电","底壳故障","屏线条","副板无触摸","重扣排线OK","后摄不良","屏亮点"
-                 ,"屏黑点","开机键排线不良","触摸失灵","屏显暗","破屏","侧键不良","WIFI故障","摄像头故障","暗点","灯控升压二极管坏",
-                "进液主板屏坏","前摄扣座松动","刷机OK","电池扣座松动","CPU不良"};
-            for (int i = 0; i < str4.Length; i++)
-            {
-                as_reason.Properties.Items.Add(str4[i]);
-            }
-            //处理方法
-            string[] str1 = new string[] { "换屏", "换底壳", "换主板", "换喇叭", "换前摄像头", "换后摄像头", "刷机翻新", "换电池"
-                                , "换FPC排线","换副板" ,"换后摄镜片" ,"换后摄镜片" ,"换天线" ,"换麦克" ,"重装OK" };
-            for (int i = 0; i < str1.Length; i++)
-            {
-                as_method.Properties.Items.Add(str1[i]);
-            }
-
-            //不良属性
-            string[] str2 = new string[] { "外观", "七天", "过保", "NTF", "功能", "人为损坏" };
-            for (int i = 0; i < str2.Length; i++)
-            {
-                as_badpro.Properties.Items.Add(str2[i]);
-            }
-
-            //dt = (DataTable)dh.ExecuteSql("select distinct so_name from solution", "select");
-            //for (int i = 0; i < dt.Rows.Count; i++)
-            //{
-            //    as_method.Properties.Items.Add(dt.Rows[i][0].ToString());
-            //}
-        }
-
-        private void Prodcode_DbChange(object sender, EventArgs e)
-        {
-
-        }
-
-        private void Cd_stepcode_DbChange(object sender, EventArgs e)
-        {
-
-        }
-
-        private void Cr_code_DbChange(object sender, EventArgs e)
-        {
-
+            asc.controllInitializeSize(this);
+            as_reason.SendToBack();
+            as_badpro.SendToBack();
+            as_method.SendToBack();
+            as_recheck.SendToBack();
+            as_lcdconfirm.SendToBack();
+            as_shellconfirm.SendToBack();
+            as_changerconfirm.SendToBack();
+            AS_DUTY.SendToBack();
+            as_duty2.SendToBack();
+            GetSNCode.SendToBack();
         }
 
         private void GetSNCode_KeyDown(object sender, KeyEventArgs e)
@@ -203,9 +180,32 @@ namespace UAS_MES_NEW.Special
             sql.Append(" AS_RECEIVETIME=sysdate, as_repairman='" + User.UserName + "' where as_id='" + as_id.Text + "'");
             dh.ExecuteSql(sql.GetString(), "update");
             OperatResult.AppendText(">>序列号【" + GetSNCode.Text + "】保存维修信息成功\n", Color.Green);
+
+            dt = (DataTable)dh.ExecuteSql("select max(ms_id) from makeserial where ms_sncode='" + GetSNCode.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string ms_id = dt.Rows[0][0].ToString();
+                dt = (DataTable)dh.ExecuteSql("select ms_firstsn from makeserial where ms_id='" + ms_id + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    string ms_firstsn = dt.Rows[0][0].ToString();
+                    dh.ExecuteSql("update craftmaterial set cm_status=-1 where cm_firstsn='" + ms_firstsn + "'", "update");
+                    OperatResult.AppendText(">>序列号【" + GetSNCode.Text + "】物料拆解成功\n", Color.Green);
+                }
+            }
             GetSNCode.Clear();
             AS_DESCRIPTION.Clear();
             BaseUtil.CleanForm(this);
         }
+
+        private void as_recheck_ImeModeChanged(object sender, EventArgs e)
+        {
+            Console.WriteLine(as_recheck.ImeMode.ToString());
+        }
+
+        private void as_recheck_Modified(object sender, EventArgs e)
+        {
+        
+        }
     }
 }

UAS_MES_ODLF/UAS_MES_ODLF.csproj

@@ -356,6 +356,12 @@
     <Compile Include="CustomControl\SetLoading\LoadingCircle.Designer.cs">
       <DependentUpon>LoadingCircle.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\MultBlurSearch.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\MultBlurSearch.Designer.cs">
+      <DependentUpon>MultBlurSearch.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\BlurSearch.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -1237,6 +1243,9 @@
     <EmbeddedResource Include="CustomControl\ProcessBar\ProcessBar.resx">
       <DependentUpon>ProcessBar.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\MultBlurSearch.resx">
+      <DependentUpon>MultBlurSearch.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\BlurSearch.resx">
       <DependentUpon>BlurSearch.cs</DependentUpon>
     </EmbeddedResource>

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.cs

@@ -227,7 +227,7 @@ namespace UAS_MES_NEW.Make
                         }
                         if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {
-                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,nvl(ma_softversion,ms_softversion)ma_softversion,ma_salecode,substr(pr_spec,0,50)pr_spec,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from makeserial left join  make on ma_code=ms_makecode left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "' and ms_sncode='"+ ms_sncode.Text + "'", "select");
+                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,nvl(ma_softversion,ms_softversion)ma_softversion,ma_salecode,substr(pr_spec,0,50)pr_spec,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from makeserial left join  make on ma_code=ms_makecode left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "' and ms_sncode='" + ms_sncode.Text + "'", "select");
                             if (dt.Rows.Count > 0)
                             {
                                 BaseUtil.SetFormValue(this.Controls, dt);
@@ -517,10 +517,16 @@ namespace UAS_MES_NEW.Make
                     }
                 }
                 //如果之前是良品的
-                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
+                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno", "ms_outboxcode" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
                 if (dt.Rows.Count > 0)
                 {
                     string status = dt.Rows[0]["ms_status"].ToString();
+                    string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
+                    if (ms_outboxcode != "")
+                    {
+                        OperateResult.AppendText(">>" + ms_sncode.Text + "已装箱"+ ms_outboxcode + ",请先取消装箱\n", Color.Green);
+                        return;
+                    }
                     if (status == "1" || status == "2")
                     {
                         dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");

UAS_MES_YD/FunctionCode/Packing/Packing_PalletCollection.cs

@@ -373,10 +373,10 @@ namespace UAS_MES_NEW.Packing
             }
             BaseUtil.FillDgvWithDataTable(PackageInf, dt);
         }
-        DataTable _dt;
+
         private void FillPrintLabel()
         {
-            _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pa_prodcode.Text + "' and la_templatetype='栈板标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pa_prodcode.Text + "' and la_templatetype='栈板标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
@@ -423,27 +423,15 @@ namespace UAS_MES_NEW.Packing
                         outboxcode.Focus();
                         outboxcode.SelectAll();
                     }
-                    for (int i = 0; i < _dt.Rows.Count; i++)
+                    //doc = lbl.Documents.Open(PrintLabel.Text);
+                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                     {
-                        if (Print.BarTender(Tag.ToString(), ref engine, _dt.Rows[i]["la_url"].ToString(), _dt.Rows[i]["la_id"].ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
-                        {
-                            //提示用户打印成功
-                            OperateResult.AppendText(">>打印栈板" + pa_outboxcode.Text + "\n", Color.Black);
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                        }
+                        OperateResult.AppendText(">>打印栈板" + pa_outboxcode.Text + "\n", Color.Black);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }
-
-                    //if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
-                    //{
-                    //    OperateResult.AppendText(">>打印栈板" + pa_outboxcode.Text + "\n", Color.Black);
-                    //}
-                    //else
-                    //{
-                    //    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                    //}
 
                 }
                 else OperateResult.AppendText(">>必须封栈板才能进行打印\n", Color.Red);

UAS_MES_YD/FunctionCode/Special/Special_CancelCollection.cs

@@ -83,7 +83,7 @@ namespace UAS_MES_NEW.Special
                     sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
                 }
                 sqls.Add("delete from sninfo where si_sn='" + sn_code.Text + "'");
-                sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");
+                //sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");
                 //删除打印日志
                 sqls.Add("delete from labelprintlog where lpl_value='" + sn_code.Text + "' and lpl_makecode='" + ms_makecode + "'");
                 //删除老化记录

UAS_MES_YD/PublicMethod/Print.cs

@@ -71,7 +71,7 @@ namespace UAS_MES_NEW.PublicMethod
                     //查询的结果的参数个数大于1需要给标签的多个参数赋值
                     if (Param.Rows.Count > 0)
                     {
-                        int LoopTime = Param.Rows.Count > 100 ? 100 : Param.Rows.Count;
+                        int LoopTime = Param.Rows.Count > 200 ? 200 : Param.Rows.Count;
                         for (int j = 0; j < LoopTime; j++)
                         {
                             for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
@@ -174,7 +174,7 @@ namespace UAS_MES_NEW.PublicMethod
                     //查询的结果的参数个数大于1需要给标签的多个参数赋值
                     if (Param.Rows.Count > 0)
                     {
-                        int LoopTime = Param.Rows.Count > 100 ? 100 : Param.Rows.Count;
+                        int LoopTime = Param.Rows.Count > 200 ? 200 : Param.Rows.Count;
                         for (int j = 0; j < LoopTime; j++)
                         {
                             for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
@@ -279,7 +279,7 @@ namespace UAS_MES_NEW.PublicMethod
                     //查询的结果的参数个数大于1需要给标签的多个参数赋值
                     if (Param.Rows.Count > 0)
                     {
-                        int LoopTime = Param.Rows.Count > 100 ? 100 : Param.Rows.Count;
+                        int LoopTime = Param.Rows.Count > 200 ? 200 : Param.Rows.Count;
                         for (int j = 0; j < LoopTime; j++)
                         {
                             for (int k = 0; k < format.SubStrings.Count; k++)