去除DbFind的操作栏图标

UAS-MES/CustomControl/Pagination/PaginationDbFind.Designer.cs

@@ -0,0 +1,327 @@
+namespace UAS_MES.CustomControl.Pagination
+{
+    partial class PaginationDbFind
+    {
+        /// <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.components = new System.ComponentModel.Container();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.ShowItemsNum = new System.Windows.Forms.ComboBox();
+            this.UpLoadData = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.DownLoadTemplet = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.Add = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.Delete = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.ExportExcel = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.TotalPage = new System.Windows.Forms.Label();
+            this.CurrentPage = new System.Windows.Forms.TextBox();
+            this.PreviousPage = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.LastPage = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.NextPage = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.FirstPage = new UAS_MES.CustomControl.ClickPicBox.ClickPicBox();
+            this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.UpLoadData)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DownLoadTemplet)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Add)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Delete)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ExportExcel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PreviousPage)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LastPage)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.NextPage)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.SystemColors.Control;
+            this.panel1.Controls.Add(this.ShowItemsNum);
+            this.panel1.Controls.Add(this.UpLoadData);
+            this.panel1.Controls.Add(this.DownLoadTemplet);
+            this.panel1.Controls.Add(this.Add);
+            this.panel1.Controls.Add(this.Delete);
+            this.panel1.Controls.Add(this.ExportExcel);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.TotalPage);
+            this.panel1.Controls.Add(this.CurrentPage);
+            this.panel1.Controls.Add(this.PreviousPage);
+            this.panel1.Controls.Add(this.LastPage);
+            this.panel1.Controls.Add(this.NextPage);
+            this.panel1.Controls.Add(this.FirstPage);
+            this.panel1.Cursor = System.Windows.Forms.Cursors.Default;
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(724, 40);
+            this.panel1.TabIndex = 0;
+            // 
+            // ShowItemsNum
+            // 
+            this.ShowItemsNum.FormattingEnabled = true;
+            this.ShowItemsNum.Items.AddRange(new object[] {
+            "40",
+            "35",
+            "30",
+            "25",
+            "20",
+            "15",
+            "10",
+            "5"});
+            this.ShowItemsNum.Location = new System.Drawing.Point(364, 8);
+            this.ShowItemsNum.Margin = new System.Windows.Forms.Padding(4);
+            this.ShowItemsNum.Name = "ShowItemsNum";
+            this.ShowItemsNum.Size = new System.Drawing.Size(65, 23);
+            this.ShowItemsNum.TabIndex = 13;
+            this.ShowItemsNum.Text = "20";
+            this.ShowItemsNum.SelectedValueChanged += new System.EventHandler(this.ShowItemsNum_SelectedValueChanged);
+            // 
+            // UpLoadData
+            // 
+            this.UpLoadData.AllPower = null;
+            this.UpLoadData.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.UpLoadData.Image = global::UAS_MES.Properties.Resources.upload_icon1;
+            this.UpLoadData.Location = new System.Drawing.Point(628, 10);
+            this.UpLoadData.Margin = new System.Windows.Forms.Padding(4);
+            this.UpLoadData.Name = "UpLoadData";
+            this.UpLoadData.Power = null;
+            this.UpLoadData.Size = new System.Drawing.Size(21, 20);
+            this.UpLoadData.TabIndex = 12;
+            this.UpLoadData.TabStop = false;
+            this.UpLoadData.Visible = false;
+            this.UpLoadData.Click += new System.EventHandler(this.UpLoadData_Click);
+            // 
+            // DownLoadTemplet
+            // 
+            this.DownLoadTemplet.AllPower = null;
+            this.DownLoadTemplet.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.DownLoadTemplet.Image = global::UAS_MES.Properties.Resources.down_load1;
+            this.DownLoadTemplet.Location = new System.Drawing.Point(580, 10);
+            this.DownLoadTemplet.Margin = new System.Windows.Forms.Padding(4);
+            this.DownLoadTemplet.Name = "DownLoadTemplet";
+            this.DownLoadTemplet.Power = null;
+            this.DownLoadTemplet.Size = new System.Drawing.Size(21, 20);
+            this.DownLoadTemplet.TabIndex = 11;
+            this.DownLoadTemplet.TabStop = false;
+            this.DownLoadTemplet.Visible = false;
+            this.DownLoadTemplet.Click += new System.EventHandler(this.DownLoadTemplet_Click);
+            // 
+            // Add
+            // 
+            this.Add.AllPower = null;
+            this.Add.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Add.Image = global::UAS_MES.Properties.Resources.bindingNavigatorAddNewItem_Image;
+            this.Add.Location = new System.Drawing.Point(484, 10);
+            this.Add.Margin = new System.Windows.Forms.Padding(4);
+            this.Add.Name = "Add";
+            this.Add.Power = null;
+            this.Add.Size = new System.Drawing.Size(21, 22);
+            this.Add.TabIndex = 10;
+            this.Add.TabStop = false;
+            this.Add.Visible = false;
+            this.Add.Click += new System.EventHandler(this.Add_Click);
+            // 
+            // Delete
+            // 
+            this.Delete.AllPower = null;
+            this.Delete.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Delete.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
+            this.Delete.Location = new System.Drawing.Point(437, 10);
+            this.Delete.Margin = new System.Windows.Forms.Padding(4);
+            this.Delete.Name = "Delete";
+            this.Delete.Power = null;
+            this.Delete.Size = new System.Drawing.Size(21, 22);
+            this.Delete.TabIndex = 9;
+            this.Delete.TabStop = false;
+            this.Delete.Tag = "IfDelete";
+            this.Delete.Visible = false;
+            this.Delete.Click += new System.EventHandler(this.Delete_Click);
+            // 
+            // ExportExcel
+            // 
+            this.ExportExcel.AllPower = null;
+            this.ExportExcel.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ExportExcel.Image = global::UAS_MES.Properties.Resources.Excel_2010_16px_1180011_easyicon_net;
+            this.ExportExcel.Location = new System.Drawing.Point(532, 10);
+            this.ExportExcel.Margin = new System.Windows.Forms.Padding(4);
+            this.ExportExcel.Name = "ExportExcel";
+            this.ExportExcel.Power = null;
+            this.ExportExcel.Size = new System.Drawing.Size(21, 22);
+            this.ExportExcel.TabIndex = 8;
+            this.ExportExcel.TabStop = false;
+            this.ExportExcel.Visible = false;
+            this.ExportExcel.Click += new System.EventHandler(this.ExportExcel_Click);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Cursor = System.Windows.Forms.Cursors.Default;
+            this.label2.Location = new System.Drawing.Point(279, 12);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(82, 15);
+            this.label2.TabIndex = 6;
+            this.label2.Text = "显示数量：";
+            // 
+            // TotalPage
+            // 
+            this.TotalPage.AutoSize = true;
+            this.TotalPage.Cursor = System.Windows.Forms.Cursors.Default;
+            this.TotalPage.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TotalPage.Location = new System.Drawing.Point(116, 6);
+            this.TotalPage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TotalPage.Name = "TotalPage";
+            this.TotalPage.Size = new System.Drawing.Size(0, 24);
+            this.TotalPage.TabIndex = 5;
+            // 
+            // CurrentPage
+            // 
+            this.CurrentPage.AcceptsReturn = true;
+            this.CurrentPage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CurrentPage.Location = new System.Drawing.Point(75, 5);
+            this.CurrentPage.Margin = new System.Windows.Forms.Padding(4);
+            this.CurrentPage.Name = "CurrentPage";
+            this.CurrentPage.Size = new System.Drawing.Size(31, 27);
+            this.CurrentPage.TabIndex = 4;
+            this.CurrentPage.Text = "1";
+            this.CurrentPage.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.CurrentPage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CurrentPage_KeyDown);
+            // 
+            // PreviousPage
+            // 
+            this.PreviousPage.AllPower = null;
+            this.PreviousPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.PreviousPage.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.PreviousPage.Image = global::UAS_MES.Properties.Resources.bindingNavigatorMovePreviousItem_Image;
+            this.PreviousPage.Location = new System.Drawing.Point(48, 10);
+            this.PreviousPage.Margin = new System.Windows.Forms.Padding(4);
+            this.PreviousPage.Name = "PreviousPage";
+            this.PreviousPage.Power = null;
+            this.PreviousPage.Size = new System.Drawing.Size(20, 19);
+            this.PreviousPage.TabIndex = 3;
+            this.PreviousPage.TabStop = false;
+            this.PreviousPage.Click += new System.EventHandler(this.PreviousPage_Click);
+            // 
+            // LastPage
+            // 
+            this.LastPage.AllPower = null;
+            this.LastPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.LastPage.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.LastPage.Image = global::UAS_MES.Properties.Resources.bindingNavigatorMoveLastItem_Image;
+            this.LastPage.Location = new System.Drawing.Point(241, 10);
+            this.LastPage.Margin = new System.Windows.Forms.Padding(4);
+            this.LastPage.Name = "LastPage";
+            this.LastPage.Power = null;
+            this.LastPage.Size = new System.Drawing.Size(20, 19);
+            this.LastPage.TabIndex = 2;
+            this.LastPage.TabStop = false;
+            this.LastPage.Click += new System.EventHandler(this.LastPage_Click);
+            // 
+            // NextPage
+            // 
+            this.NextPage.AllPower = null;
+            this.NextPage.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NextPage.Image = global::UAS_MES.Properties.Resources.bindingNavigatorMoveNextItem_Image;
+            this.NextPage.Location = new System.Drawing.Point(209, 10);
+            this.NextPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 25);
+            this.NextPage.Name = "NextPage";
+            this.NextPage.Power = null;
+            this.NextPage.Size = new System.Drawing.Size(20, 19);
+            this.NextPage.TabIndex = 1;
+            this.NextPage.TabStop = false;
+            this.NextPage.Click += new System.EventHandler(this.NextPage_Click);
+            // 
+            // FirstPage
+            // 
+            this.FirstPage.AllPower = null;
+            this.FirstPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.FirstPage.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.FirstPage.Image = global::UAS_MES.Properties.Resources.bindingNavigatorMoveFirstItem_Image;
+            this.FirstPage.Location = new System.Drawing.Point(19, 10);
+            this.FirstPage.Margin = new System.Windows.Forms.Padding(4);
+            this.FirstPage.Name = "FirstPage";
+            this.FirstPage.Power = null;
+            this.FirstPage.Size = new System.Drawing.Size(20, 19);
+            this.FirstPage.TabIndex = 0;
+            this.FirstPage.TabStop = false;
+            this.FirstPage.Click += new System.EventHandler(this.FirstPage_Click);
+            // 
+            // openFileDialog1
+            // 
+            this.openFileDialog1.FileName = "openFileDialog1";
+            // 
+            // PaginationDbFind
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.panel1);
+            this.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "PaginationDbFind";
+            this.Size = new System.Drawing.Size(724, 40);
+            this.Load += new System.EventHandler(this.Pagination_Load);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.UpLoadData)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DownLoadTemplet)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Add)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Delete)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ExportExcel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PreviousPage)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.LastPage)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.NextPage)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label TotalPage;
+        private System.Windows.Forms.TextBox CurrentPage;
+        private ClickPicBox.ClickPicBox PreviousPage;
+        private ClickPicBox.ClickPicBox LastPage;
+        private ClickPicBox.ClickPicBox NextPage;
+        private ClickPicBox.ClickPicBox FirstPage;
+        private ClickPicBox.ClickPicBox ExportExcel;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+        private ClickPicBox.ClickPicBox Add;
+        private ClickPicBox.ClickPicBox Delete;
+        private ClickPicBox.ClickPicBox DownLoadTemplet;
+        private ClickPicBox.ClickPicBox UpLoadData;
+        private System.Windows.Forms.ToolTip toolTip1;
+        private System.Windows.Forms.OpenFileDialog openFileDialog1;
+        private System.Windows.Forms.ComboBox ShowItemsNum;
+    }
+}

