添加了专门用于工单的输入框MakeCodeTextBox,放大镜MakeCodeSearchTextBox和勾选框LockMakeCode，用于工单的锁定，DbFind添加SuccessReturnData标识是否成功返回数据，用于Dbfind选择数据时自动锁定工单

UAS-MES/CustomControl/ButtonUtil/LockMakeCode.Designer.cs

@@ -0,0 +1,37 @@
+namespace UAS_MES.CustomControl.ButtonUtil
+{
+    partial class LockMakeCode
+    {
+        /// <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()
+        {
+            components = new System.ComponentModel.Container();
+           // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        }
+
+        #endregion
+    }
+}

UAS-MES/CustomControl/ButtonUtil/LockMakeCode.cs

@@ -0,0 +1,411 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using UAS_MES.Enum;
+using UAS_MES.Properties;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.CustomControl.ButtonUtil
+{
+    public partial class LockMakeCode : Button
+    {
+        #region 变量
+        /// <summary>
+        /// 鼠标状态
+        /// </summary>
+        private EMouseState _mouseState = EMouseState.Normal;
+        /// <summary>
+        /// 文本对齐方式
+        /// </summary>
+        private TextFormatFlags _textAlign = TextFormatFlags.VerticalCenter | TextFormatFlags.HorizontalCenter;
+        /// <summary>
+        /// 默认时的按钮图片
+        /// </summary>
+        private Image _normalImage = null;
+        /// <summary>
+        /// 鼠标按下时的图片
+        /// </summary>
+        private Image _downImage = null;
+        /// <summary>
+        /// 鼠标划过时的图片
+        /// </summary>
+        private Image _moveImage = null;
+        /// <summary>
+        /// 是否按下了鼠标
+        /// </summary>
+        private bool _isShowBorder = true;
+        /// <summary>
+        /// 权限标识符
+        /// </summary>
+        string Power1;
+
+        public string Power
+        {
+            get
+            {
+                return Power1;
+            }
+
+            set
+            {
+                Power1 = value;
+            }
+        }
+        string AllPower1;
+
+        public string AllPower
+        {
+            get
+            {
+                return AllPower1;
+            }
+
+            set
+            {
+                AllPower1 = value;
+            }
+        }
+       
+        #endregion
+
+        #region 构造函数
+        public LockMakeCode()
+        {
+            InitializeComponent();
+            this.SetStyle(
+                  ControlStyles.AllPaintingInWmPaint |
+                  ControlStyles.OptimizedDoubleBuffer |
+                  ControlStyles.ResizeRedraw |
+                  ControlStyles.Selectable |
+                  ControlStyles.DoubleBuffer |
+                  ControlStyles.SupportsTransparentBackColor |
+                  ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.Opaque, false);
+            base.BackColor = Color.Transparent;
+            this.UpdateStyles();
+        }
+        #endregion
+
+        #region 属性
+        /// <summary>
+        /// 默认大小
+        /// </summary>
+        protected override Size DefaultSize
+        {
+            get { return new Size(75, 28); }
+        }
+        /// <summary>
+        /// 默认图片
+        /// </summary>
+        [Description("默认图片")]
+        public virtual Image NormalImage
+        {
+            get
+            {
+                if (this._normalImage == null)
+                    this._normalImage = Resources.normal;
+                return this._normalImage;
+            }
+            set
+            {
+                this._normalImage = value;
+                base.Invalidate();
+            }
+        }
+        /// <summary>
+        /// 鼠标按下时的图片
+        /// </summary>
+        [Description("鼠标按下时的图片")]
+        public virtual Image DownImage
+        {
+            get
+            {
+                if (this._downImage == null)
+                    this._downImage = Resources.down;
+                return this._downImage;
+            }
+            set
+            {
+                this._downImage = value;
+                base.Invalidate();
+            }
+        }
+        /// <summary>
+        /// 鼠标划过时的图片
+        /// </summary>
+        [Description("鼠标划过时的图片")]
+        public virtual Image MoveImage
+        {
+            get
+            {
+                if (this._moveImage == null)
+                    this._moveImage = Resources.highlight;
+                return this._moveImage;
+            }
+            set
+            {
+                this._moveImage = value;
+
+                base.Invalidate();
+            }
+        }
+        /// <summary>
+        /// 是否显示发光边框
+        /// </summary>
+        [Description("是否显示发光边框")]
+        public virtual bool IsShowBorder
+        {
+            get { return this._isShowBorder; }
+            set { this._isShowBorder = value; }
+        }
+        /// <summary>
+        /// 与控件相关的文本
+        /// </summary>
+        [DefaultValue("QQButton")]
+        public override string Text
+        {
+            get { return base.Text; }
+            set
+            {
+                base.Text = value;
+                base.Invalidate(this.TextRect);
+            }
+        }
+        /// <summary>
+        /// 按钮上显示的图片
+        /// </summary>
+        [Description("按钮上显示的图片")]
+        public virtual new Image Image
+        {
+            get { return base.Image; }
+            set
+            {
+                base.Image = value;
+                base.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// 按钮上文字的对齐方式
+        /// </summary>
+        [Description("按钮上文字的对齐方式")]
+        new public ContentAlignment TextAlign
+        {
+            get { return base.TextAlign; }
+            set
+            {
+                base.TextAlign = value;
+                switch (base.TextAlign)
+                {
+                    case ContentAlignment.BottomCenter:
+                        this._textAlign = TextFormatFlags.Bottom |
+                                          TextFormatFlags.HorizontalCenter |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.BottomLeft:
+                        this._textAlign = TextFormatFlags.Bottom |
+                                          TextFormatFlags.Left |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.BottomRight:
+                        this._textAlign = TextFormatFlags.Bottom |
+                                          TextFormatFlags.Right |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.MiddleCenter:
+                        this._textAlign = TextFormatFlags.SingleLine |
+                                          TextFormatFlags.HorizontalCenter |
+                                          TextFormatFlags.VerticalCenter;
+                        break;
+                    case ContentAlignment.MiddleLeft:
+                        this._textAlign = TextFormatFlags.Left |
+                                          TextFormatFlags.VerticalCenter |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.MiddleRight:
+                        this._textAlign = TextFormatFlags.Right |
+                                          TextFormatFlags.VerticalCenter |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.TopCenter:
+                        this._textAlign = TextFormatFlags.Top |
+                                          TextFormatFlags.HorizontalCenter |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.TopLeft:
+                        this._textAlign = TextFormatFlags.Top |
+                                          TextFormatFlags.Left |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                    case ContentAlignment.TopRight:
+                        this._textAlign = TextFormatFlags.Top |
+                                          TextFormatFlags.Right |
+                                          TextFormatFlags.SingleLine;
+                        break;
+                }
+                base.Invalidate(this.TextRect);
+            }
+        }
+
+        /// <summary>
+        /// 整个按钮的区域
+        /// </summary>
+        internal Rectangle AllRect
+        {
+            get { return new Rectangle(0, 0, this.Width, this.Height); }
+        }
+        /// <summary>
+        /// 文字区域
+        /// </summary>
+        internal Rectangle TextRect
+        {
+            get { return new Rectangle(2, 2, this.AllRect.Width - 4, this.AllRect.Height - 4); }
+        }
+        /// <summary>
+        /// 鼠标状态
+        /// </summary>
+        internal EMouseState MouseState
+        {
+            get { return this._mouseState; }
+            set
+            {
+                this._mouseState = value;
+                base.Invalidate();
+            }
+        }
+
+ 
+
+        #endregion
+
+        #region Override 方法
+        /// <summary>
+        /// 引发 System.Windows.Forms.Form.Paint 事件。
+        /// </summary>
+        /// <param name="pevent">包含事件数据的 System.Windows.Forms.PaintEventArgs。</param>
+        protected override void OnPaint(PaintEventArgs pevent)
+        {
+            Graphics g = pevent.Graphics;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
+            //g.DrawImage(AssemblyHelper.GetAssemblyImage("Button.all_btn_White-side.png"), this.AllRect);
+            if (base.Enabled)
+            {
+                if (this.IsShowBorder)
+                {
+                    if (this.Focused)//得到焦点的时候，绘制边框
+                    {
+                        using (Image light = Resources.Light)
+                        {
+                            g.DrawImage(light, this.AllRect);
+                            //DrawHelper.RendererBackground(g, this.AllRect, light, true);
+                        }
+                    }
+                }
+
+                switch (this.MouseState)
+                {
+                    case EMouseState.Leave:
+                    case EMouseState.Normal:
+                        if (base.Focused)
+                        {
+                            if (this.IsShowBorder)
+                            {
+                                using (Image focus = Resources.focus)
+                                {
+                                    DrawHelper.RendererBackground(g, this.TextRect, focus, true);
+                                }
+                            }
+                            else
+                            {
+                                DrawHelper.RendererBackground(g, this.TextRect, this.NormalImage, true);
+                            }
+                        }
+                        else
+                        {
+                            DrawHelper.RendererBackground(g, this.TextRect, this.NormalImage, true);
+                        }
+                        break;
+                    case EMouseState.Up:
+                    case EMouseState.Move:
+                        DrawHelper.RendererBackground(g, this.TextRect, this.MoveImage, true);
+                        break;
+                    case EMouseState.Down:
+                        DrawHelper.RendererBackground(g, this.TextRect, this.DownImage, true);
+                        break;
+                }
+
+                //if (this.Image != null)
+                //{
+                //int y = (this.Height - this.Image.Height) / 2;
+                //int x = 10;
+
+                //if (!string.IsNullOrEmpty(this.Text))
+                //    x = (this.AllRect.Width - (TextHelper.GetStringLen(this.Text) * 6 + this.Image.Width)) / 2;
+                //else
+                //    x = (this.Width - this.Image.Width) / 2;//将图片绘制在按钮居中位置
+                //Rectangle rect = new Rectangle(x, y, this.Image.Width, this.Image.Height);
+                //Rectangle imgRect = new Rectangle(0, 0, this.Image.Width, this.Image.Height);
+                ////绘制图片
+                //g.DrawImage(this.Image, rect, imgRect, GraphicsUnit.Pixel);
+                ////绘制文字
+                //Rectangle textRect = new Rectangle(this.TextRect.X + this.Image.Width, this.TextRect.Y, this.TextRect.Width, this.TextRect.Height);
+                //TextRenderer.DrawText(g, this.Text, this.Font, textRect, this.ForeColor, _textAlign);
+                //}
+                //else
+                //{
+                //绘制按钮上的文字
+                TextRenderer.DrawText(g, this.Text, this.Font, this.TextRect, this.ForeColor, this._textAlign);
+                //}
+            }
+            else
+            {
+                using (Image gray = Resources.gray)
+                {
+                    DrawHelper.RendererBackground(g, this.TextRect, gray, true);
+                }
+                TextRenderer.DrawText(g, this.Text, this.Font, this.TextRect, Color.Gray, this._textAlign);
+            }
+        }
+        /// <summary>
+        /// 引发 System.Windows.Forms.Form.MouseEnter 事件。
+        /// </summary>
+        /// <param name="e">包含事件数据的 System.EventArgs。</param>
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+            this.MouseState = EMouseState.Move;
+        }
+        /// <summary>
+        /// 引发 System.Windows.Forms.Form.MouseLeave 事件。
+        /// </summary>
+        /// <param name="e">包含事件数据的 System.EventArgs。</param>
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+            this.MouseState = EMouseState.Leave;
+        }
+        /// <summary>
+        /// 引发 System.Windows.Forms.Form.MouseDown 事件。
+        /// </summary>
+        /// <param name="mevent">包含事件数据的 System.Windows.Forms.MouseEventArgs。</param>
+        protected override void OnMouseDown(MouseEventArgs mevent)
+        {
+            base.OnMouseDown(mevent);
+            this.MouseState = EMouseState.Down;
+        }
+        /// <summary>
+        /// 引发 System.Windows.Forms.Form.MouseUp 事件。
+        /// </summary>
+        /// <param name="mevent">包含事件数据的 System.Windows.Forms.MouseEventArgs。</param>
+        protected override void OnMouseUp(MouseEventArgs mevent)
+        {
+            base.OnMouseUp(mevent);
+            this.MouseState = EMouseState.Up;
+        }
+        #endregion
+    }
+}

UAS-MES/CustomControl/ClickPicBox/ClickPicBox.cs

@@ -4,7 +4,6 @@ namespace UAS_MES.CustomControl.ClickPicBox
 {
     public partial class ClickPicBox : PictureBox
     {
-
         private string Power1;
 
         public string Power

UAS-MES/CustomControl/ClickPicBox/LockIcon.Designer.cs

@@ -0,0 +1,37 @@
+namespace UAS_MES.CustomControl.ClickPicBox
+{
+    partial class LockIcon
+    {
+        /// <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()
+        {
+            components = new System.ComponentModel.Container();
+            Click += LockIcon_Click;
+        }
+
+        #endregion
+    }
+}

UAS-MES/CustomControl/ClickPicBox/LockIcon.cs

@@ -0,0 +1,46 @@
+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;
+
+namespace UAS_MES.CustomControl.ClickPicBox
+{
+    public partial class LockIcon : PictureBox
+    {
+
+        static Control MaCtl;
+
+        private bool Locked = false;
+
+        public LockIcon()
+        {
+            InitializeComponent();
+            Image = Properties.Resources.lock_open_24px;
+        }
+
+        /// <summary>
+        /// 获取存放工单的控件
+        /// </summary>
+        public static void GetMakeCodeCtl(Control ctl)
+        {
+            MaCtl = ctl;
+        }
+
+        private void LockIcon_Click(object sender, EventArgs e)
+        {
+            if (Locked)
+            {
+                Image = Properties.Resources.lock_open_24px;
+                Locked = false;
+            }
+            else {
+                Image = Properties.Resources.lock_lock_24px ;
+                Locked = true;
+            }
+        }
+    }
+}

UAS-MES/CustomControl/CustomCheckBox/LockCheckBox.Designer.cs

@@ -0,0 +1,42 @@
+namespace UAS_MES.CustomControl.CustomCheckBox
+{
+    partial class LockCheckBox
+    {
+        /// <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.SuspendLayout();
+            // 
+            // LockCheckBox
+            // 
+            this.CheckedChanged += new System.EventHandler(this.LockCheckBox_CheckedChanged);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

UAS-MES/CustomControl/CustomCheckBox/LockCheckBox.cs

@@ -0,0 +1,55 @@
+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.PublicMethod;
+
+namespace UAS_MES.CustomControl.CustomCheckBox
+{
+    public partial class LockCheckBox : CheckBox
+    {
+        /// <summary>
+        /// 存放工单的控件
+        /// </summary>
+        Control MaCtl;
+
+        public LockCheckBox()
+        {
+            InitializeComponent();
+        }
+
+        public void GetMakeCodeCtl(Control ctl)
+        {
+            MaCtl = ctl;
+        }
+
+        public void LockCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            if (Checked)
+            {
+                if (MaCtl.Text != "")
+                {
+                    string ErrorMessage;
+                    if (LogicHandler.CheckMakeStatus(MaCtl.Text,out ErrorMessage))
+                        MaCtl.Enabled = false;
+                    else
+                    {
+                        Checked = false;
+                        BaseUtil.ShowError(ErrorMessage);
+                    }
+                }
+                else
+                {
+                    Checked = false;
+                    BaseUtil.ShowError("工单号不能为空");
+                }
+            }
+            else
+                MaCtl.Enabled = true;
+        }
+    }
+}

UAS-MES/CustomControl/CustomCheckBox/LockCheckBox.resx

@@ -0,0 +1,123 @@
+<?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>
+  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>

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

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.ListBox = new System.Windows.Forms.ListBox();
-            this.EnterTextBox = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.EnterTextBox = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.SuspendLayout();
             // 
             // ListBox
@@ -75,6 +75,6 @@
         #endregion
 
         private System.Windows.Forms.ListBox ListBox;
-        private EnterTextBox EnterTextBox;
+        private MaCodeTextBox EnterTextBox;
     }
 }

UAS-MES/CustomControl/TextBoxWithIcon/EnterTextBox.cs

@@ -12,92 +12,51 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         private string str;
         private string str1;
         private string str2;
-
+        /// <summary>
+        /// 设置锁定字段
+        /// </summary>
         string AllPower1;
 
         public string AllPower
         {
-            get
-            {
-                return AllPower1;
-            }
-
-            set
-            {
-                AllPower1 = value;
-            }
+            get { return AllPower1; }
+            set { AllPower1 = value; }
         }
 
         public string ID
         {
-            get
-            {
-                return ID1;
-            }
-
-            set
-            {
-                ID1 = value;
-            }
+            get { return ID1; }
+            set { ID1 = value; }
         }
 
         public string Str
         {
-            get
-            {
-                return str;
-            }
-
-            set
-            {
-                str = value;
-            }
+            get { return str; }
+            set { str = value; }
         }
 
         public string Str1
         {
-            get
-            {
-                return str1;
-            }
-
-            set
-            {
-                str1 = value;
-            }
+            get { return str1; }
+            set { str1 = value; }
         }
 
         public string Str2
         {
-            get
-            {
-                return str2;
-            }
-
-            set
-            {
-                str2 = value;
-            }
+            get { return str2; }
+            set { str2 = value; }
         }
 
         public string Power
         {
-            get
-            {
-                return Power1;
-            }
-
-            set
-            {
-                Power1 = value;
-            }
+            get { return Power1; }
+            set { Power1 = value; }
         }
 
         public EnterTextBox()
         {
             InitializeComponent();
             this.KeyDown += EnterTextBox_KeyDown;
-
             BackColor = System.Drawing.Color.White;
         }
 
@@ -115,9 +74,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         private void EnterTextBox_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.Modifiers.CompareTo(Keys.Control) == 0 && e.KeyCode == Keys.A)
-            {
                 this.SelectAll();
-            }
         }
     }
 }

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