UAS-MES/CustomControl/Pagination/PaginationDbFind.cs

@@ -0,0 +1,391 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Windows.Forms;
+using UAS_MES.DataOperate;
+
+namespace UAS_MES.CustomControl.Pagination
+{
+    public partial class PaginationDbFind : UserControl
+    {
+        #region 变量
+        //申明一些全局变量用来在函数之间传递参数
+        int PageSize;
+        /// <summary>
+        /// 当前页码
+        /// </summary>
+        public int Current_Page;
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        int TotalPageCount;
+        /// <summary>
+        /// 一页展示的行数
+        /// </summary>
+        int RowCount;
+        /// <summary>
+        /// 主表的ID
+        /// </summary>
+        string Table_ID;
+        /// <summary>
+        /// 查询的表名
+        /// </summary>
+        string TableName;
+        string Caller;
+        /// <summary>
+        /// 查询的字段
+        /// </summary>
+        string Field;
+        /// <summary>
+        /// 需要添加的图像操作列
+        /// </summary>
+        DataGridViewImageColumn dgic = null;
+        string Condition = "";
+        /// <summary>
+        /// 删除按钮是否能够点击
+        /// </summary>
+        bool DeleteEnable1;
+        /// <summary>
+        /// 添加按钮是否能够点击
+        /// </summary>
+        bool AddEnable1;
+        DataGridView Dgv;
+        DataTable dt;
+        DataHelper dh = new DataHelper();
+
+        public bool DeleteEnable
+        {
+            get
+            {
+                return DeleteEnable1;
+            }
+
+            set
+            {
+                DeleteEnable1 = value;
+            }
+        }
+
+        public bool AddEnable
+        {
+            get
+            {
+                return AddEnable1;
+            }
+
+            set
+            {
+                AddEnable1 = value;
+            }
+        }
+        #endregion
+
+
+
+        public PaginationDbFind()
+        {
+            InitializeComponent();
+            //鼠标经过控件的时候显示文字
+            toolTip1.SetToolTip(DownLoadTemplet, "下载模板");
+            toolTip1.SetToolTip(UpLoadData, "上传数据");
+            toolTip1.SetToolTip(ExportExcel, "导出数据");
+            toolTip1.SetToolTip(Delete, "删除数据");
+            toolTip1.SetToolTip(FirstPage, "第一页");
+            toolTip1.SetToolTip(PreviousPage, "上一页");
+            toolTip1.SetToolTip(NextPage, "下一页");
+            toolTip1.SetToolTip(LastPage, "最后一页");
+        }
+
+        public delegate void OnCheckedChange(object sender, EventArgs e);
+
+        //定义事件
+        public event OnCheckedChange UserControlCheckedChanged;
+
+        /// <summary>
+        /// 将数据绑定到数据源
+        /// </summary>
+        /// <param name="dgv"></param>
+        /// <param name="TableName"></param>
+        /// <param name="Field"></param>
+        public void BindDataToNavigator(DataGridView dgv, string tableName, string field, string ID, string caller, string condition, params DataGridViewImageColumn[] operate)
+        {
+            //将传来的值赋给全局变量
+            Dgv = dgv;
+            TableName = tableName;
+            Table_ID = ID;
+            Caller = caller;
+            Field = field;
+            Condition = condition;
+            //每页显示的数据数量
+            PageSize = int.Parse(this.ShowItemsNum.Text);
+            //当前在多少页
+            Current_Page = int.Parse(this.CurrentPage.Text);
+            //获取记录的总行数
+            RowCount = dh.getRowCount(TableName);
+            //分页获取数据，先取第一页的
+            dt = dh.getFieldsDatasByPageing(TableName, field, Current_Page, PageSize, Caller, condition);
+            //给BindingSource指定一个DataTable
+            RefreshTotalCount();
+            //给父控件的DataGridView绑定数据
+            dgv.DataSource = dt;
+            dt.Dispose();
+            for (int i = 0; i < operate.Length; i++)
+            {
+                dgic = operate[i];
+                AddOperateColumnToDgv();
+            }
+        }
+
+        //获取分页的数据
+        public void GetPageData()
+        {
+            this.TotalPage.Text = "/ " + TotalPageCount.ToString();
+            CurrentPage.Text = Current_Page.ToString();
+            //取分页数据
+            dt = dh.getFieldsDatasByPageing(TableName, Field, Current_Page, PageSize, Caller, Condition);
+            //赋值给父窗体的DataGridView
+            Dgv.DataSource = dt;
+            AddOperateColumnToDgv();
+        }
+
+        //判断是否需要添加操作列
+        private void AddOperateColumnToDgv()
+        {
+            if (dgic != null)
+            {
+                if (Dgv.Columns[dgic.Name] != null)
+                {
+                    Dgv.Columns.Remove(Dgv.Columns[dgic.Name]);
+                }
+                dgic.DisplayIndex = Dgv.Columns.Count;
+                Dgv.Columns.Add(dgic);
+            }
+        }
+
+        //第一页
+        private void FirstPage_Click(object sender, EventArgs e)
+        {
+            Current_Page = 1;
+            GetPageData();
+            RefreshTotalCount();
+        }
+
+        //往前翻一页
+        private void PreviousPage_Click(object sender, EventArgs e)
+        {
+            if (Current_Page > 1)
+            {
+                Current_Page--;
+            }
+            GetPageData();
+            RefreshTotalCount();
+        }
+
+        //往后翻一页
+        private void NextPage_Click(object sender, EventArgs e)
+        {
+            if (Current_Page < TotalPageCount)
+            {
+                Current_Page++;
+            }
+            GetPageData();
+            RefreshTotalCount();
+        }
+
+        //最后一页
+        private void LastPage_Click(object sender, EventArgs e)
+        {
+            Current_Page = TotalPageCount;
+            CurrentPage.Text = TotalPageCount.ToString();
+            GetPageData();
+            RefreshTotalCount();
+        }
+
+        private void ExportExcel_Click(object sender, EventArgs e)
+        {
+            ExcelExport("Data");
+        }
+
+        //用户手动输入页码的时候获取数据
+        private void CurrentPage_KeyDown(object sender, KeyEventArgs e)
+        {
+            //判断用户是否按下回车键
+            if (e.KeyValue == (int)Keys.Enter)
+            {
+                //判断是否是数字类型的
+                if (IsNumOrNull(CurrentPage.Text))
+                {
+                    Current_Page = int.Parse(CurrentPage.Text);
+                    //判断是否是合理的页码
+                    if (Current_Page >= 1 && Current_Page <= TotalPageCount)
+                    {
+                        GetPageData();
+                    }
+                    else
+                    {
+                        MessageBox.Show("请输入正确的页码");
+                    }
+                }
+                else
+                {
+                    CurrentPage.Text = "1";
+                    MessageBox.Show("页码必须是不为空的正整数");
+                }
+            }
+        }
+
+        //判断是不是数字或者空值
+        private bool IsNumOrNull(object Num)
+        {
+            //判断是否是数组
+            foreach (char c in Num.ToString())
+            {
+                if (!char.IsDigit(c))
+                {
+                    return false;
+                }
+            }
+            //判断是否为空值
+            if (Num.ToString() == "")
+            {
+                return false;
+            }
+            return true;
+        }
+
+        //刷新总页数
+        private void RefreshTotalCount()
+        {
+            //获取记录的总行数
+            if (Condition.Trim() != "")
+            {
+                RowCount = dh.getRowCount(TableName, Condition);
+            }
+            else
+            {
+                RowCount = dh.getRowCount(TableName);
+            }
+            //取模后+1来确定总的页数
+            TotalPageCount = RowCount / PageSize + 1;
+            //设置总页数Label显示的值
+            TotalPage.Text = "/ " + TotalPageCount.ToString();
+        }
+
+        //删除按钮
+        private void Delete_Click(object sender, EventArgs e)
+        {
+            //CheckBox需要失去焦点的时候值才变化,手动使焦点到按钮这
+            Delete.Focus();
+            UserControlCheckedChanged?.Invoke(sender, new EventArgs());
+            {
+                List<string> DeleteID = new List<string>();
+                for (int i = 0; i < Dgv.Rows.Count; i++)
+                {
+                    if (Dgv.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
+                    {
+                        DeleteID.Add(Dgv.Rows[i].Cells[Table_ID].FormattedValue.ToString());
+                    }
+                }
+                if (DeleteID.ToArray().Length > 0)
+                {
+                    //取的配置的数据是从DataTable里面判断的，取的是固定字段的Dgv用第二种
+                    string tablename = TableName;
+                    if (TableName.Contains("join"))
+                    {
+                        tablename = TableName.Substring(0, TableName.IndexOf("left")).Trim();
+                    }
+                    dh.DeleteDataByID(tablename, Table_ID, DeleteID.ToArray());
+                    GetPageData();
+                    RefreshTotalCount();
+                }
+            }
+        }
+
+        //添加新的数据
+        private void Add_Click(object sender, EventArgs e)
+        {
+            ((DataTable)Dgv.DataSource).Rows.Add();
+        }
+
+        private void DownLoadTemplet_Click(object sender, EventArgs e)
+        {
+            ExcelExport("Templet");
+        }
+
+        //选择导出Excel时是选择导出数据的还是模板
+        private void ExcelExport(string DataOrTemplet)
+        {
+            //Data表示导出数据
+            //Templet表示导出模板
+            folderBrowserDialog1.Description = "选择导出的路径";
+            DialogResult result = folderBrowserDialog1.ShowDialog();
+            if (result == DialogResult.OK)
+            {
+                string FolderPath = folderBrowserDialog1.SelectedPath;
+                ExcelHandler eh = new ExcelHandler();
+                DataTable dt = new DataTable();
+                if (DataOrTemplet == "Data")
+                {
+                    dt = dh.getFieldsDatas(TableName, Field);
+                }
+                else
+                {
+                    //这是根据表名获取到的列和列的数据类型，是column的类型，需要手动转换成row类型
+                    dt = dh.GetColumnDataType(TableName);
+                    dt = dh.DataTypeColumnToDataTable(dt);
+                }
+                //导出Excel的时候返回一个文件名，用户选择是否打开
+                string filePath = eh.ExportExcel(dt, FolderPath);
+                //用户选择导出之后是否立即打开
+                MessageBoxButtons messButton = MessageBoxButtons.YesNo;
+                string openFile = MessageBox.Show(this.ParentForm, "是否打开文件", "提示", messButton).ToString();
+                if (openFile == "Yes")
+                {
+                    System.Diagnostics.Process.Start(filePath);
+                }
+            }
+        }
+
+        private void UpLoadData_Click(object sender, EventArgs e)
+        {
+            openFileDialog1.Title = "选择需要导入的Excel";
+            if (openFileDialog1.ShowDialog() == DialogResult.OK)
+            {
+                string ChoosedExcel = openFileDialog1.FileName;
+                ExcelHandler eh = new ExcelHandler();
+                Console.WriteLine(ChoosedExcel);
+                eh.ImportExcel(ChoosedExcel, "test");
+            }
+        }
+
+        private void ShowItemsNum_SelectedValueChanged(object sender, EventArgs e)
+        {
+            if (IsNumOrNull(ShowItemsNum.SelectedItem))
+            {
+                PageSize = int.Parse(ShowItemsNum.SelectedItem.ToString());
+                //推荐合理的行数
+                //int AdviceNum = DgvHeight / DgvRowHeight - 3;
+                if (PageSize >= 1)
+                {
+                    RefreshTotalCount();
+                    GetPageData();
+                }
+                else
+                {
+                    MessageBox.Show("请输入正确的数字");
+                }
+            }
+            else
+            {
+                MessageBox.Show("页码必须是不为空的正整数");
+            }
+        }
+
+        private void Pagination_Load(object sender, EventArgs e)
+        {
+            Delete.Enabled = DeleteEnable1;
+            Add.Enabled = AddEnable1;
+        }
+    }
+}

UAS-MES/CustomControl/Pagination/PaginationDbFind.resx

@@ -0,0 +1,129 @@
+<?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="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>197, 17</value>
+  </metadata>
+  <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>298, 17</value>
+  </metadata>
+</root>

UAS-MES/DbFind.Designer.cs

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.DbFindGridView = new System.Windows.Forms.DataGridView();
-            this.pagination1 = new UAS_MES.CustomControl.Pagination.Pagination();
+            this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
             ((System.ComponentModel.ISupportInitialize)(this.DbFindGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -82,6 +82,6 @@
         #endregion
 
         private System.Windows.Forms.DataGridView DbFindGridView;
-        private CustomControl.Pagination.Pagination pagination1;
+        private CustomControl.Pagination.PaginationDbFind pagination1;
     }
 }

UAS-MES/Form1.Designer.cs

@@ -28,9 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
@@ -73,24 +73,24 @@
             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;
-            chartArea1.Name = "ChartArea1";
-            this.ct_coll.ChartAreas.Add(chartArea1);
-            legend1.Enabled = false;
-            legend1.Name = "Legend1";
-            this.ct_coll.Legends.Add(legend1);
-            this.ct_coll.Location = new System.Drawing.Point(622, 167);
-            this.ct_coll.Margin = new System.Windows.Forms.Padding(2);
+            chartArea6.Name = "ChartArea1";
+            this.ct_coll.ChartAreas.Add(chartArea6);
+            legend6.Enabled = false;
+            legend6.Name = "Legend1";
+            this.ct_coll.Legends.Add(legend6);
+            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;
-            series1.ChartArea = "ChartArea1";
-            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
-            series1.IsXValueIndexed = true;
-            series1.Label = "#PERCENT#VALX :#VAL";
-            series1.Legend = "Legend1";
-            series1.LegendText = "#VALX";
-            series1.Name = "Series1";
-            this.ct_coll.Series.Add(series1);
-            this.ct_coll.Size = new System.Drawing.Size(296, 318);
+            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);
+            this.ct_coll.Size = new System.Drawing.Size(395, 398);
             this.ct_coll.TabIndex = 5;
             this.ct_coll.Text = "chart1";
             // 