@@ -0,0 +1,89 @@
+namespace UAS_MES.CustomControl.TextBoxWithIcon
+{
+    partial class MaCodeSearchTextBox
+    {
+        /// <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.Search_Icon = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.TextBox = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // Search_Icon
+            // 
+            this.Search_Icon.AllPower = null;
+            this.Search_Icon.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Search_Icon.Dock = System.Windows.Forms.DockStyle.Right;
+            this.Search_Icon.Image = global::UAS_MES.Properties.Resources.search;
+            this.Search_Icon.Location = new System.Drawing.Point(183, 0);
+            this.Search_Icon.Name = "Search_Icon";
+            this.Search_Icon.Power = "";
+            this.Search_Icon.Size = new System.Drawing.Size(21, 25);
+            this.Search_Icon.TabIndex = 1;
+            this.Search_Icon.TabStop = false;
+            this.Search_Icon.Click += new System.EventHandler(this.Search_Icon_Click);
+            // 
+            // TextBox
+            // 
+            this.TextBox.AllPower = null;
+            this.TextBox.BackColor = System.Drawing.Color.White;
+            this.TextBox.Dock = System.Windows.Forms.DockStyle.Left;
+            this.TextBox.ID = null;
+            this.TextBox.Location = new System.Drawing.Point(0, 0);
+            this.TextBox.Lock = false;
+            this.TextBox.Name = "TextBox";
+            this.TextBox.Power = null;
+            this.TextBox.Size = new System.Drawing.Size(178, 25);
+            this.TextBox.Str = null;
+            this.TextBox.Str1 = null;
+            this.TextBox.Str2 = null;
+            this.TextBox.TabIndex = 0;
+            this.TextBox.TextChanged += new System.EventHandler(this.TextBox_TextChanged);
+            this.TextBox.Enter += new System.EventHandler(this.TextBox_Enter);
+            this.TextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBox_KeyDown);
+            this.TextBox.Leave += new System.EventHandler(this.TextBox_Leave);
+            // 
+            // MaCodeSearchTextBox
+            // 
+            this.Controls.Add(this.Search_Icon);
+            this.Controls.Add(this.TextBox);
+            this.Name = "MaCodeSearchTextBox";
+            this.Size = new System.Drawing.Size(204, 25);
+            this.Load += new System.EventHandler(this.SearchTextBox_Load);
+            this.SizeChanged += new System.EventHandler(this.SearchTextBox_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private ClickPicBox.ClickPicBox Search_Icon;
+        private MaCodeTextBox TextBox;
+    }
+}

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -0,0 +1,338 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+using UAS_MES.DataOperate;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.CustomControl.TextBoxWithIcon
+{
+    public partial class MaCodeSearchTextBox : UserControl
+    {
+        #region 构造函数
+        public MaCodeSearchTextBox()
+        {
+            InitializeComponent();
+            TextBox.KeyDown += TextBox_KeyDown;
+        }
+        #endregion
+
+        #region 变量
+        /// <summary>
+        /// 是否通过Leave事件找到数据
+        /// </summary>
+        public bool LeaveFindData;
+        /// <summary>
+        /// DBFind窗体弹出的标题
+        /// </summary>
+        private string DBTitle1;
+        /// <summary>
+        /// 输入框是否可编辑
+        /// </summary>
+        private bool TextBoxEnable1;
+        /// <summary>
+        /// 业务逻辑的标识符
+        /// </summary>
+        private string caller;
+        /// <summary>
+        /// 发起DbFind的窗体
+        /// </summary>
+        private string formName;
+        /// <summary>
+        /// 需要赋值的字段
+        /// </summary>
+        private string[] setValueField;
+        /// <summary>
+        /// 初始的筛选条件
+        /// </summary>
+        private string condition;
+        /// <summary>
+        /// 权限标识
+        /// </summary>
+        private string Power1;
+        /// <summary>
+        /// 查询的表名
+        /// </summary>
+        private string tableName;
+        /// <summary>
+        /// 查询的字段
+        /// </summary>
+        private string selectField;
+        /// <summary>
+        /// 设置绑定的CheckBox
+        /// </summary>
+        CheckBox LockCheckBox;
+
+        DbFind db;
+
+        public override string Text
+        {
+            get
+            {
+                return TextBox.Text;
+            }
+            set
+            {
+                TextBox.Text = value;
+            }
+        }
+
+        string AllPower1;
+
+        public string AllPower
+        {
+            get
+            {
+                return AllPower1;
+            }
+
+            set
+            {
+                AllPower1 = value;
+            }
+        }
+
+
+        public string Caller
+        {
+            get
+            {
+                return caller;
+            }
+
+            set
+            {
+                caller = value;
+            }
+        }
+
+        public string FormName
+        {
+            get
+            {
+                return formName;
+            }
+
+            set
+            {
+                formName = value;
+            }
+        }
+
+        public string[] SetValueField
+        {
+            get
+            {
+                return setValueField;
+            }
+
+            set
+            {
+                setValueField = value;
+            }
+        }
+
+        public string Condition
+        {
+            get
+            {
+                return condition;
+            }
+
+            set
+            {
+                condition = value;
+            }
+        }
+
+        public string TableName
+        {
+            get
+            {
+                return tableName;
+            }
+
+            set
+            {
+                tableName = value;
+            }
+        }
+
+        public string SelectField
+        {
+            get
+            {
+                return selectField;
+            }
+
+            set
+            {
+                selectField = value;
+            }
+        }
+
+        public string Power
+        {
+            get
+            {
+                return Power1;
+            }
+
+            set
+            {
+                Power1 = value;
+            }
+        }
+
+        public string DBTitle
+        {
+            get
+            {
+                return DBTitle1;
+            }
+
+            set
+            {
+                DBTitle1 = value;
+            }
+        }
+
+        public bool TextBoxEnable
+        {
+            get
+            {
+                return TextBoxEnable1;
+            }
+
+            set
+            {
+                TextBoxEnable1 = value;
+            }
+        }
+        #endregion
+
+        #region 自定义事件
+        public delegate void OnTextChange(object sender, EventArgs e);
+        //定义事件
+        public event OnTextChange UserControlTextChanged;
+        //定义委托
+        public delegate void Icon_Click(object sender, EventArgs e);
+        /// <summary>
+        /// 图标点击事件
+        /// </summary>
+        public event Icon_Click SearchIconClick;
+
+        #endregion
+        //定义委托
+
+        private void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            Console.WriteLine(TextBox.Text);
+            Console.WriteLine(db.SuccessReturnData);
+            if (db.SuccessReturnData) {
+                LockCheckBox.Checked = true;
+            }
+            UserControlTextChanged?.Invoke(sender, new EventArgs());
+        }
+
+
+        //Key先发起失去焦点事件，在执行用户自定义的事件
+        private void TextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                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++)
+                            {
+                                //利用字段的Tag属性来和列名进行比对
+                                object tag = fmCollection[FormName].Controls[SetValueField[j]].Tag;
+                                if (SetValueField[j] == dt.Columns[i].ColumnName.ToLower() || (tag != null && tag == dt.Columns[i].ColumnName.ToLower()))
+                                {
+                                    fmCollection[FormName].Controls[SetValueField[j]].Text = dt.Rows[0][dt.Columns[i].ColumnName].ToString();
+                                }
+                            }
+                        }
+                        LeaveFindData = true;
+                        LockCheckBox.Checked = true;
+                    }
+                    else
+                        LeaveFindData = false;
+                }
+            }
+        }
+
+        public void SetLockCheckBox(CheckBox ctl) {
+            LockCheckBox = ctl;
+        }
+
+        private void Search_Icon_Click(object sender, EventArgs e)
+        {
+            SearchIconClick?.Invoke(sender, new EventArgs());
+            db = new DbFind(Name, tableName, selectField, setValueField, caller, formName, condition);
+            db.Text = DBTitle1;
+            LogManager.DoLog("DbFind查询,发起窗口【" + formName + "】,查询表【" + tableName + "】,字段" + selectField + ",条件" + condition);
+            if (db.IsAbleDbFind1)
+            {
+                db.ShowDialog();
+            }
+            else
+            {
+                MessageBox.Show("该字段未配置DbFind", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+            }
+        }
+
+        private void TextBox_Enter(object sender, EventArgs e)
+        {
+            TextBox.BackColor = System.Drawing.Color.GreenYellow;
+        }
+
+        /// <summary>
+        /// 重新刷新数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void RefreshDB(object sender, EventArgs e)
+        {
+            TextBox_Leave(sender, e);
+        }
+
+        public void TextBox_Leave(object sender, EventArgs e)
+        {
+            TextBox.BackColor = System.Drawing.Color.White;
+        }
+
+        private void SearchTextBox_Load(object sender, EventArgs e)
+        {
+            if (!TextBoxEnable1)
+                TextBox.BackColor = System.Drawing.Color.White;
+            TextBox.Enabled = TextBoxEnable1;
+        }
+
+        private void SearchTextBox_SizeChanged(object sender, EventArgs e)
+        {
+            TextBox.Width = this.Width - Search_Icon.Width-3;
+        }
+    }
+}

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.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/CustomControl/TextBoxWithIcon/MaCodeTextBox.Designer.cs

@@ -0,0 +1,45 @@
+namespace UAS_MES.CustomControl.TextBoxWithIcon
+{
+    partial class MaCodeTextBox
+    {
+        /// <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.SuspendLayout();
+            // 
+            // MaCodeTextBox
+            // 
+            this.Size = new System.Drawing.Size(196, 25);
+            this.Enter += new System.EventHandler(this.EnterTextBox_Enter);
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MaCodeTextBox_KeyDown);
+            this.Leave += new System.EventHandler(this.EnterTextBox_Leave);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeTextBox.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.CustomControl.TextBoxWithIcon
+{
+    public partial class MaCodeTextBox : TextBox
+    {
+        //传值的备用字符串
+        private string ID1;
+        private string Power1;
+        private string str;
+        private string str1;
+        private string str2;
+        /// <summary>
+        /// 设置锁定字段
+        /// </summary>
+        private bool Lock1;
+        string AllPower1;
+
+        public string AllPower
+        {
+            get { return AllPower1; }
+            set { AllPower1 = value; }
+        }
+
+        public string ID
+        {
+            get { return ID1; }
+            set { ID1 = value; }
+        }
+
+        public string Str
+        {
+            get { return str; }
+            set { str = value; }
+        }
+
+        public string Str1
+        {
+            get { return str1; }
+            set { str1 = value; }
+        }
+
+        public string Str2
+        {
+            get { return str2; }
+            set { str2 = value; }
+        }
+
+        public string Power
+        {
+            get { return Power1; }
+            set { Power1 = value; }
+        }
+
+        public bool Lock
+        {
+            get { return Lock1; }
+            set { Lock1 = value; }
+        }
+
+        public MaCodeTextBox()
+        {
+            InitializeComponent();
+            this.KeyDown += MaCodeTextBox_KeyDown;
+            BackColor = System.Drawing.Color.White;
+        }
+
+        private void EnterTextBox_Enter(object sender, EventArgs e)
+        {
+            this.BackColor = Color.GreenYellow;
+        }
+
+        private void EnterTextBox_Leave(object sender, EventArgs e)
+        {
+            this.BackColor = Color.White;
+        }
+
+
+
+        //手动添加全选功能
+        private void MaCodeTextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Modifiers.CompareTo(Keys.Control) == 0 && e.KeyCode == Keys.A)
+                this.SelectAll();
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (Text != "")
+                {
+                    string ErrorMessage = "";
+                    if (!LogicHandler.CheckMakeStatus(Text,out ErrorMessage))
+                        BaseUtil.ShowError(ErrorMessage);
+                }
+                else
+                    BaseUtil.ShowError("工单号不能为空");
+            }
+        }
+    }
+}

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeTextBox.resx

@@ -0,0 +1,123 @@
+<?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>
+  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>

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

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.Search_Icon = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
-            this.TextBox = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.TextBox = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).BeginInit();
             this.SuspendLayout();
             // 
@@ -83,6 +83,6 @@
         #endregion
 
         private ClickPicBox.ClickPicBox Search_Icon;
-        private EnterTextBox TextBox;
+        private MaCodeTextBox TextBox;
     }
 }

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

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.GeneratePaCode = new System.Windows.Forms.PictureBox();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.GeneratePaCode)).BeginInit();
@@ -80,7 +80,7 @@
 
         #endregion
 
-        private EnterTextBox enterTextBox1;
+        private MaCodeTextBox enterTextBox1;
         private System.Windows.Forms.PictureBox GeneratePaCode;
         private System.Windows.Forms.ToolTip toolTip1;
     }

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

@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.textBox1 = new CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.textBox1 = new CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.TextAreaIcon = new System.Windows.Forms.PictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.TextAreaIcon)).BeginInit();
             this.SuspendLayout();
@@ -75,7 +75,7 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox textBox1;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox textBox1;
         private System.Windows.Forms.PictureBox TextAreaIcon;
     }
 }

UAS-MES/DbFind.cs

@@ -33,6 +33,8 @@ namespace UAS_MES
 
         string Condition = "";
 
+        public bool SuccessReturnData = false;
+
         int ScrollNewValue = 0;
 
         public bool IsAbleDbFind1
@@ -66,6 +68,7 @@ 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");
@@ -160,6 +163,7 @@ namespace UAS_MES
             {
                 //先判断DataTable里面是否有这个字段，然后从打开的窗口里面去获取到这个Form，从Form中的指定Panel获取到指定字段的控件
                 FormCollection fmCollection = Application.OpenForms;
+                SuccessReturnData = true;
                 for (int i = 0; i < dt.Columns.Count; i++)
                 {
                     for (int j = 0; j < SetValueField.Length; j++)
@@ -171,7 +175,7 @@ namespace UAS_MES
                 }
                 fmCollection[FormName].Controls[MainField].Focus();
             }
-            catch (Exception) { }
+            catch (Exception) { SuccessReturnData = false; }
             Dispose();
             Close();
         }

UAS-MES/Form1.Designer.cs

@@ -28,9 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea6 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend6 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
@@ -43,6 +43,7 @@
             this.TestDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.numOnlyTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.blurSearch1 = new UAS_MES.CustomControl.TextBoxWithIcon.BlurSearch();
+            this.enterTextBox2 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.ct_coll)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.TestDGV)).BeginInit();
             this.SuspendLayout();
@@ -73,23 +74,23 @@
             this.ct_coll.BackHatchStyle = System.Windows.Forms.DataVisualization.Charting.ChartHatchStyle.Cross;
             this.ct_coll.BackImageTransparentColor = System.Drawing.SystemColors.Control;
             this.ct_coll.BorderlineColor = System.Drawing.SystemColors.Control;
-            chartArea6.Name = "ChartArea1";
-            this.ct_coll.ChartAreas.Add(chartArea6);
-            legend6.Enabled = false;
-            legend6.Name = "Legend1";
-            this.ct_coll.Legends.Add(legend6);
+            chartArea2.Name = "ChartArea1";
+            this.ct_coll.ChartAreas.Add(chartArea2);
+            legend2.Enabled = false;
+            legend2.Name = "Legend1";
+            this.ct_coll.Legends.Add(legend2);
             this.ct_coll.Location = new System.Drawing.Point(829, 209);
             this.ct_coll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ct_coll.Name = "ct_coll";
             this.ct_coll.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.None;
-            series6.ChartArea = "ChartArea1";
-            series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
-            series6.IsXValueIndexed = true;
-            series6.Label = "#PERCENT#VALX :#VAL";
-            series6.Legend = "Legend1";
-            series6.LegendText = "#VALX";
-            series6.Name = "Series1";
-            this.ct_coll.Series.Add(series6);
+            series2.ChartArea = "ChartArea1";
+            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
+            series2.IsXValueIndexed = true;
+            series2.Label = "#PERCENT#VALX :#VAL";
+            series2.Legend = "Legend1";
+            series2.LegendText = "#VALX";
+            series2.Name = "Series1";
+            this.ct_coll.Series.Add(series2);
             this.ct_coll.Size = new System.Drawing.Size(395, 398);
             this.ct_coll.TabIndex = 5;
             this.ct_coll.Text = "chart1";
@@ -102,7 +103,7 @@
             this.searchTextBox2.DBTitle = null;
             this.searchTextBox2.FormName = null;
             this.searchTextBox2.Location = new System.Drawing.Point(528, 84);
-            this.searchTextBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.searchTextBox2.Margin = new System.Windows.Forms.Padding(4);
             this.searchTextBox2.Name = "searchTextBox2";
             this.searchTextBox2.Power = null;
             this.searchTextBox2.SelectField = null;
@@ -120,7 +121,7 @@
             this.searchTextBox1.DBTitle = null;
             this.searchTextBox1.FormName = null;
             this.searchTextBox1.Location = new System.Drawing.Point(528, 50);
-            this.searchTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.searchTextBox1.Margin = new System.Windows.Forms.Padding(4);
             this.searchTextBox1.Name = "searchTextBox1";
             this.searchTextBox1.Power = null;
             this.searchTextBox1.SelectField = null;
@@ -145,8 +146,8 @@
             this.normalButton3.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.DownImage")));
             this.normalButton3.Image = null;
             this.normalButton3.IsShowBorder = true;