@@ -101,12 +101,13 @@
             this.searchTextBox2.Condition = null;
             this.searchTextBox2.DBTitle = null;
             this.searchTextBox2.FormName = null;
-            this.searchTextBox2.Location = new System.Drawing.Point(396, 67);
+            this.searchTextBox2.Location = new System.Drawing.Point(528, 84);
+            this.searchTextBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.searchTextBox2.Name = "searchTextBox2";
             this.searchTextBox2.Power = null;
             this.searchTextBox2.SelectField = null;
             this.searchTextBox2.SetValueField = null;
-            this.searchTextBox2.Size = new System.Drawing.Size(210, 21);
+            this.searchTextBox2.Size = new System.Drawing.Size(280, 26);
             this.searchTextBox2.TabIndex = 14;
             this.searchTextBox2.TableName = null;
             this.searchTextBox2.TextBoxEnable = false;
@@ -118,22 +119,23 @@
             this.searchTextBox1.Condition = null;
             this.searchTextBox1.DBTitle = null;
             this.searchTextBox1.FormName = null;
-            this.searchTextBox1.Location = new System.Drawing.Point(396, 40);
+            this.searchTextBox1.Location = new System.Drawing.Point(528, 50);
+            this.searchTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.searchTextBox1.Name = "searchTextBox1";
             this.searchTextBox1.Power = null;
             this.searchTextBox1.SelectField = null;
             this.searchTextBox1.SetValueField = null;