-            this.normalButton3.Location = new System.Drawing.Point(528, 591);
-            this.normalButton3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.normalButton3.Location = new System.Drawing.Point(598, 406);
+            this.normalButton3.Margin = new System.Windows.Forms.Padding(4);
             this.normalButton3.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.MoveImage")));
             this.normalButton3.Name = "normalButton3";
             this.normalButton3.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.NormalImage")));
@@ -164,8 +165,8 @@
             this.normalButton2.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.DownImage")));
             this.normalButton2.Image = null;
             this.normalButton2.IsShowBorder = true;
-            this.normalButton2.Location = new System.Drawing.Point(528, 530);
-            this.normalButton2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.normalButton2.Location = new System.Drawing.Point(598, 345);
+            this.normalButton2.Margin = new System.Windows.Forms.Padding(4);
             this.normalButton2.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.MoveImage")));
             this.normalButton2.Name = "normalButton2";
             this.normalButton2.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.NormalImage")));
@@ -209,15 +210,31 @@
             this.blurSearch1.Location = new System.Drawing.Point(45, 58);
             this.blurSearch1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.blurSearch1.Name = "blurSearch1";
-            this.blurSearch1.Size = new System.Drawing.Size(205, 42);
+            this.blurSearch1.Size = new System.Drawing.Size(205, 34);
             this.blurSearch1.TabIndex = 0;
             this.blurSearch1.TableName = null;
             // 
+            // enterTextBox2
+            // 
+            this.enterTextBox2.AllPower = null;
+            this.enterTextBox2.BackColor = System.Drawing.Color.White;
+            this.enterTextBox2.Enabled = false;
+            this.enterTextBox2.ID = null;
+            this.enterTextBox2.Location = new System.Drawing.Point(646, 179);
+            this.enterTextBox2.Name = "enterTextBox2";
+            this.enterTextBox2.Power = null;
+            this.enterTextBox2.Size = new System.Drawing.Size(196, 25);
+            this.enterTextBox2.Str = null;
+            this.enterTextBox2.Str1 = null;
+            this.enterTextBox2.Str2 = null;
+            this.enterTextBox2.TabIndex = 15;
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1239, 738);
+            this.Controls.Add(this.enterTextBox2);
             this.Controls.Add(this.searchTextBox2);
             this.Controls.Add(this.searchTextBox1);
             this.Controls.Add(this.serialPortCombox1);
@@ -227,7 +244,7 @@
             this.Controls.Add(this.numOnlyTextBox1);
             this.Controls.Add(this.ct_coll);
             this.Controls.Add(this.blurSearch1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Form1";
             this.Tag = "123123";
             this.Text = " ";
@@ -244,7 +261,7 @@
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.Button button2;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox1;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox enterTextBox1;
         private CustomControl.SetLoading.LoadingCircle loadingCircle1;
         private CustomControl.TextBoxWithIcon.BlurSearch blurSearch1;
         private System.Windows.Forms.DataVisualization.Charting.Chart ct_coll;
@@ -255,5 +272,6 @@
         private CustomControl.ComBoxWithFocus.SerialPortCombox serialPortCombox1;
         private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox1;
         private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox2;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox enterTextBox2;
     }
 }

UAS-MES/Form1.cs

@@ -67,13 +67,14 @@ namespace UAS_MES
 
         private void normalButton2_Click(object sender, EventArgs e)
         {
-            DataHelper dh = new DataHelper();
-            string[] TestData = new string[3] {"Test","1321","213" };
-            dh.CallProcedure("TestPro",ref TestData);
-            for (int i = 0; i < TestData.Length; i++)
-            {
-                Console.WriteLine(TestData[i]);
-            }
+            //DataHelper dh = new DataHelper();
+            //string[] TestData = new string[3] {"Test","1321","213" };
+            //dh.CallProcedure("TestPro",ref TestData);
+            //for (int i = 0; i < TestData.Length; i++)
+            //{
+            //    Console.WriteLine(TestData[i]);
+            //}
+            enterTextBox2.Text = "13132";
         }
 
         private void normalButton3_Click(object sender, EventArgs e)

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

@@ -39,8 +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_name3 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.em_name2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.em_name3 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.em_name2 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.ScreenOutGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ScreenInGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OutGroupUser = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
@@ -447,8 +447,8 @@
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.NormalButton ScreenInGroup;
         private CustomControl.ButtonUtil.NormalButton ScreenOutGroup;
-        private CustomControl.TextBoxWithIcon.EnterTextBox em_name2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox em_name3;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox em_name2;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox em_name3;
         private System.Windows.Forms.Label ug_name_title_label;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_code1;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_name1;

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

@@ -38,14 +38,14 @@
             this.em_email = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_mobile = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Screen = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.em_code11 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.em_name11 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.em_code11 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.em_name11 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.em_name_label = new System.Windows.Forms.Label();
             this.em_code_label = new System.Windows.Forms.Label();
             this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
-            this.em_depart1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.em_depart1 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label1 = new System.Windows.Forms.Label();
-            this.em_position1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.em_position1 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label2 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.Employee)).BeginInit();
             this.SuspendLayout();
@@ -290,14 +290,14 @@
 
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum Employee;
         private CustomControl.ButtonUtil.NormalButton Screen;
-        private CustomControl.TextBoxWithIcon.EnterTextBox em_code11;
-        private CustomControl.TextBoxWithIcon.EnterTextBox em_name11;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox em_code11;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox em_name11;
         private System.Windows.Forms.Label em_name_label;
         private System.Windows.Forms.Label em_code_label;
         private CustomControl.Pagination.PaginationDbFind pagination1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox em_depart1;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox em_depart1;
         private System.Windows.Forms.Label label1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox em_position1;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox em_position1;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_name;

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

@@ -34,8 +34,8 @@
             this.ug_code_label = new System.Windows.Forms.Label();
             this.ug_name_label = new System.Windows.Forms.Label();
             this.SaveGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ug_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ug_name = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ug_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ug_name = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.SuspendLayout();
             // 
             // headBar1
@@ -159,7 +159,7 @@
         private System.Windows.Forms.Label ug_code_label;
         private System.Windows.Forms.Label ug_name_label;
         private CustomControl.ButtonUtil.NormalButton SaveGroup;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ug_code;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ug_name;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ug_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ug_name;
     }
 }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.Designer.cs

@@ -70,7 +70,7 @@
             this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.ComList = new UAS_MES.CustomControl.ComBoxWithFocus.SerialPortCombox();
             this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
@@ -663,7 +663,7 @@
         private System.Windows.Forms.Label mcd_okqty_label;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox outboxcode;
         private System.Windows.Forms.Panel panel6;
         private CustomControl.ValueLabel.ValueLabel pr_cartongw;
         private CustomControl.ValueLabel.ValueLabel pr_code;

UAS-MES/FunctionCode/Make/Make_CheckNoRelpace.Designer.cs

@@ -31,11 +31,11 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_CheckNoRelpace));
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.old_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.old_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.old_checkno_label = new System.Windows.Forms.Label();
-            this.new_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.new_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.new_checkno_label = new System.Windows.Forms.Label();
-            this.ReplaceReason = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ReplaceReason = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.ReplaceCheckNo = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SuspendLayout();
@@ -201,11 +201,11 @@
 
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;
-        private CustomControl.TextBoxWithIcon.EnterTextBox old_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox old_sncode;
         private System.Windows.Forms.Label old_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox new_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox new_sncode;
         private System.Windows.Forms.Label new_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ReplaceReason;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ReplaceReason;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.ButtonUtil.NormalButton ReplaceCheckNo;
     }

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.Designer.cs

@@ -68,7 +68,7 @@
             this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.BaudRate_label = new System.Windows.Forms.Label();
             this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
@@ -641,7 +641,7 @@
         private System.Windows.Forms.Label mcd_okqty_label;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
         private System.Windows.Forms.Label pr_colorboxgw_label;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_colorboxunit;

UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -54,11 +54,11 @@
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.softwareversion = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ecn = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.softwareversion = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ecn = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CleanMa_code)).BeginInit();
@@ -481,16 +481,16 @@
         private System.Windows.Forms.Label ma_prodcode_label;
         private System.Windows.Forms.RadioButton Loading;
         private System.Windows.Forms.RadioButton UnLoading;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox sn_code;
         private System.Windows.Forms.Label sn_code_label;
         private System.Windows.Forms.Label code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox code;
         private System.Windows.Forms.CheckBox iflastsn;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private System.Windows.Forms.CheckBox softwareversion_label;
         private System.Windows.Forms.CheckBox ecn_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ecn;
-        private CustomControl.TextBoxWithIcon.EnterTextBox softwareversion;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ecn;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox softwareversion;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ValueLabel.ValueLabel ma_qty;

UAS-MES/FunctionCode/Make/Make_LabelPrint.Designer.cs

@@ -46,7 +46,7 @@
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.SuspendLayout();
             // 
@@ -311,7 +311,7 @@
         private System.Windows.Forms.Label mcd_remainqty_label;
         private System.Windows.Forms.Label label4;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
         private System.Windows.Forms.Label sncode_label;
         private System.Windows.Forms.Label pr_detail_label;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox PrintNum;

UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs

@@ -55,12 +55,12 @@
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.Printing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pa_packageqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pa_totalqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_prodname = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.barcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_packageqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pa_totalqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ma_prodname = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.barcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.PackageDetail = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -600,12 +600,12 @@
         private System.Windows.Forms.CheckBox Cancel;
   
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageDetail;
-        private CustomControl.TextBoxWithIcon.EnterTextBox barcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_restqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodname;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_totalqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_packageqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox barcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_restqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodname;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_totalqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_packageqty;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton Printing;
         private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;

UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -42,8 +42,8 @@
             this.pa_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.SearchPallet = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Print = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ReleasePallet = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -55,7 +55,7 @@
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -550,7 +550,7 @@
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
         private System.Windows.Forms.CheckBox AutoPrint;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_restqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_restqty;
         private System.Windows.Forms.Label pa_restqty_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageInf;
         private CustomControl.ValueLabel.ValueLabel pa_custcode;
@@ -559,8 +559,8 @@
         private CustomControl.ButtonUtil.NormalButton ReleasePallet;
         private CustomControl.ButtonUtil.NormalButton Print;
         private CustomControl.ButtonUtil.NormalButton SearchPallet;
-        private CustomControl.TextBoxWithIcon.EnterTextBox palletcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox palletcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox outboxcode;
         private System.Windows.Forms.Label palletcode_label;
         private System.Windows.Forms.Label outboxcode_label;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;

UAS-MES/FunctionCode/Make/Make_PositionStock.Designer.cs

@@ -43,7 +43,7 @@
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pr_batchnum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_batchnum = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.BatchProduct = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -441,7 +441,7 @@
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel sc_stepcode;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum BatchProduct;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_batchnum;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_batchnum;
         private System.Windows.Forms.Label label3;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;

UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs

@@ -52,17 +52,9 @@
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.BadCodeGrid = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_groupcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_badremark = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_note = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_dutyman = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GetSNCode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.GetSNCode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.cd_stepcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.cr_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.AddRow = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -74,6 +66,14 @@
             this.RepairResult = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.label2 = new System.Windows.Forms.Label();
             this.bc_remark = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithTextArea();
+            this.mb_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_dutyman = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_note = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_badremark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_groupcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadCodeGrid)).BeginInit();
             this.SuspendLayout();
@@ -84,8 +84,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(990, 29);
+            this.panel2.Size = new System.Drawing.Size(1320, 36);
             this.panel2.TabIndex = 32;
             // 
             // label1
@@ -93,9 +94,10 @@
             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.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(12, 4);
+            this.label1.Location = new System.Drawing.Point(16, 5);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "维修作业";
             // 
@@ -103,9 +105,10 @@
             // 
             this.GetSNCode_Label.AutoSize = true;
             this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetSNCode_Label.Location = new System.Drawing.Point(24, 532);
+            this.GetSNCode_Label.Location = new System.Drawing.Point(32, 665);
+            this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.GetSNCode_Label.Name = "GetSNCode_Label";
-            this.GetSNCode_Label.Size = new System.Drawing.Size(0, 21);
+            this.GetSNCode_Label.Size = new System.Drawing.Size(0, 27);
             this.GetSNCode_Label.TabIndex = 77;
             // 
             // ma_craftcode_label
@@ -114,9 +117,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_craftcode_label.AutoSize = true;
             this.ma_craftcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode_label.Location = new System.Drawing.Point(23, 568);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(31, 710);
+            this.ma_craftcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_craftcode_label.Name = "ma_craftcode_label";
-            this.ma_craftcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_craftcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_craftcode_label.TabIndex = 66;
             this.ma_craftcode_label.Text = "回流工艺";
             // 
@@ -126,9 +130,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_rstepcode_label.AutoSize = true;
             this.st_rstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_rstepcode_label.Location = new System.Drawing.Point(314, 570);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(419, 712);
+            this.st_rstepcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_rstepcode_label.Name = "st_rstepcode_label";
-            this.st_rstepcode_label.Size = new System.Drawing.Size(74, 21);
+            this.st_rstepcode_label.Size = new System.Drawing.Size(92, 27);
             this.st_rstepcode_label.TabIndex = 65;
             this.st_rstepcode_label.Text = "回流工序";
             // 
@@ -136,9 +141,10 @@
             // 
             this.Refueling.AutoSize = true;
             this.Refueling.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Refueling.Location = new System.Drawing.Point(318, 530);
+            this.Refueling.Location = new System.Drawing.Point(424, 662);
+            this.Refueling.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Refueling.Name = "Refueling";
-            this.Refueling.Size = new System.Drawing.Size(61, 25);
+            this.Refueling.Size = new System.Drawing.Size(74, 31);
             this.Refueling.TabIndex = 64;
             this.Refueling.Text = "换料";
             this.Refueling.UseVisualStyleBackColor = true;
@@ -150,9 +156,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(336, 83);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(448, 104);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_prodcode_label.TabIndex = 62;
             this.ma_prodcode_label.Text = "产品代码";
             // 
@@ -162,9 +169,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(650, 83);
+            this.pr_detail_label.Location = new System.Drawing.Point(867, 104);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 61;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -172,9 +180,10 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(746, 239);
+            this.label14.Location = new System.Drawing.Point(995, 299);
+            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(74, 21);
+            this.label14.Size = new System.Drawing.Size(92, 27);
             this.label14.TabIndex = 46;
             this.label14.Text = "不良备注";
             // 
@@ -182,9 +191,10 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(746, 283);
+            this.label13.Location = new System.Drawing.Point(995, 354);
+            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(74, 21);
+            this.label13.Size = new System.Drawing.Size(92, 27);
             this.label13.TabIndex = 45;
             this.label13.Text = "维修结果";
             // 
@@ -193,9 +203,10 @@
             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.Red;
-            this.label12.Location = new System.Drawing.Point(746, 194);
+            this.label12.Location = new System.Drawing.Point(995, 242);
+            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(74, 21);
+            this.label12.Size = new System.Drawing.Size(92, 27);
             this.label12.TabIndex = 44;
             this.label12.Text = "不良原因";
             // 
@@ -205,9 +216,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_name_label.AutoSize = true;
             this.st_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_name_label.Location = new System.Drawing.Point(650, 48);
+            this.st_name_label.Location = new System.Drawing.Point(867, 60);
+            this.st_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_name_label.Name = "st_name_label";
-            this.st_name_label.Size = new System.Drawing.Size(74, 21);
+            this.st_name_label.Size = new System.Drawing.Size(92, 27);
             this.st_name_label.TabIndex = 42;
             this.st_name_label.Text = "工序名称";
             // 
@@ -215,9 +227,10 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(746, 150);
+            this.label8.Location = new System.Drawing.Point(995, 188);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(74, 21);
+            this.label8.Size = new System.Drawing.Size(92, 27);
             this.label8.TabIndex = 40;
             this.label8.Text = "不良组别";
             // 
@@ -227,9 +240,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_nextstepcode_label.AutoSize = true;
             this.ms_nextstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_nextstepcode_label.Location = new System.Drawing.Point(336, 48);
+            this.ms_nextstepcode_label.Location = new System.Drawing.Point(448, 60);
+            this.ms_nextstepcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_nextstepcode_label.Name = "ms_nextstepcode_label";
-            this.ms_nextstepcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_nextstepcode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_nextstepcode_label.TabIndex = 39;
             this.ms_nextstepcode_label.Text = "工序编号";
             // 
@@ -239,9 +253,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(12, 48);
+            this.ms_sncode_label.Location = new System.Drawing.Point(16, 60);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 38;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -251,18 +266,20 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(12, 83);
+            this.ma_code_label.Location = new System.Drawing.Point(16, 104);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(58, 21);
+            this.ma_code_label.Size = new System.Drawing.Size(72, 27);
             this.ma_code_label.TabIndex = 37;
             this.ma_code_label.Text = "工单号";
             // 
             // OperatResult
             // 
             this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(755, 360);
+            this.OperatResult.Location = new System.Drawing.Point(1007, 450);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(226, 193);
+            this.OperatResult.Size = new System.Drawing.Size(300, 240);
             this.OperatResult.TabIndex = 87;
             this.OperatResult.Text = "";
             // 
@@ -272,9 +289,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_name.AutoSize = true;
             this.st_name.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_name.Location = new System.Drawing.Point(746, 48);
+            this.st_name.Location = new System.Drawing.Point(995, 60);
+            this.st_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_name.Name = "st_name";
-            this.st_name.Size = new System.Drawing.Size(0, 21);
+            this.st_name.Size = new System.Drawing.Size(0, 27);
             this.st_name.TabIndex = 86;
             // 
             // ma_code
@@ -283,9 +301,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(92, 83);
+            this.ma_code.Location = new System.Drawing.Point(123, 104);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 21);
+            this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 85;
             this.ma_code.TextChanged += new System.EventHandler(this.ma_code_TextChanged);
             // 
@@ -295,9 +314,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_nextstepcode.AutoSize = true;
             this.ms_nextstepcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_nextstepcode.Location = new System.Drawing.Point(432, 48);
+            this.ms_nextstepcode.Location = new System.Drawing.Point(576, 60);
+            this.ms_nextstepcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_nextstepcode.Name = "ms_nextstepcode";
-            this.ms_nextstepcode.Size = new System.Drawing.Size(0, 21);
+            this.ms_nextstepcode.Size = new System.Drawing.Size(0, 27);
             this.ms_nextstepcode.TabIndex = 84;
             // 
             // ma_prodcode
@@ -306,9 +326,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(432, 83);
+            this.ma_prodcode.Location = new System.Drawing.Point(576, 104);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 83;
             // 
             // pr_detail
@@ -317,9 +338,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(746, 83);
+            this.pr_detail.Location = new System.Drawing.Point(995, 104);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 82;
             // 
             // Clean
@@ -329,12 +351,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(839, 566);
+            this.Clean.Location = new System.Drawing.Point(1119, 708);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 81;
             this.Clean.Tag = "IfWrite";
             this.Clean.Text = "清除";
@@ -348,10 +371,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(92, 50);
+            this.ms_sncode.Location = new System.Drawing.Point(123, 62);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(172, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(228, 25);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -374,88 +398,26 @@
             this.mb_dutyman,
             this.mb_status});
             this.BadCodeGrid.GridColor = System.Drawing.SystemColors.Control;
-            this.BadCodeGrid.Location = new System.Drawing.Point(16, 142);
+            this.BadCodeGrid.Location = new System.Drawing.Point(21, 178);
+            this.BadCodeGrid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BadCodeGrid.Name = "BadCodeGrid";
             this.BadCodeGrid.ReadOnly = true;
             this.BadCodeGrid.RowTemplate.Height = 23;
-            this.BadCodeGrid.Size = new System.Drawing.Size(718, 376);
+            this.BadCodeGrid.Size = new System.Drawing.Size(957, 470);
             this.BadCodeGrid.TabIndex = 79;
             this.BadCodeGrid.DataSourceChanged += new System.EventHandler(this.BadCodeGrid_DataSourceChanged);
             this.BadCodeGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.BadCodeGrid_CellClick);
             // 
-            // mb_badcode
-            // 
-            this.mb_badcode.DataPropertyName = "mb_badcode";
-            this.mb_badcode.HeaderText = "不良原因码";
-            this.mb_badcode.Name = "mb_badcode";
-            this.mb_badcode.ReadOnly = true;
-            this.mb_badcode.Width = 110;
-            // 
-            // mb_id
-            // 
-            this.mb_id.DataPropertyName = "mb_id";
-            this.mb_id.HeaderText = "mb_id";
-            this.mb_id.Name = "mb_id";
-            this.mb_id.ReadOnly = true;
-            this.mb_id.Visible = false;
-            // 
-            // bc_groupcode
-            // 
-            this.bc_groupcode.DataPropertyName = "bc_groupcode";
-            this.bc_groupcode.HeaderText = "不良组别";
-            this.bc_groupcode.Name = "bc_groupcode";
-            this.bc_groupcode.ReadOnly = true;
-            this.bc_groupcode.Width = 120;
-            // 
-            // bc_name
-            // 
-            this.bc_name.DataPropertyName = "bc_name";
-            this.bc_name.HeaderText = "不良原因";
-            this.bc_name.Name = "bc_name";
-            this.bc_name.ReadOnly = true;
-            this.bc_name.Width = 140;
-            // 
-            // mb_badremark
-            // 
-            this.mb_badremark.DataPropertyName = "mb_badremark";
-            this.mb_badremark.HeaderText = "不良备注";
-            this.mb_badremark.Name = "mb_badremark";
-            this.mb_badremark.ReadOnly = true;
-            this.mb_badremark.Width = 140;
-            // 
-            // bc_note
-            // 
-            this.bc_note.DataPropertyName = "bc_note";
-            this.bc_note.HeaderText = "解决方案";
-            this.bc_note.Name = "bc_note";
-            this.bc_note.ReadOnly = true;
-            this.bc_note.Width = 140;
-            // 
-            // mb_dutyman
-            // 
-            this.mb_dutyman.DataPropertyName = "mb_dutyman";
-            this.mb_dutyman.HeaderText = "责任方";
-            this.mb_dutyman.Name = "mb_dutyman";
-            this.mb_dutyman.ReadOnly = true;
-            this.mb_dutyman.Width = 120;
-            // 
-            // mb_status
-            // 
-            this.mb_status.DataPropertyName = "mb_status";
-            this.mb_status.HeaderText = "维修结果";
-            this.mb_status.Name = "mb_status";
-            this.mb_status.ReadOnly = true;
-            this.mb_status.Width = 128;
-            // 
             // GetSNCode
             // 
             this.GetSNCode.AllPower = "ifall";
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
-            this.GetSNCode.Location = new System.Drawing.Point(107, 532);
+            this.GetSNCode.Location = new System.Drawing.Point(143, 665);
+            this.GetSNCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
-            this.GetSNCode.Size = new System.Drawing.Size(191, 21);
+            this.GetSNCode.Size = new System.Drawing.Size(253, 25);
             this.GetSNCode.Str = null;
             this.GetSNCode.Str1 = null;
             this.GetSNCode.Str2 = null;