-            this.searchTextBox1.Size = new System.Drawing.Size(115, 21);
+            this.searchTextBox1.Size = new System.Drawing.Size(153, 26);
             this.searchTextBox1.TabIndex = 13;
             this.searchTextBox1.TableName = null;
             this.searchTextBox1.TextBoxEnable = false;
             // 
             // serialPortCombox1
             // 
-            this.serialPortCombox1.Location = new System.Drawing.Point(622, 516);
-            this.serialPortCombox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.serialPortCombox1.Location = new System.Drawing.Point(829, 645);
+            this.serialPortCombox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.serialPortCombox1.Name = "serialPortCombox1";
-            this.serialPortCombox1.Size = new System.Drawing.Size(140, 20);
+            this.serialPortCombox1.Size = new System.Drawing.Size(187, 25);
             this.serialPortCombox1.TabIndex = 12;
             // 
             // normalButton3
@@ -143,12 +145,13 @@
             this.normalButton3.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton3.DownImage")));
             this.normalButton3.Image = null;
             this.normalButton3.IsShowBorder = true;
-            this.normalButton3.Location = new System.Drawing.Point(396, 473);
+            this.normalButton3.Location = new System.Drawing.Point(528, 591);
+            this.normalButton3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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")));
             this.normalButton3.Power = null;
-            this.normalButton3.Size = new System.Drawing.Size(91, 28);
+            this.normalButton3.Size = new System.Drawing.Size(121, 35);
             this.normalButton3.TabIndex = 11;
             this.normalButton3.Text = "normalButton3";
             this.normalButton3.UseVisualStyleBackColor = false;
@@ -161,12 +164,13 @@
             this.normalButton2.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton2.DownImage")));
             this.normalButton2.Image = null;
             this.normalButton2.IsShowBorder = true;
-            this.normalButton2.Location = new System.Drawing.Point(396, 424);
+            this.normalButton2.Location = new System.Drawing.Point(528, 530);
+            this.normalButton2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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")));
             this.normalButton2.Power = null;
-            this.normalButton2.Size = new System.Drawing.Size(91, 28);
+            this.normalButton2.Size = new System.Drawing.Size(121, 35);
             this.normalButton2.TabIndex = 10;
             this.normalButton2.Text = "normalButton2";
             this.normalButton2.UseVisualStyleBackColor = false;
@@ -175,11 +179,11 @@
             // TestDGV
             // 
             this.TestDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.TestDGV.Location = new System.Drawing.Point(34, 110);
-            this.TestDGV.Margin = new System.Windows.Forms.Padding(2);
+            this.TestDGV.Location = new System.Drawing.Point(45, 138);
+            this.TestDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.TestDGV.Name = "TestDGV";
             this.TestDGV.RowTemplate.Height = 27;