@@ -472,12 +434,13 @@
             this.cd_stepcode.Condition = null;
             this.cd_stepcode.DBTitle = "回流工序";
             this.cd_stepcode.FormName = null;
-            this.cd_stepcode.Location = new System.Drawing.Point(404, 570);
+            this.cd_stepcode.Location = new System.Drawing.Point(539, 712);
+            this.cd_stepcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = null;
             this.cd_stepcode.SelectField = null;
             this.cd_stepcode.SetValueField = null;
-            this.cd_stepcode.Size = new System.Drawing.Size(192, 20);
+            this.cd_stepcode.Size = new System.Drawing.Size(256, 25);
             this.cd_stepcode.TabIndex = 68;
             this.cd_stepcode.TableName = null;
             this.cd_stepcode.Tag = "Read";
@@ -492,12 +455,13 @@
             this.cr_code.Condition = null;
             this.cr_code.DBTitle = "回流工艺";
             this.cr_code.FormName = null;
-            this.cr_code.Location = new System.Drawing.Point(107, 570);
+            this.cr_code.Location = new System.Drawing.Point(143, 712);
+            this.cr_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = null;
             this.cr_code.SelectField = null;
             this.cr_code.SetValueField = null;
-            this.cr_code.Size = new System.Drawing.Size(191, 20);
+            this.cr_code.Size = new System.Drawing.Size(255, 25);
             this.cr_code.TabIndex = 67;
             this.cr_code.TableName = null;
             this.cr_code.Tag = "Read";
@@ -512,12 +476,13 @@
             this.AddRow.Enabled = false;
             this.AddRow.Image = ((System.Drawing.Image)(resources.GetObject("AddRow.Image")));
             this.AddRow.IsShowBorder = true;
-            this.AddRow.Location = new System.Drawing.Point(889, 322);
+            this.AddRow.Location = new System.Drawing.Point(1185, 402);
+            this.AddRow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.AddRow.MoveImage = ((System.Drawing.Image)(resources.GetObject("AddRow.MoveImage")));
             this.AddRow.Name = "AddRow";
             this.AddRow.NormalImage = ((System.Drawing.Image)(resources.GetObject("AddRow.NormalImage")));
             this.AddRow.Power = null;
-            this.AddRow.Size = new System.Drawing.Size(68, 24);
+            this.AddRow.Size = new System.Drawing.Size(91, 30);
             this.AddRow.TabIndex = 60;
             this.AddRow.Tag = "IfWrite";
             this.AddRow.Text = "新增";
@@ -532,12 +497,13 @@
             this.Save.Enabled = false;
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(782, 322);
+            this.Save.Location = new System.Drawing.Point(1043, 402);
+            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(68, 24);
+            this.Save.Size = new System.Drawing.Size(91, 30);
             this.Save.TabIndex = 59;
             this.Save.Tag = "IfWrite";
             this.Save.Text = "保存";
@@ -552,12 +518,13 @@
             this.Scrap.Enabled = false;
             this.Scrap.Image = ((System.Drawing.Image)(resources.GetObject("Scrap.Image")));
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(634, 528);
+            this.Scrap.Location = new System.Drawing.Point(824, 660);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
             this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
             this.Scrap.Power = null;
-            this.Scrap.Size = new System.Drawing.Size(68, 24);
+            this.Scrap.Size = new System.Drawing.Size(91, 30);
             this.Scrap.TabIndex = 56;
             this.Scrap.Tag = "IfWrite";
             this.Scrap.Text = "报废";
@@ -572,12 +539,13 @@
             this.RepairComplete.Enabled = false;
             this.RepairComplete.Image = ((System.Drawing.Image)(resources.GetObject("RepairComplete.Image")));
             this.RepairComplete.IsShowBorder = true;
-            this.RepairComplete.Location = new System.Drawing.Point(528, 528);
+            this.RepairComplete.Location = new System.Drawing.Point(683, 660);
+            this.RepairComplete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.RepairComplete.MoveImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.MoveImage")));
             this.RepairComplete.Name = "RepairComplete";
             this.RepairComplete.NormalImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.NormalImage")));
             this.RepairComplete.Power = null;
-            this.RepairComplete.Size = new System.Drawing.Size(68, 24);
+            this.RepairComplete.Size = new System.Drawing.Size(91, 30);
             this.RepairComplete.TabIndex = 55;
             this.RepairComplete.Tag = "IfWrite";
             this.RepairComplete.Text = "完成维修";
@@ -587,18 +555,20 @@
             // bc_groupcode1
             // 
             this.bc_groupcode1.FormattingEnabled = true;
-            this.bc_groupcode1.Location = new System.Drawing.Point(826, 151);
+            this.bc_groupcode1.Location = new System.Drawing.Point(1101, 189);
+            this.bc_groupcode1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bc_groupcode1.Name = "bc_groupcode1";
-            this.bc_groupcode1.Size = new System.Drawing.Size(151, 20);
+            this.bc_groupcode1.Size = new System.Drawing.Size(200, 23);
             this.bc_groupcode1.TabIndex = 54;
             this.bc_groupcode1.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode1_SelectedIndexChanged);
             // 
             // bc_reason
             // 
             this.bc_reason.FormattingEnabled = true;
-            this.bc_reason.Location = new System.Drawing.Point(826, 194);
+            this.bc_reason.Location = new System.Drawing.Point(1101, 242);
+            this.bc_reason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bc_reason.Name = "bc_reason";
-            this.bc_reason.Size = new System.Drawing.Size(151, 20);
+            this.bc_reason.Size = new System.Drawing.Size(200, 23);
             this.bc_reason.TabIndex = 53;
             this.bc_reason.SelectedIndexChanged += new System.EventHandler(this.bc_reason_SelectedIndexChanged);
             this.bc_reason.TextChanged += new System.EventHandler(this.bc_reason_TextChanged);
@@ -607,9 +577,10 @@
             // 
             this.RepairResult.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.RepairResult.FormattingEnabled = true;
-            this.RepairResult.Location = new System.Drawing.Point(826, 284);
+            this.RepairResult.Location = new System.Drawing.Point(1101, 355);
+            this.RepairResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.RepairResult.Name = "RepairResult";
-            this.RepairResult.Size = new System.Drawing.Size(151, 20);
+            this.RepairResult.Size = new System.Drawing.Size(200, 23);
             this.RepairResult.TabIndex = 52;
             this.RepairResult.SelectedIndexChanged += new System.EventHandler(this.RepairResult_SelectedIndexChanged);
             this.RepairResult.TextChanged += new System.EventHandler(this.RepairResult_TextChanged);
@@ -619,24 +590,90 @@
             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(12, 117);
+            this.label2.Location = new System.Drawing.Point(16, 146);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 88;
             this.label2.Text = "不良信息";
             // 
             // bc_remark
             // 
-            this.bc_remark.Location = new System.Drawing.Point(826, 239);
+            this.bc_remark.Location = new System.Drawing.Point(1101, 299);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Name = "bc_remark";
-            this.bc_remark.Size = new System.Drawing.Size(150, 20);
-            this.bc_remark.TabIndex = 89;
+            this.bc_remark.Size = new System.Drawing.Size(200, 25);
+            this.bc_remark.TabIndex = 90;
+            // 
+            // mb_status
+            // 
+            this.mb_status.DataPropertyName = "mb_status";
+            this.mb_status.HeaderText = "维修结果";
+            this.mb_status.Name = "mb_status";
+            this.mb_status.ReadOnly = true;
+            this.mb_status.Width = 128;
+            // 
+            // mb_dutyman
+            // 
+            this.mb_dutyman.DataPropertyName = "mb_dutyman";
+            this.mb_dutyman.HeaderText = "责任方";
+            this.mb_dutyman.Name = "mb_dutyman";
+            this.mb_dutyman.ReadOnly = true;
+            this.mb_dutyman.Width = 120;
+            // 
+            // bc_note
+            // 
+            this.bc_note.DataPropertyName = "bc_note";
+            this.bc_note.HeaderText = "解决方案";
+            this.bc_note.Name = "bc_note";
+            this.bc_note.ReadOnly = true;
+            this.bc_note.Width = 140;
+            // 
+            // mb_badremark
+            // 
+            this.mb_badremark.DataPropertyName = "mb_badremark";
+            this.mb_badremark.HeaderText = "不良备注";
+            this.mb_badremark.Name = "mb_badremark";
+            this.mb_badremark.ReadOnly = true;
+            this.mb_badremark.Width = 140;
+            // 
+            // bc_name
+            // 
+            this.bc_name.DataPropertyName = "bc_name";
+            this.bc_name.HeaderText = "不良原因";
+            this.bc_name.Name = "bc_name";
+            this.bc_name.ReadOnly = true;
+            this.bc_name.Width = 140;
+            // 
+            // bc_groupcode
+            // 
+            this.bc_groupcode.DataPropertyName = "bc_groupcode";
+            this.bc_groupcode.HeaderText = "不良组别";
+            this.bc_groupcode.Name = "bc_groupcode";
+            this.bc_groupcode.ReadOnly = true;
+            this.bc_groupcode.Width = 120;
+            // 
+            // mb_id
+            // 
+            this.mb_id.DataPropertyName = "mb_id";
+            this.mb_id.HeaderText = "mb_id";
+            this.mb_id.Name = "mb_id";
+            this.mb_id.ReadOnly = true;
+            this.mb_id.Visible = false;
+            // 
+            // mb_badcode
+            // 
+            this.mb_badcode.DataPropertyName = "mb_badcode";
+            this.mb_badcode.HeaderText = "不良原因码";
+            this.mb_badcode.Name = "mb_badcode";
+            this.mb_badcode.ReadOnly = true;
+            this.mb_badcode.Width = 110;
             // 
             // Make_Repair
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(990, 608);
+            this.ClientSize = new System.Drawing.Size(1320, 760);
             this.Controls.Add(this.bc_remark);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.OperatResult);
@@ -674,6 +711,7 @@
             this.Controls.Add(this.ma_code_label);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_Repair";
             this.Tag = "Make!Repair";
             this.Text = "维修作业";
@@ -698,7 +736,7 @@
         private CustomControl.ButtonUtil.NormalButton AddRow;
         private CustomControl.TextBoxWithIcon.SearchTextBox cr_code;
         private CustomControl.TextBoxWithIcon.SearchTextBox cd_stepcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox GetSNCode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox GetSNCode;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label GetSNCode_Label;
@@ -716,7 +754,7 @@
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Label ma_code_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum BadCodeGrid;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;

UAS-MES/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -40,11 +40,11 @@
             this.ma_qty = new System.Windows.Forms.Label();
             this.ma_qty_lable = new System.Windows.Forms.Label();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.ReCall = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ms_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.SuspendLayout();
             // 
             // pr_detail
@@ -287,7 +287,7 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_makecode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_makecode;
         private System.Windows.Forms.Label pr_detail;
         private System.Windows.Forms.Label ms_makecode_label;
         private System.Windows.Forms.Label ma_prodcode;
@@ -295,13 +295,13 @@
         private System.Windows.Forms.Label ma_prodcode_label;
         private System.Windows.Forms.Label sncode_label;
         private System.Windows.Forms.CheckBox ChangeResult;
-        private CustomControl.TextBoxWithIcon.EnterTextBox changenum;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox changenum;
         private System.Windows.Forms.Label changenum_lanel;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.ButtonUtil.NormalButton ReCall;
         private System.Windows.Forms.Label ma_qty;
         private System.Windows.Forms.Label ma_qty_lable;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -57,8 +57,9 @@
             this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.label7 = new System.Windows.Forms.Label();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
             this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -81,7 +82,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1245, 36);
             this.panel2.TabIndex = 30;
@@ -168,7 +169,7 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(412, 64);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(412, 76);
             this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
             this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
@@ -179,7 +180,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(743, 68);
+            this.pr_detail_label.Location = new System.Drawing.Point(743, 80);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -190,7 +191,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(26, 64);
+            this.ms_makecode_label.Location = new System.Drawing.Point(26, 76);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
@@ -226,7 +227,7 @@
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
             this.GoodProduct.Location = new System.Drawing.Point(31, 680);
-            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(83, 35);
             this.GoodProduct.TabIndex = 35;
@@ -240,7 +241,7 @@
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
             this.Reject.Location = new System.Drawing.Point(141, 680);
-            this.Reject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Reject.Margin = new System.Windows.Forms.Padding(4);
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(107, 35);
             this.Reject.TabIndex = 36;
@@ -256,7 +257,7 @@
             this.columnHeader1,
             this.columnHeader2});
             this.WaitRejectList.Location = new System.Drawing.Point(29, 422);
-            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Size = new System.Drawing.Size(393, 244);
             this.WaitRejectList.TabIndex = 37;
@@ -321,7 +322,7 @@
             this.columnHeader7,
             this.columnHeader8});
             this.ChoosedRejectList.Location = new System.Drawing.Point(544, 422);
-            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Size = new System.Drawing.Size(393, 244);
             this.ChoosedRejectList.TabIndex = 50;
@@ -362,6 +363,35 @@
             this.label7.TabIndex = 51;
             this.label7.Text = "（不勾选默认全部转移）";
             // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(175, 76);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(204, 25);
+            this.ma_code.TabIndex = 67;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.Location = new System.Drawing.Point(175, 43);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(91, 24);
+            this.LockMakeCode.TabIndex = 66;
+            this.LockMakeCode.Text = "锁定工单";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
             // Save
             // 
             this.Save.AllPower = null;
@@ -381,27 +411,6 @@
             this.Save.UseVisualStyleBackColor = false;
             this.Save.Click += new System.EventHandler(this.Save_Click);
             // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(175, 64);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(205, 27);
-            this.ma_code.TabIndex = 64;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.TextKeyDown += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
-            this.ma_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ma_code_TextKeyDown);
-            // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
@@ -417,7 +426,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(907, 68);
+            this.pr_detail.Location = new System.Drawing.Point(907, 80);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -448,7 +457,7 @@
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(564, 64);
+            this.ma_prodcode.Location = new System.Drawing.Point(564, 76);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
@@ -566,9 +575,10 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1245, 780);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.Save);
-            this.Controls.Add(this.ma_code);
             this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ma_qty);
@@ -603,7 +613,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
@@ -657,8 +667,9 @@
         private CustomControl.ValueLabel.ValueLabel ma_qty;
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
-        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
         private CustomControl.ButtonUtil.NormalButton Save;
         private System.Windows.Forms.ColumnHeader columnHeader3;
+        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -47,6 +47,10 @@ namespace UAS_MES.Make
             ms_sncode.Focus();
             asc.controllInitializeSize(this);
 
+            //设置锁定工单
+            LockMakeCode.GetMakeCodeCtl(ma_code);
+            ma_code.SetLockCheckBox(LockMakeCode);
+
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_detail # 产品名称";

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -47,19 +47,19 @@
             this.ob_maxngacceptqty_label = new System.Windows.Forms.Label();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.label5 = new System.Windows.Forms.Label();
-            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_result = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_result = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.WithdrawPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchRejection = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ForcePass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -68,8 +68,8 @@
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.ob_id = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_id = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -710,32 +710,32 @@
         private CustomControl.ButtonUtil.NormalButton WithdrawPass;
         private System.Windows.Forms.CheckBox ReworkRequire;
         private System.Windows.Forms.Label ob_aqlcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_aqlcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_result;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_ngqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox oi_checkqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_okqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_aqlcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_result;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_ngqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox oi_checkqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_okqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_makecode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_makecode;
         private System.Windows.Forms.Label ob_makecode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private System.Windows.Forms.Label label3;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maxngacceptqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_maxngacceptqty;
         private System.Windows.Forms.Label ob_maxngacceptqty_label;
         private System.Windows.Forms.RichTextBox richTextBox1;
         private System.Windows.Forms.Label label5;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_id;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_source;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_id;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_source;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_Inspection.Designer.cs

@@ -47,15 +47,15 @@
             this.Delete = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SendOQC = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.RemoveAll = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.NewBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.CheckBatchDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
             this.勾选 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.ob_batchqty_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -559,21 +559,21 @@
         private System.Windows.Forms.Label label1;
         private CustomControl.DataGrid_View.DataGridViewExpand CheckBatchDGV;
         private System.Windows.Forms.Label obd_makecode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_status;
         private System.Windows.Forms.Label ob_status_label;
         private CustomControl.ButtonUtil.NormalButton NewBatch;
         private CustomControl.ButtonUtil.NormalButton RemoveAll;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
         private System.Windows.Forms.Label ob_batchqty_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pa_outboxcode;
         private System.Windows.Forms.Label pa_outboxcode_label;
         private System.Windows.Forms.CheckBox WithDraw;
         private CustomControl.ButtonUtil.NormalButton GetBatch;

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -44,12 +44,12 @@
             this.ob_aqlcode_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SaveConfiguration = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.RefreshConfiguration = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -60,13 +60,13 @@
             this.ci_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ci_kind = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.oi_sampleqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_kind = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_kind = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_source = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
             this.SuspendLayout();
@@ -626,36 +626,36 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
         private System.Windows.Forms.Label ob_batchqty_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_source;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_source;
         private System.Windows.Forms.Label ob_source_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_kind;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_kind;
         private System.Windows.Forms.Label pr_kind_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum CheckTypeDGV;
         private CustomControl.ButtonUtil.NormalButton Save;
         private CustomControl.ButtonUtil.NormalButton RefreshConfiguration;
         private CustomControl.ButtonUtil.NormalButton SaveConfiguration;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_status;
         private System.Windows.Forms.Label ob_status_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_maxngacceptqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_maxngacceptqty;
         private System.Windows.Forms.Label ob_maxacceptqty_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_aqlcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_aqlcode;
         private System.Windows.Forms.Label ob_aqlcode_label;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -50,11 +50,11 @@
             this.obd_outboxcode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_makecode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.obd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.ChoosedDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
             this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -62,8 +62,8 @@
             this.Column3 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.CheckTypeDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -74,19 +74,19 @@
             this.ois_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ChooseedReject = new UAS_MES.CustomControl.ButtonUtil.ArrowRightButton();
             this.WaitReject = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
-            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.bccode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.bccode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.Refresh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -851,35 +851,35 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_checkno;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_checkno;
         private System.Windows.Forms.Label ob_checkno_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox obd_outboxcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox obd_outboxcode;
         private System.Windows.Forms.Label obd_outboxcode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.ButtonUtil.NormalButton Cancel;
         private CustomControl.ButtonUtil.NormalButton BatchPass;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private new CustomControl.ButtonUtil.NormalButton Refresh;
-        private CustomControl.TextBoxWithIcon.EnterTextBox bccode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox bccode;
         private System.Windows.Forms.Label ob_status_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_batchqty;
         private System.Windows.Forms.Label label1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_okqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_okqty;
         private System.Windows.Forms.Label label4;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_ngqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_ngqty;
         private System.Windows.Forms.Label label5;
-        private CustomControl.TextBoxWithIcon.EnterTextBox oi_checkqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox oi_checkqty;
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private System.Windows.Forms.Label label9;
         private CustomControl.DataGrid_View.DataGridViewExpand CheckTypeDGV;
         private System.Windows.Forms.CheckBox ChooseAll;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox sncode;
         private System.Windows.Forms.Label label10;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;
         private CustomControl.DataGrid_View.DataGridViewExpand WaitChooseDGV;
         private CustomControl.DataGrid_View.DataGridViewExpand ChoosedDGV;
@@ -888,16 +888,16 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_outboxcode_dgv;
         private System.Windows.Forms.DataGridViewTextBoxColumn ob_makecode_dgv;
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_id;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_makecode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_makecode;
         private System.Windows.Forms.Label obd_makecode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_prodcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_prodcode;
         private System.Windows.Forms.Label ob_prodcode_label;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private System.Windows.Forms.Label ob_status;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ob_projectcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ob_projectcode;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_name;

UAS-MES/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -44,8 +44,8 @@
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
@@ -273,9 +273,9 @@
         #endregion
 
         private System.Windows.Forms.Label ma_code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_code;
         private System.Windows.Forms.Label sn_code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox sn_code;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.Label label2;

UAS-MES/FunctionCode/Query/Query_ProductTraceBack.Designer.cs

@@ -29,20 +29,20 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Query_ProductTraceBack));
-            this.ma_salecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_salecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.ma_salecode_label = new System.Windows.Forms.Label();
             this.ma_code_label = new System.Windows.Forms.Label();
-            this.enterTextBox2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.enterTextBox2 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label2 = new System.Windows.Forms.Label();
-            this.ma_linecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_linecode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label3 = new System.Windows.Forms.Label();
-            this.ms_nextstepcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_nextstepcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label4 = new System.Windows.Forms.Label();
-            this.ms_stepcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_stepcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label5 = new System.Windows.Forms.Label();
-            this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.pr_code_label = new System.Windows.Forms.Label();
-            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.Search = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.dataGridViewWithSerialNum1 = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
@@ -427,20 +427,20 @@
 
         #endregion
 
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_salecode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_salecode;
         private System.Windows.Forms.Label ma_salecode_label;
         private System.Windows.Forms.Label ma_code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox2;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox enterTextBox2;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_linecode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_linecode;
         private System.Windows.Forms.Label label3;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_nextstepcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_nextstepcode;
         private System.Windows.Forms.Label label4;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_stepcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_stepcode;
         private System.Windows.Forms.Label label5;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_code;
         private System.Windows.Forms.Label pr_code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.ButtonUtil.NormalButton Search;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum dataGridViewWithSerialNum1;

UAS-MES/FunctionCode/SMT/SMT_Feeding.Designer.cs

@@ -55,12 +55,12 @@
             this.de_table = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.de_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.Input = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Input = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.DownLoadAll = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.bar_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.psl_location = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.bar_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.psl_location = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.SMTInf = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.v_location = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.v_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -849,16 +849,16 @@
         private System.Windows.Forms.RadioButton PickUp;
         private System.Windows.Forms.RadioButton Shift;
         private System.Windows.Forms.RadioButton DownLoad;
-        private CustomControl.TextBoxWithIcon.EnterTextBox psl_location;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox psl_location;
         private System.Windows.Forms.Label psl_location_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox bar_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox bar_code;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label psl_table_label;
         private System.Windows.Forms.Label label12;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton DownLoadAll;
         private CustomControl.ButtonUtil.NormalButton Confirm;
-        private CustomControl.TextBoxWithIcon.EnterTextBox Input;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox Input;
         private System.Windows.Forms.Label label13;
         private CustomControl.TextBoxWithIcon.SearchTextBox de_code;
         private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;

UAS-MES/FunctionCode/SMT/SMT_MakeShift.Designer.cs

@@ -35,7 +35,7 @@
             this.ma_id = new System.Windows.Forms.Label();
             this.ma_qty = new System.Windows.Forms.Label();
             this.ma_linecode = new System.Windows.Forms.Label();
-            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.Cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
@@ -241,7 +241,7 @@
         private CustomControl.ButtonUtil.NormalButton Cancel;
         private System.Windows.Forms.Label ma_id;
         private System.Windows.Forms.Label ma_qty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_prodcode;
         private System.Windows.Forms.Label ma_linecode;
         private System.Windows.Forms.Label ma_smtcode;
     }

UAS-MES/FunctionCode/SMT/SMT_MaterialsWaring.Designer.cs