-            this.TestDGV.Size = new System.Drawing.Size(357, 274);
+            this.TestDGV.Size = new System.Drawing.Size(476, 342);
             this.TestDGV.TabIndex = 9;
             // 
             // numOnlyTextBox1
@@ -187,12 +191,12 @@
             this.numOnlyTextBox1.AllPower = null;
             this.numOnlyTextBox1.BackColor = System.Drawing.Color.White;
             this.numOnlyTextBox1.ID = null;
-            this.numOnlyTextBox1.Location = new System.Drawing.Point(243, 46);
-            this.numOnlyTextBox1.Margin = new System.Windows.Forms.Padding(2);
+            this.numOnlyTextBox1.Location = new System.Drawing.Point(325, 75);
+            this.numOnlyTextBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.numOnlyTextBox1.Name = "numOnlyTextBox1";
             this.numOnlyTextBox1.Negative = false;
             this.numOnlyTextBox1.Power = null;
-            this.numOnlyTextBox1.Size = new System.Drawing.Size(148, 21);
+            this.numOnlyTextBox1.Size = new System.Drawing.Size(196, 25);
             this.numOnlyTextBox1.Str = null;
             this.numOnlyTextBox1.Str1 = null;
             this.numOnlyTextBox1.Str2 = null;
@@ -202,18 +206,18 @@
             // 
             this.blurSearch1.Field = null;
             this.blurSearch1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.blurSearch1.Location = new System.Drawing.Point(34, 46);
-            this.blurSearch1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            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(154, 29);
+            this.blurSearch1.Size = new System.Drawing.Size(205, 42);
             this.blurSearch1.TabIndex = 0;
             this.blurSearch1.TableName = null;
             // 
             // Form1
             // 
-            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(929, 590);
+            this.ClientSize = new System.Drawing.Size(1239, 738);
             this.Controls.Add(this.searchTextBox2);
             this.Controls.Add(this.searchTextBox1);
             this.Controls.Add(this.serialPortCombox1);
@@ -223,6 +227,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.Name = "Form1";
             this.Tag = "123123";
             this.Text = " ";

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

@@ -42,7 +42,7 @@
             this.em_name11 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             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.Pagination();
+            this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
             this.em_depart1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.em_position1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -294,7 +294,7 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox em_name11;
         private System.Windows.Forms.Label em_name_label;
         private System.Windows.Forms.Label em_code_label;
-        private CustomControl.Pagination.Pagination pagination1;
+        private CustomControl.Pagination.PaginationDbFind pagination1;
         private CustomControl.TextBoxWithIcon.EnterTextBox em_depart1;
         private System.Windows.Forms.Label label1;
         private CustomControl.TextBoxWithIcon.EnterTextBox em_position1;

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -364,7 +364,7 @@ namespace UAS_MES.Make
                     //序列号为空的时候
                     else if (sn_code.Text == "")
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_status,ms_nextstepcode  from  ma keserial  where  ms_sncode='" + code.Text + "'", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ms_status,ms_nextstepcode from makeserial  where  ms_sncode='" + code.Text + "'", "select");
                         if (dt.Rows.Count > 0)
                         {
                             string ms_status = dt.Rows[0]["ms_status"].ToString();

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

@@ -40,7 +40,6 @@
             this.ma_prodcode_label = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.GoodProduct = new System.Windows.Forms.RadioButton();
@@ -58,6 +57,7 @@
             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.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();
@@ -72,9 +72,7 @@
             this.bc_code = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.bc_groupcode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.panel2.SuspendLayout();
-            this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel2
@@ -83,8 +81,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(934, 29);
+            this.panel2.Size = new System.Drawing.Size(1245, 36);
             this.panel2.TabIndex = 30;
             // 
             // label1
@@ -92,9 +91,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 = "基本信息";
             // 
@@ -102,9 +102,10 @@
             // 
             this.bc_remark_label.AutoSize = true;
             this.bc_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_remark_label.Location = new System.Drawing.Point(20, 252);
+            this.bc_remark_label.Location = new System.Drawing.Point(27, 287);
+            this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
-            this.bc_remark_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.Text = "不良备注";
             // 
@@ -112,9 +113,10 @@
             // 
             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(231, 571);
+            this.ms_sncode_label.Location = new System.Drawing.Point(308, 686);
+            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 = 18;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -122,9 +124,10 @@
             // 
             this.bc_groupcode_label.AutoSize = true;
             this.bc_groupcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_groupcode_label.Location = new System.Drawing.Point(20, 211);
+            this.bc_groupcode_label.Location = new System.Drawing.Point(27, 236);
+            this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
-            this.bc_groupcode_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.Text = "不良组别";
             // 
@@ -132,9 +135,10 @@
             // 
             this.mc_restqty_label.AutoSize = true;
             this.mc_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mc_restqty_label.Location = new System.Drawing.Point(557, 101);
+            this.mc_restqty_label.Location = new System.Drawing.Point(743, 126);
+            this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mc_restqty_label.Name = "mc_restqty_label";
-            this.mc_restqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.mc_restqty_label.TabIndex = 17;
             this.mc_restqty_label.Text = "待采集数";
             // 
@@ -142,9 +146,10 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(307, 101);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(409, 126);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_inqty_label.TabIndex = 14;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -152,9 +157,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(24, 101);
+            this.ma_qty_label.Location = new System.Drawing.Point(26, 126);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 11;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -162,9 +168,10 @@
             // 
             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(309, 51);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(412, 64);
+            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 = 7;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -172,9 +179,10 @@
             // 
             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(557, 54);
+            this.pr_detail_label.Location = new System.Drawing.Point(743, 68);
+            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 = 6;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -182,31 +190,22 @@
             // 
             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(24, 51);
+            this.ms_makecode_label.Location = new System.Drawing.Point(26, 64);
+            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(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 2;
             this.ms_makecode_label.Text = "归属工单";
             // 
-            // panel1
-            // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Location = new System.Drawing.Point(0, 155);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(934, 29);
-            this.panel1.TabIndex = 31;
-            // 
             // label2
             // 
             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.SystemColors.ActiveCaptionText;
-            this.label2.Location = new System.Drawing.Point(12, 3);
+            this.label2.ForeColor = System.Drawing.Color.Blue;
+            this.label2.Location = new System.Drawing.Point(26, 187);
+            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 = 0;
             this.label2.Text = "信息采集";
             // 
@@ -214,9 +213,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(414, 214);
+            this.label3.Location = new System.Drawing.Point(552, 240);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 34;
             this.label3.Text = "不良代码";
             // 
@@ -225,9 +225,10 @@
             this.GoodProduct.AutoSize = true;
             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(23, 566);
+            this.GoodProduct.Location = new System.Drawing.Point(31, 680);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GoodProduct.Name = "GoodProduct";
-            this.GoodProduct.Size = new System.Drawing.Size(68, 29);
+            this.GoodProduct.Size = new System.Drawing.Size(83, 35);
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
@@ -238,9 +239,10 @@
             this.Reject.AutoSize = true;
             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(106, 566);
+            this.Reject.Location = new System.Drawing.Point(141, 680);
+            this.Reject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Reject.Name = "Reject";
-            this.Reject.Size = new System.Drawing.Size(87, 29);
+            this.Reject.Size = new System.Drawing.Size(107, 35);
             this.Reject.TabIndex = 36;
             this.Reject.TabStop = true;
             this.Reject.Text = "不良品";
@@ -253,9 +255,10 @@
             this.columnHeader5,
             this.columnHeader1,
             this.columnHeader2});
-            this.WaitRejectList.Location = new System.Drawing.Point(22, 360);
+            this.WaitRejectList.Location = new System.Drawing.Point(29, 422);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(296, 196);
+            this.WaitRejectList.Size = new System.Drawing.Size(393, 244);
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -280,9 +283,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(24, 330);
+            this.label4.Location = new System.Drawing.Point(32, 384);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 39;
             this.label4.Text = "待选不良";
             // 
@@ -290,9 +294,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(410, 331);
+            this.label5.Location = new System.Drawing.Point(547, 386);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(74, 21);
+            this.label5.Size = new System.Drawing.Size(92, 27);
             this.label5.TabIndex = 40;
             this.label5.Text = "已选不良";
             // 
@@ -300,9 +305,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(714, 214);
+            this.label6.Location = new System.Drawing.Point(952, 240);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 21);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 46;
             this.label6.Text = "操作结果";
             // 
@@ -314,9 +320,10 @@
             this.columnHeader3,
             this.columnHeader7,
             this.columnHeader8});
-            this.ChoosedRejectList.Location = new System.Drawing.Point(408, 360);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 422);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(296, 196);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(393, 244);
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -330,7 +337,7 @@
             // 
             this.columnHeader3.Text = "不良代码组";
             this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader3.Width = 78;
+            this.columnHeader3.Width = 95;
             // 
             // columnHeader7
             // 
@@ -348,12 +355,32 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(186, 338);
+            this.label7.Location = new System.Drawing.Point(248, 394);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(140, 17);
+            this.label7.Size = new System.Drawing.Size(174, 20);
             this.label7.TabIndex = 51;
             this.label7.Text = "（不勾选默认全部转移）";
             // 
+            // Save
+            // 
+            this.Save.AllPower = null;
+            this.Save.BackColor = System.Drawing.Color.Transparent;
+            this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
+            this.Save.Image = null;
+            this.Save.IsShowBorder = true;
+            this.Save.Location = new System.Drawing.Point(684, 684);
+            this.Save.Margin = new System.Windows.Forms.Padding(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(100, 30);
+            this.Save.TabIndex = 65;
+            this.Save.Text = "保存";
+            this.Save.UseVisualStyleBackColor = false;
+            this.Save.Click += new System.EventHandler(this.Save_Click);
+            // 
             // ma_code
             // 
             this.ma_code.AllPower = null;
@@ -361,25 +388,28 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(131, 51);
+            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(154, 22);
+            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;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(680, 101);
+            this.mcd_remainqty.Location = new System.Drawing.Point(907, 126);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
@@ -387,27 +417,30 @@
             // 
             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(680, 54);
+            this.pr_detail.Location = new System.Drawing.Point(907, 68);
+            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 = 56;
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(131, 101);
+            this.ma_qty.Location = new System.Drawing.Point(175, 126);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 55;
             // 
             // mcd_inqty
             // 
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(423, 101);
+            this.mcd_inqty.Location = new System.Drawing.Point(564, 126);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.Tag = "mcd_inqty";
             // 
@@ -415,17 +448,19 @@
             // 
             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(423, 51);
+            this.ma_prodcode.Location = new System.Drawing.Point(564, 64);
+            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 = 53;
             // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(718, 250);
+            this.OperateResult.Location = new System.Drawing.Point(957, 284);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(207, 306);
+            this.OperateResult.Size = new System.Drawing.Size(275, 382);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -436,12 +471,13 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
-            this.CleanInfo.Location = new System.Drawing.Point(789, 567);
+            this.CleanInfo.Location = new System.Drawing.Point(1052, 681);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
             this.CleanInfo.Power = null;
-            this.CleanInfo.Size = new System.Drawing.Size(61, 24);
+            this.CleanInfo.Size = new System.Drawing.Size(81, 30);
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.UseVisualStyleBackColor = true;
@@ -450,9 +486,10 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(340, 479);
+            this.ChooseedReject.Location = new System.Drawing.Point(452, 571);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(50, 23);
+            this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -460,9 +497,10 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(340, 415);
+            this.WaitReject.Location = new System.Drawing.Point(452, 491);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(50, 23);
+            this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.TabIndex = 44;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -472,11 +510,12 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
-            this.bc_remark.Location = new System.Drawing.Point(123, 250);
+            this.bc_remark.Location = new System.Drawing.Point(164, 284);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
-            this.bc_remark.Size = new System.Drawing.Size(581, 66);
+            this.bc_remark.Size = new System.Drawing.Size(773, 82);
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
@@ -486,18 +525,20 @@
             // 
             this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.FormattingEnabled = true;
-            this.bc_code.Location = new System.Drawing.Point(513, 214);
+            this.bc_code.Location = new System.Drawing.Point(684, 240);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(4);
             this.bc_code.Name = "bc_code";
-            this.bc_code.Size = new System.Drawing.Size(191, 22);
+            this.bc_code.Size = new System.Drawing.Size(253, 26);
             this.bc_code.TabIndex = 33;
             // 
             // bc_groupcode
             // 
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
-            this.bc_groupcode.Location = new System.Drawing.Point(123, 214);
+            this.bc_groupcode.Location = new System.Drawing.Point(164, 240);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
             this.bc_groupcode.Name = "bc_groupcode";
-            this.bc_groupcode.Size = new System.Drawing.Size(189, 22);
+            this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
@@ -507,10 +548,11 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(317, 571);
+            this.ms_sncode.Location = new System.Drawing.Point(423, 686);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(181, 24);
+            this.ms_sncode.Size = new System.Drawing.Size(240, 28);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -518,30 +560,13 @@
             this.ms_sncode.Tag = "IfWrite";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             // 
-            // Save
-            // 
-            this.Save.AllPower = null;
-            this.Save.BackColor = System.Drawing.Color.Transparent;
-            this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
-            this.Save.Image = null;
-            this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(513, 570);
-            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(75, 24);
-            this.Save.TabIndex = 65;
-            this.Save.Text = "保存";
-            this.Save.UseVisualStyleBackColor = false;
-            this.Save.Click += new System.EventHandler(this.Save_Click);
-            // 
             // Make_TestCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(934, 624);
+            this.ClientSize = new System.Drawing.Size(1245, 780);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.Save);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.mcd_remainqty);
@@ -564,7 +589,6 @@
             this.Controls.Add(this.GoodProduct);
             this.Controls.Add(this.bc_code);
             this.Controls.Add(this.label3);