@@ -35,10 +35,10 @@
             this.mc_qty_label = new System.Windows.Forms.Label();
             this.mc_makecode_label = new System.Windows.Forms.Label();
             this.Setting = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_qty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_madeqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.dsl_devcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ma_qty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.ma_madeqty = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.dsl_devcode = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.SMTMaterialsDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.msl_location = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.msl_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -285,10 +285,10 @@
         private System.Windows.Forms.Label mc_madeqty_label;
         private System.Windows.Forms.Label mc_qty_label;
         private System.Windows.Forms.Label mc_makecode_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox dsl_devcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_madeqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_qty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ma_code;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox dsl_devcode;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_madeqty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_qty;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox ma_code;
         private CustomControl.ButtonUtil.NormalButton Setting;
         private System.Windows.Forms.DataGridViewTextBoxColumn msl_location;
         private System.Windows.Forms.DataGridViewTextBoxColumn msl_table;

UAS-MES/FunctionCode/SMT/SMT_WaringSetting.Designer.cs

@@ -34,9 +34,9 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.EarlyWarning = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.UnitTime = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.Cycle = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.EarlyWarning = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.UnitTime = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.Cycle = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.de_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.headBar1 = new UAS_MES.CustomControl.HeadBar();
             this.label4 = new System.Windows.Forms.Label();
@@ -213,12 +213,12 @@
 
         #endregion
         private System.Windows.Forms.Label label3;
-        private CustomControl.TextBoxWithIcon.EnterTextBox EarlyWarning;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox EarlyWarning;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox UnitTime;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox UnitTime;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label mc_madeqty_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox Cycle;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox Cycle;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.TextBoxWithIcon.SearchTextBox de_code;
         private CustomControl.HeadBar headBar1;

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.Designer.cs

@@ -49,7 +49,7 @@
             this.LabelParam = new System.Windows.Forms.Panel();
             this.label2 = new System.Windows.Forms.Label();
             this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
-            this.pr_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.la_type = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.la_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
@@ -73,8 +73,8 @@
             this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.UpdateGrid = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Screen = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pr_spec = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_spec = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -656,10 +656,10 @@
         }
 
         #endregion
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_detail;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_detail;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_detail_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_spec;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_spec;
         private System.Windows.Forms.Label pr_spec_label;
       
         private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
@@ -687,7 +687,7 @@
         private CustomControl.TextBoxWithIcon.SearchTextBox la_code;
         private System.Windows.Forms.Panel LabelParam;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_code2;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_code2;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewTextBoxColumn la_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn pl_detno;

UAS-MES/Program.cs

@@ -68,7 +68,7 @@ namespace UAS_MES
         {
             string str = GetExceptionMsg(e.Exception, e.ToString());
             LogManager.DoLog(e.Exception.Message + "  " + e.Exception.TargetSite + "  " + e.Exception.StackTrace);
-            MessageBox.Show(str, "操作异常", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+            MessageBox.Show(str, "提示", MessageBoxButtons.OK, MessageBoxIcon.Stop);
         }
 
         //未处理的异常统一通过这里返回
@@ -76,7 +76,7 @@ namespace UAS_MES
         {
             string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
             LogManager.DoLog(str);
-            MessageBox.Show(str, "操作异常", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+            MessageBox.Show(str, "提示", MessageBoxButtons.OK, MessageBoxIcon.Stop);
         }
 
         /// <summary>

UAS-MES/Properties/Resources.Designer.cs

@@ -420,6 +420,36 @@ namespace UAS_MES.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap lock_lock_24px {
+            get {
+                object obj = ResourceManager.GetObject("lock_lock_24px", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap lock_open_24px {
+            get {
+                object obj = ResourceManager.GetObject("lock_open_24px", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap Lock24px {
+            get {
+                object obj = ResourceManager.GetObject("Lock24px", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

UAS-MES/Properties/Resources.resx

@@ -304,4 +304,13 @@
   <data name="White_side" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Button\White-side.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Lock24px" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Lock24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="lock_lock_24px" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lock_lock_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="lock_open_24px" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lock_open_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

UAS-MES/PublicForm/ChangePwd.Designer.cs

@@ -31,11 +31,11 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChangePwd));
             this.headBar1 = new UAS_MES.CustomControl.HeadBar();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.EarlyWarning = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.EarlyWarning = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label3 = new System.Windows.Forms.Label();
-            this.UnitTime = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.UnitTime = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.label2 = new System.Windows.Forms.Label();
-            this.Cycle = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Cycle = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             this.mc_madeqty_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.SuspendLayout();
@@ -176,11 +176,11 @@
 
         private CustomControl.HeadBar headBar1;
         private CustomControl.ButtonUtil.NormalButton Confirm;
-        private CustomControl.TextBoxWithIcon.EnterTextBox EarlyWarning;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox EarlyWarning;
         private System.Windows.Forms.Label label3;
-        private CustomControl.TextBoxWithIcon.EnterTextBox UnitTime;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox UnitTime;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.EnterTextBox Cycle;
+        private CustomControl.TextBoxWithIcon.MaCodeTextBox Cycle;
         private System.Windows.Forms.Label mc_madeqty_label;
         private System.Windows.Forms.Label label1;
     }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -160,9 +160,8 @@ namespace UAS_MES.PublicMethod
                     return false;
                 }
             }
-            if (!CheckMakeStatus(iMakeCode))
+            if (!CheckMakeStatus(iMakeCode, out oErrorMessage))
             {
-                oErrorMessage = "工单的状态必须是已下放";
                 return false;
             }
             //验证当前执行的工序是否正确
@@ -261,7 +260,8 @@ namespace UAS_MES.PublicMethod
                 }
                 if (nextstepcode == sourcestepcode)
                     return true;
-                else {
+                else
+                {
                     oErrMessage = "资源" + iSource + "对应的工序是" + sourcestepcode + ",序列号" + iSnCode + "当前工序是" + nextstepcode;
                     return false;
                 }
@@ -274,9 +274,16 @@ namespace UAS_MES.PublicMethod
         /// </summary>
         /// <param name="iMaCode"></param>
         /// <returns></returns>
-        private static bool CheckMakeStatus(string iMaCode)
+        public static bool CheckMakeStatus(string iMaCode, out string ErrorMessage)
         {
-            if (dh.getFieldDataByCondition(" make ", "ma_statuscode", "ma_code='" + iMaCode + "' ").ToString() == "STARTED")
+            string ma_statuscode = dh.getFieldDataByCondition(" make ", "ma_statuscode", "ma_code='" + iMaCode + "' ").ToString();
+            ErrorMessage = "";
+            if (ma_statuscode == "")
+            {
+                ErrorMessage = "工单号" + iMaCode + "不存在";
+                return false;
+            }
+            if (ma_statuscode == "STARTED")
                 return true;
             else
                 return false;
@@ -994,7 +1001,8 @@ namespace UAS_MES.PublicMethod
                     sql = "update SnInfo set si_mac=:iMac,si_bt=:iBT,si_othcode1=:iCode1,si_othcode2=:iCode2,si_othcode3=:iCode3 where si_sn='" + dt.Rows[0]["si_sn"].ToString() + "'";
                     dh.ExecuteSql(sql, "update", iWIFI, iBT, iCode1, iCode2, iCode3);
                 }
-                else {
+                else
+                {
                     sql = "insert into SnInfo(si_id,si_sn,si_mac,si_bt,si_othcode1,si_othcode2,si_othcode3) values(SnInfo_seq.nextval,:iSn,:iWifi,:iBt,:iCode1,:iCode2,:iCode3)";
                     dh.ExecuteSql(sql, "insert", iSN, iWIFI, iBT, iCode1, iCode2, iCode3);
                 }
@@ -1402,7 +1410,7 @@ namespace UAS_MES.PublicMethod
                 //更新执行的数量
                 sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+1,mcd_outqty = mcd_outqty + 1,mcd_okqty = mcd_okqty + 1 where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
                 //更新makeSerial 的下一工序
-                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='"+StepCode+"',ms_nextstepcode='" + nextstepcode.ToString() + "' where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode.ToString() + "' where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
             }
             //更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
             dh.ExecuteSQLTran(sqls.ToArray());

UAS-MES/UAS-MES.csproj

@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
     <SccProjectName>
     </SccProjectName>
@@ -22,25 +22,23 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <PublishUrl>ftp://192.168.253.9/MESSetting/</PublishUrl>
+    <PublishUrl>F:\MESRelease\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://218.17.158.219:8888/</InstallUrl>
     <TargetCulture>zh</TargetCulture>
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
     <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
-    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>183</ApplicationRevision>
+    <ApplicationRevision>184</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -170,6 +168,12 @@
     <Compile Include="CustomControl\ButtonUtil\DeleteButton.Designer.cs">
       <DependentUpon>DeleteButton.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\ButtonUtil\LockMakeCode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\ButtonUtil\LockMakeCode.Designer.cs">
+      <DependentUpon>LockMakeCode.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\ButtonUtil\NormalButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -182,6 +186,12 @@
     <Compile Include="CustomControl\ClickPicBox\ClickPicBox.Designer.cs">
       <DependentUpon>ClickPicBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\ClickPicBox\LockIcon.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\ClickPicBox\LockIcon.Designer.cs">
+      <DependentUpon>LockIcon.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\ComBoxWithFocus\ComBoxWithFocus.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -200,6 +210,12 @@
     <Compile Include="CustomControl\ComBoxWithFocus\SerialPortCombox.Designer.cs">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.Designer.cs">
+      <DependentUpon>LockCheckBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\CustomTabControl\CustomTabControl.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -279,6 +295,12 @@
     <Compile Include="CustomControl\TextBoxWithIcon\BlurSearch.Designer.cs">
       <DependentUpon>BlurSearch.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeTextBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeTextBox.Designer.cs">
+      <DependentUpon>MaCodeTextBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\EnterTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -291,6 +313,12 @@
     <Compile Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.Designer.cs">
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeSearchTextBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\MaCodeSearchTextBox.Designer.cs">
+      <DependentUpon>MaCodeSearchTextBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\SearchTextBox.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -737,6 +765,9 @@
     <EmbeddedResource Include="CustomControl\ComBoxWithFocus\SerialPortCombox.resx">
       <DependentUpon>SerialPortCombox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\CustomCheckBox\LockCheckBox.resx">
+      <DependentUpon>LockCheckBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\CustomTabControl\CustomTabControl.resx">
       <DependentUpon>CustomTabControl.cs</DependentUpon>
     </EmbeddedResource>
@@ -761,12 +792,18 @@
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\BlurSearch.resx">
       <DependentUpon>BlurSearch.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\MaCodeTextBox.resx">
+      <DependentUpon>MaCodeTextBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\EnterTextBox.resx">
       <DependentUpon>EnterTextBox.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.resx">
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\MaCodeSearchTextBox.resx">
+      <DependentUpon>MaCodeSearchTextBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\SearchTextBox.resx">
       <DependentUpon>SearchTextBox.cs</DependentUpon>
     </EmbeddedResource>
@@ -1045,6 +1082,12 @@
     <Content Include="Resources\Internet_Explorer_Windows_8_Windows8_32px_566667_easyicon.net.ico" />
     <Content Include="Resources\LoadingError.gif" />
     <Content Include="Resources\LoadingFormat.gif" />
+    <None Include="Resources\Lock.ico" />
+    <None Include="Resources\Lock24px.ico" />
+    <None Include="Resources\Lock16px.ico" />
+    <None Include="Resources\Lock24px.png" />
+    <None Include="Resources\lock_lock_24px.png" />
+    <None Include="Resources\lock_open_24px.png" />
     <Content Include="Resources\LoginBG.jpg" />
     <Content Include="Resources\minus.gif" />
     <Content Include="Resources\notice_text_editor_16px_11373_easyicon.net.png" />