-            this.Controls.Add(this.panel1);
             this.Controls.Add(this.mc_restqty_label);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.bc_groupcode);
@@ -579,6 +603,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.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
@@ -586,8 +611,6 @@
             this.SizeChanged += new System.EventHandler(this.测试采集_SizeChanged);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -607,7 +630,6 @@
         private CustomControl.ComBoxWithFocus.ComBoxWithFocus bc_groupcode;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label label2;
         private CustomControl.ComBoxWithFocus.ComBoxWithFocus bc_code;
         private System.Windows.Forms.Label label3;

UAS-MES/FunctionCode/Make/Make_TestCollection.resx

@@ -118,6 +118,44 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Save.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Save.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Save.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="CleanInfo.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -285,44 +323,6 @@
         ZrIE7d4UdV3k12BxFb3huIgob74jq7eOllIz0Q9sQrs7Ui9wepGrci6vk/HQgzzKm+7IZUgTOpQ2kj7o
         zB15DHqhq3IurxPdaY8R5U37C1K8XmyU9PGfh25xfV0R/UeTz52y3EtWQ9dqNEP4HY3LfwGra+NvPdw7
         fgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Save.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Save.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Save.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

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

@@ -48,7 +48,7 @@
             this.la_code_label = new System.Windows.Forms.Label();
             this.LabelParam = new System.Windows.Forms.Panel();
             this.label2 = new System.Windows.Forms.Label();
-            this.pagination1 = new UAS_MES.CustomControl.Pagination.Pagination();
+            this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
             this.pr_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.la_type = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
@@ -702,6 +702,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pl_labelurl;
         private System.Windows.Forms.DataGridViewTextBoxColumn pl_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn pl_prodcode;
-        private CustomControl.Pagination.Pagination pagination1;
+        private CustomControl.Pagination.PaginationDbFind pagination1;
     }
 }

UAS-MES/Program.cs

@@ -19,7 +19,7 @@ namespace UAS_MES
             {
                 WindowsIdentity identity = WindowsIdentity.GetCurrent();
                 WindowsPrincipal principal = new WindowsPrincipal(identity);
-                //设置应用程序处理异常方式：ThreadException处理
+                //设置应用程序处理异常方式:ThreadException处理
                 Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
                 //处理UI线程异常
                 Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
@@ -79,7 +79,7 @@ namespace UAS_MES
             MessageBox.Show(str, "操作异常", MessageBoxButtons.OK, MessageBoxIcon.Stop);
         }
 
-        /// <summary>7
+        /// <summary>
         /// 生成自定义异常消息
         /// </summary>
         /// <param name="ex">异常对象</param>

UAS-MES/PublicForm/DataChooseForm.Designer.cs

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.pagination1 = new UAS_MES.CustomControl.Pagination.Pagination();
+            this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
             this.dataGridViewWithSerialNum1 = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewWithSerialNum1)).BeginInit();
@@ -85,7 +85,7 @@
         }
 
         #endregion
-        private CustomControl.Pagination.Pagination pagination1;
+        private CustomControl.Pagination.PaginationDbFind pagination1;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum dataGridViewWithSerialNum1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
     }

UAS-MES/UAS-MES.csproj

@@ -243,6 +243,12 @@
     <Compile Include="CustomControl\ListViewExpand\ListViewExpand.Designer.cs">
       <DependentUpon>ListViewExpand.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\Pagination\PaginationDbFind.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\Pagination\PaginationDbFind.Designer.cs">
+      <DependentUpon>PaginationDbFind.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\Pagination\Pagination.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -743,6 +749,9 @@
     <EmbeddedResource Include="CustomControl\HeadBar\HeadBar.zu.resx">
       <DependentUpon>HeadBar.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\Pagination\PaginationDbFind.resx">
+      <DependentUpon>PaginationDbFind.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\Pagination\Pagination.resx">
       <DependentUpon>Pagination.cs</DependentUpon>
     </EmbeddedResource>