Merge repos.ubtob.net:usoft/mes-client

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.Designer.cs

@@ -29,6 +29,8 @@
         private void InitializeComponent()
         {
             this.TopBox = new System.Windows.Forms.Panel();
+            this.currStatusVal = new System.Windows.Forms.TextBox();
+            this.currStatusLab = new System.Windows.Forms.Label();
             this.cancel = new System.Windows.Forms.Button();
             this.prevTimeVal = new System.Windows.Forms.TextBox();
             this.prevTimeLab = new System.Windows.Forms.Label();
@@ -40,46 +42,43 @@
             this.toolingLab = new System.Windows.Forms.Label();
             this.ExeBox = new System.Windows.Forms.TabControl();
             this.ExePage1 = new System.Windows.Forms.TabPage();
-            this.Container = new System.Windows.Forms.TableLayoutPanel();
-            this.MsgBox = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Page1Box = new System.Windows.Forms.TableLayoutPanel();
-            this.panel1 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.Receive = new System.Windows.Forms.Button();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
-            this.ma_codeLab = new System.Windows.Forms.Label();
-            this.sideVal = new System.Windows.Forms.ComboBox();
-            this.sideLab = new System.Windows.Forms.Label();
-            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.li_codeLab = new System.Windows.Forms.Label();
-            this.empVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.empLab = new System.Windows.Forms.Label();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
-            this.stA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.Scrap = new System.Windows.Forms.Button();
+            this.Return = new System.Windows.Forms.Button();
             this.stALab = new System.Windows.Forms.Label();
-            this.stB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stBLab = new System.Windows.Forms.Label();
-            this.stC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stCLab = new System.Windows.Forms.Label();
-            this.stD = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stDLab = new System.Windows.Forms.Label();
-            this.stE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stELab = new System.Windows.Forms.Label();
             this.stLab = new System.Windows.Forms.Label();
-            this.empVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.empLab1 = new System.Windows.Forms.Label();
             this.IsClean = new System.Windows.Forms.CheckBox();
-            this.Return = new System.Windows.Forms.Button();
-            this.Scrap = new System.Windows.Forms.Button();
-            this.currStatusVal = new System.Windows.Forms.TextBox();
-            this.currStatusLab = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.empLab = new System.Windows.Forms.Label();
+            this.li_codeLab = new System.Windows.Forms.Label();
+            this.sideVal = new System.Windows.Forms.ComboBox();
+            this.sideLab = new System.Windows.Forms.Label();
+            this.ma_codeLab = new System.Windows.Forms.Label();
+            this.Receive = new System.Windows.Forms.Button();
+            this.Container = new System.Windows.Forms.TableLayoutPanel();
+            this.MsgBox = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.stA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.stB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.stC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.stD = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.stE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.empVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.empVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.TopBox.SuspendLayout();
             this.ExeBox.SuspendLayout();
             this.ExePage1.SuspendLayout();
-            this.Container.SuspendLayout();
             this.Page1Box.SuspendLayout();
-            this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.Container.SuspendLayout();
             this.SuspendLayout();
             // 
             // TopBox
@@ -101,6 +100,25 @@
             this.TopBox.Size = new System.Drawing.Size(1280, 279);
             this.TopBox.TabIndex = 10;
             // 
+            // currStatusVal
+            // 
+            this.currStatusVal.Enabled = false;
+            this.currStatusVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.currStatusVal.Location = new System.Drawing.Point(717, 51);
+            this.currStatusVal.Name = "currStatusVal";
+            this.currStatusVal.Size = new System.Drawing.Size(76, 31);
+            this.currStatusVal.TabIndex = 12;
+            // 
+            // currStatusLab
+            // 
+            this.currStatusLab.AutoSize = true;
+            this.currStatusLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.currStatusLab.Location = new System.Drawing.Point(641, 53);
+            this.currStatusLab.Name = "currStatusLab";
+            this.currStatusLab.Size = new System.Drawing.Size(117, 28);
+            this.currStatusLab.TabIndex = 11;
+            this.currStatusLab.Text = "当前状态：";
+            // 
             // cancel
             // 
             this.cancel.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -215,33 +233,6 @@
             this.ExePage1.Text = "领用/归还";
             this.ExePage1.UseVisualStyleBackColor = true;
             // 
-            // Container
-            // 
-            this.Container.ColumnCount = 2;
-            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
-            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
-            this.Container.Controls.Add(this.MsgBox, 1, 0);
-            this.Container.Controls.Add(this.ExeBox, 0, 0);
-            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.Container.Location = new System.Drawing.Point(0, 279);
-            this.Container.Name = "Container";
-            this.Container.RowCount = 1;
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 526F));
-            this.Container.Size = new System.Drawing.Size(1280, 441);
-            this.Container.TabIndex = 12;
-            // 
-            // MsgBox
-            // 
-            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.MsgBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MsgBox.Location = new System.Drawing.Point(900, 4);
-            this.MsgBox.Margin = new System.Windows.Forms.Padding(4);
-            this.MsgBox.Name = "MsgBox";
-            this.MsgBox.Size = new System.Drawing.Size(376, 433);
-            this.MsgBox.TabIndex = 54;
-            this.MsgBox.Text = "";
-            // 
             // Page1Box
             // 
             this.Page1Box.ColumnCount = 1;
@@ -257,24 +248,6 @@
             this.Page1Box.Size = new System.Drawing.Size(876, 388);
             this.Page1Box.TabIndex = 0;
             // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.LockMakeCode);
-            this.panel1.Controls.Add(this.empVal);
-            this.panel1.Controls.Add(this.empLab);
-            this.panel1.Controls.Add(this.li_code);
-            this.panel1.Controls.Add(this.li_codeLab);
-            this.panel1.Controls.Add(this.sideVal);
-            this.panel1.Controls.Add(this.sideLab);
-            this.panel1.Controls.Add(this.ma_code);
-            this.panel1.Controls.Add(this.ma_codeLab);
-            this.panel1.Controls.Add(this.Receive);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(3, 3);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(870, 188);
-            this.panel1.TabIndex = 0;
-            // 
             // panel2
             // 
             this.panel2.Controls.Add(this.Scrap);
@@ -299,118 +272,135 @@
             this.panel2.Size = new System.Drawing.Size(870, 188);
             this.panel2.TabIndex = 1;
             // 
-            // Receive
+            // Scrap
             // 
-            this.Receive.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Receive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Receive.Location = new System.Drawing.Point(370, 98);
-            this.Receive.Name = "Receive";
-            this.Receive.Size = new System.Drawing.Size(100, 32);
-            this.Receive.TabIndex = 11;
-            this.Receive.Text = "领用";
-            this.Receive.UseVisualStyleBackColor = true;
-            this.Receive.Click += new System.EventHandler(this.Receive_Click);
+            this.Scrap.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Scrap.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Scrap.Location = new System.Drawing.Point(670, 116);
+            this.Scrap.Name = "Scrap";
+            this.Scrap.Size = new System.Drawing.Size(100, 32);
+            this.Scrap.TabIndex = 141;
+            this.Scrap.Text = "报废";
+            this.Scrap.UseVisualStyleBackColor = true;
+            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
             // 
-            // ma_code
+            // Return
             // 
-            this.ma_code.AllPower = null;
-            this.ma_code.BackColor = System.Drawing.SystemColors.Window;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(108, 23);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(231, 33);
-            this.ma_code.TabIndex = 12;
-            this.ma_code.TableName = null;
-            this.ma_code.TextBoxEnable = true;
+            this.Return.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Return.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Return.Location = new System.Drawing.Point(535, 116);
+            this.Return.Name = "Return";
+            this.Return.Size = new System.Drawing.Size(100, 32);
+            this.Return.TabIndex = 140;
+            this.Return.Text = "归还";
+            this.Return.UseVisualStyleBackColor = true;
+            this.Return.Click += new System.EventHandler(this.Return_Click);
             // 
-            // ma_codeLab
+            // stALab
             // 
-            this.ma_codeLab.AutoSize = true;
-            this.ma_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_codeLab.Location = new System.Drawing.Point(20, 23);
-            this.ma_codeLab.Name = "ma_codeLab";
-            this.ma_codeLab.Size = new System.Drawing.Size(101, 28);
-            this.ma_codeLab.TabIndex = 14;
-            this.ma_codeLab.Text = "归属工单:";
+            this.stALab.AutoSize = true;
+            this.stALab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stALab.Location = new System.Drawing.Point(190, 24);
+            this.stALab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.stALab.Name = "stALab";
+            this.stALab.Size = new System.Drawing.Size(27, 28);
+            this.stALab.TabIndex = 138;
+            this.stALab.Text = "A";
             // 
-            // sideVal
+            // stBLab
             // 
-            this.sideVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sideVal.FormattingEnabled = true;
-            this.sideVal.Items.AddRange(new object[] {
-            "A",
-            "B"});
-            this.sideVal.Location = new System.Drawing.Point(671, 21);
-            this.sideVal.Name = "sideVal";
-            this.sideVal.Size = new System.Drawing.Size(145, 32);
-            this.sideVal.TabIndex = 16;
+            this.stBLab.AutoSize = true;
+            this.stBLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stBLab.Location = new System.Drawing.Point(191, 73);
+            this.stBLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.stBLab.Name = "stBLab";
+            this.stBLab.Size = new System.Drawing.Size(25, 28);
+            this.stBLab.TabIndex = 136;
+            this.stBLab.Text = "B";
             // 
-            // sideLab
+            // stCLab
             // 
-            this.sideLab.AutoSize = true;
-            this.sideLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sideLab.Location = new System.Drawing.Point(616, 24);
-            this.sideLab.Name = "sideLab";
-            this.sideLab.Size = new System.Drawing.Size(75, 28);
-            this.sideLab.TabIndex = 15;
-            this.sideLab.Text = "面别：";
+            this.stCLab.AutoSize = true;
+            this.stCLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stCLab.Location = new System.Drawing.Point(348, 24);
+            this.stCLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.stCLab.Name = "stCLab";
+            this.stCLab.Size = new System.Drawing.Size(26, 28);
+            this.stCLab.TabIndex = 134;
+            this.stCLab.Text = "C";
             // 
-            // li_code
+            // stDLab
             // 
-            this.li_code.AllPower = null;
-            this.li_code.BackColor = System.Drawing.SystemColors.Window;
-            this.li_code.Caller = null;
-            this.li_code.Condition = null;
-            this.li_code.DBTitle = null;
-            this.li_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.li_code.FormName = null;
-            this.li_code.Location = new System.Drawing.Point(473, 23);
-            this.li_code.Margin = new System.Windows.Forms.Padding(4);
-            this.li_code.Name = "li_code";
-            this.li_code.Power = null;
-            this.li_code.ReturnData = null;
-            this.li_code.SelectField = null;
-            this.li_code.SetValueField = null;
-            this.li_code.Size = new System.Drawing.Size(130, 32);
-            this.li_code.TabIndex = 76;
-            this.li_code.TableName = null;
-            this.li_code.TextBoxEnable = false;
+            this.stDLab.AutoSize = true;
+            this.stDLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stDLab.Location = new System.Drawing.Point(348, 69);
+            this.stDLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.stDLab.Name = "stDLab";
+            this.stDLab.Size = new System.Drawing.Size(28, 28);
+            this.stDLab.TabIndex = 132;
+            this.stDLab.Text = "D";
             // 
-            // li_codeLab
+            // stELab
             // 
-            this.li_codeLab.AutoSize = true;
-            this.li_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.li_codeLab.Location = new System.Drawing.Point(422, 23);
-            this.li_codeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.li_codeLab.Name = "li_codeLab";
-            this.li_codeLab.Size = new System.Drawing.Size(59, 28);
-            this.li_codeLab.TabIndex = 75;
-            this.li_codeLab.Text = "线体:";
+            this.stELab.AutoSize = true;
+            this.stELab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stELab.Location = new System.Drawing.Point(485, 24);
+            this.stELab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.stELab.Name = "stELab";
+            this.stELab.Size = new System.Drawing.Size(24, 28);
+            this.stELab.TabIndex = 130;
+            this.stELab.Text = "E";
             // 
-            // empVal
+            // stLab
             // 
-            this.empVal.AllPower = null;
-            this.empVal.BackColor = System.Drawing.SystemColors.Window;
-            this.empVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.empVal.ID = null;
-            this.empVal.Location = new System.Drawing.Point(108, 100);
-            this.empVal.Margin = new System.Windows.Forms.Padding(4);
-            this.empVal.Name = "empVal";
-            this.empVal.Power = null;
-            this.empVal.Size = new System.Drawing.Size(178, 31);
-            this.empVal.Str = null;
-            this.empVal.Str1 = null;
-            this.empVal.Str2 = null;
-            this.empVal.TabIndex = 114;
+            this.stLab.AutoSize = true;
+            this.stLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stLab.Location = new System.Drawing.Point(20, 24);
+            this.stLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.stLab.Name = "stLab";
+            this.stLab.Size = new System.Drawing.Size(174, 28);
+            this.stLab.TabIndex = 129;
+            this.stLab.Text = "张力测试结果(N):";
+            // 
+            // empLab1
+            // 
+            this.empLab1.AutoSize = true;
+            this.empLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.empLab1.Location = new System.Drawing.Point(67, 120);
+            this.empLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.empLab1.Name = "empLab1";
+            this.empLab1.Size = new System.Drawing.Size(101, 28);
+            this.empLab1.TabIndex = 127;
+            this.empLab1.Text = "归还人员:";
+            // 
+            // IsClean
+            // 
+            this.IsClean.AutoSize = true;
+            this.IsClean.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.IsClean.Location = new System.Drawing.Point(365, 117);
+            this.IsClean.Margin = new System.Windows.Forms.Padding(4);
+            this.IsClean.Name = "IsClean";
+            this.IsClean.Size = new System.Drawing.Size(122, 32);
+            this.IsClean.TabIndex = 126;
+            this.IsClean.Text = "是否清洗";
+            this.IsClean.UseVisualStyleBackColor = true;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.ma_code);
+            this.panel1.Controls.Add(this.empVal);
+            this.panel1.Controls.Add(this.empLab);
+            this.panel1.Controls.Add(this.li_code);
+            this.panel1.Controls.Add(this.li_codeLab);
+            this.panel1.Controls.Add(this.sideVal);
+            this.panel1.Controls.Add(this.sideLab);
+            this.panel1.Controls.Add(this.ma_codeLab);
+            this.panel1.Controls.Add(this.Receive);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(3, 3);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(870, 188);
+            this.panel1.TabIndex = 0;
             // 
             // empLab
             // 
@@ -423,18 +413,87 @@
             this.empLab.TabIndex = 113;
             this.empLab.Text = "领用人员:";
             // 
-            // LockMakeCode
+            // li_codeLab
             // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(343, 25);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 115;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
+            this.li_codeLab.AutoSize = true;
+            this.li_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.li_codeLab.Location = new System.Drawing.Point(368, 23);
+            this.li_codeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.li_codeLab.Name = "li_codeLab";
+            this.li_codeLab.Size = new System.Drawing.Size(59, 28);
+            this.li_codeLab.TabIndex = 75;
+            this.li_codeLab.Text = "线体:";
+            // 
+            // sideVal
+            // 
+            this.sideVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sideVal.FormattingEnabled = true;
+            this.sideVal.Items.AddRange(new object[] {
+            "A",
+            "B"});
+            this.sideVal.Location = new System.Drawing.Point(617, 21);
+            this.sideVal.Name = "sideVal";
+            this.sideVal.Size = new System.Drawing.Size(145, 32);
+            this.sideVal.TabIndex = 16;
+            // 
+            // sideLab
+            // 
+            this.sideLab.AutoSize = true;
+            this.sideLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sideLab.Location = new System.Drawing.Point(562, 24);
+            this.sideLab.Name = "sideLab";
+            this.sideLab.Size = new System.Drawing.Size(75, 28);
+            this.sideLab.TabIndex = 15;
+            this.sideLab.Text = "面别：";
+            // 
+            // ma_codeLab
+            // 
+            this.ma_codeLab.AutoSize = true;
+            this.ma_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_codeLab.Location = new System.Drawing.Point(20, 23);
+            this.ma_codeLab.Name = "ma_codeLab";
+            this.ma_codeLab.Size = new System.Drawing.Size(101, 28);
+            this.ma_codeLab.TabIndex = 14;
+            this.ma_codeLab.Text = "归属工单:";
+            // 
+            // Receive
+            // 
+            this.Receive.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Receive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Receive.Location = new System.Drawing.Point(370, 98);
+            this.Receive.Name = "Receive";
+            this.Receive.Size = new System.Drawing.Size(100, 32);
+            this.Receive.TabIndex = 11;
+            this.Receive.Text = "领用";
+            this.Receive.UseVisualStyleBackColor = true;
+            this.Receive.Click += new System.EventHandler(this.Receive_Click);
+            // 
+            // Container
+            // 
+            this.Container.ColumnCount = 2;
+            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
+            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.Container.Controls.Add(this.MsgBox, 1, 0);
+            this.Container.Controls.Add(this.ExeBox, 0, 0);
+            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Container.Location = new System.Drawing.Point(0, 279);
+            this.Container.Name = "Container";
+            this.Container.RowCount = 1;
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 441F));
+            this.Container.Size = new System.Drawing.Size(1280, 441);
+            this.Container.TabIndex = 12;
+            // 
+            // MsgBox
+            // 
+            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.MsgBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.MsgBox.Location = new System.Drawing.Point(900, 4);
+            this.MsgBox.Margin = new System.Windows.Forms.Padding(4);
+            this.MsgBox.Name = "MsgBox";
+            this.MsgBox.Size = new System.Drawing.Size(376, 433);
+            this.MsgBox.TabIndex = 54;
+            this.MsgBox.Text = "";
             // 
             // stA
             // 
@@ -453,17 +512,6 @@
             this.stA.Str2 = null;
             this.stA.TabIndex = 139;
             // 
-            // stALab
-            // 
-            this.stALab.AutoSize = true;
-            this.stALab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stALab.Location = new System.Drawing.Point(190, 24);
-            this.stALab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.stALab.Name = "stALab";
-            this.stALab.Size = new System.Drawing.Size(27, 28);
-            this.stALab.TabIndex = 138;
-            this.stALab.Text = "A";
-            // 
             // stB
             // 
             this.stB.AllPower = null;
@@ -480,17 +528,6 @@
             this.stB.Str2 = null;
             this.stB.TabIndex = 137;
             // 
-            // stBLab
-            // 
-            this.stBLab.AutoSize = true;
-            this.stBLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stBLab.Location = new System.Drawing.Point(191, 73);
-            this.stBLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.stBLab.Name = "stBLab";
-            this.stBLab.Size = new System.Drawing.Size(25, 28);
-            this.stBLab.TabIndex = 136;
-            this.stBLab.Text = "B";
-            // 
             // stC
             // 
             this.stC.AllPower = null;
@@ -508,17 +545,6 @@
             this.stC.Str2 = null;
             this.stC.TabIndex = 135;
             // 
-            // stCLab
-            // 
-            this.stCLab.AutoSize = true;
-            this.stCLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stCLab.Location = new System.Drawing.Point(348, 24);
-            this.stCLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.stCLab.Name = "stCLab";
-            this.stCLab.Size = new System.Drawing.Size(26, 28);
-            this.stCLab.TabIndex = 134;
-            this.stCLab.Text = "C";
-            // 
             // stD
             // 
             this.stD.AllPower = null;
@@ -535,17 +561,6 @@
             this.stD.Str2 = null;
             this.stD.TabIndex = 133;
             // 
-            // stDLab
-            // 
-            this.stDLab.AutoSize = true;
-            this.stDLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stDLab.Location = new System.Drawing.Point(348, 69);
-            this.stDLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.stDLab.Name = "stDLab";
-            this.stDLab.Size = new System.Drawing.Size(28, 28);
-            this.stDLab.TabIndex = 132;
-            this.stDLab.Text = "D";
-            // 
             // stE
             // 
             this.stE.AllPower = null;
@@ -562,28 +577,6 @@
             this.stE.Str2 = null;
             this.stE.TabIndex = 131;
             // 
-            // stELab
-            // 
-            this.stELab.AutoSize = true;
-            this.stELab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stELab.Location = new System.Drawing.Point(485, 24);
-            this.stELab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.stELab.Name = "stELab";
-            this.stELab.Size = new System.Drawing.Size(24, 28);
-            this.stELab.TabIndex = 130;
-            this.stELab.Text = "E";
-            // 
-            // stLab
-            // 
-            this.stLab.AutoSize = true;
-            this.stLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stLab.Location = new System.Drawing.Point(20, 24);
-            this.stLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.stLab.Name = "stLab";
-            this.stLab.Size = new System.Drawing.Size(174, 28);
-            this.stLab.TabIndex = 129;
-            this.stLab.Text = "张力测试结果(N):";
-            // 
             // empVal1
             // 
             this.empVal1.AllPower = null;
@@ -600,71 +593,63 @@
             this.empVal1.Str2 = null;
             this.empVal1.TabIndex = 128;
             // 
-            // empLab1
-            // 
-            this.empLab1.AutoSize = true;
-            this.empLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.empLab1.Location = new System.Drawing.Point(67, 120);
-            this.empLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.empLab1.Name = "empLab1";
-            this.empLab1.Size = new System.Drawing.Size(101, 28);
-            this.empLab1.TabIndex = 127;
-            this.empLab1.Text = "归还人员:";
-            // 
-            // IsClean
-            // 
-            this.IsClean.AutoSize = true;
-            this.IsClean.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.IsClean.Location = new System.Drawing.Point(365, 117);
-            this.IsClean.Margin = new System.Windows.Forms.Padding(4);
-            this.IsClean.Name = "IsClean";
-            this.IsClean.Size = new System.Drawing.Size(122, 32);
-            this.IsClean.TabIndex = 126;
-            this.IsClean.Text = "是否清洗";
-            this.IsClean.UseVisualStyleBackColor = true;
-            // 
-            // Return
-            // 
-            this.Return.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Return.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Return.Location = new System.Drawing.Point(535, 116);
-            this.Return.Name = "Return";
-            this.Return.Size = new System.Drawing.Size(100, 32);
-            this.Return.TabIndex = 140;
-            this.Return.Text = "归还";
-            this.Return.UseVisualStyleBackColor = true;
-            this.Return.Click += new System.EventHandler(this.Return_Click);
-            // 
-            // Scrap
+            // empVal
             // 
-            this.Scrap.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Scrap.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Scrap.Location = new System.Drawing.Point(670, 116);
-            this.Scrap.Name = "Scrap";
-            this.Scrap.Size = new System.Drawing.Size(100, 32);
-            this.Scrap.TabIndex = 141;
-            this.Scrap.Text = "报废";
-            this.Scrap.UseVisualStyleBackColor = true;
-            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
+            this.empVal.AllPower = null;
+            this.empVal.BackColor = System.Drawing.SystemColors.Window;
+            this.empVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.empVal.ID = null;
+            this.empVal.Location = new System.Drawing.Point(108, 100);
+            this.empVal.Margin = new System.Windows.Forms.Padding(4);
+            this.empVal.Name = "empVal";
+            this.empVal.Power = null;
+            this.empVal.Size = new System.Drawing.Size(178, 31);
+            this.empVal.Str = null;
+            this.empVal.Str1 = null;
+            this.empVal.Str2 = null;
+            this.empVal.TabIndex = 114;
             // 
-            // currStatusVal
+            // li_code
             // 
-            this.currStatusVal.Enabled = false;
-            this.currStatusVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.currStatusVal.Location = new System.Drawing.Point(717, 51);
-            this.currStatusVal.Name = "currStatusVal";
-            this.currStatusVal.Size = new System.Drawing.Size(76, 31);
-            this.currStatusVal.TabIndex = 12;
+            this.li_code.AllPower = null;
+            this.li_code.BackColor = System.Drawing.SystemColors.Window;
+            this.li_code.Caller = null;
+            this.li_code.Condition = null;
+            this.li_code.DBTitle = null;
+            this.li_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.li_code.FormName = null;
+            this.li_code.Location = new System.Drawing.Point(419, 23);
+            this.li_code.Margin = new System.Windows.Forms.Padding(4);
+            this.li_code.Name = "li_code";
+            this.li_code.Power = null;
+            this.li_code.ReturnData = null;
+            this.li_code.SelectField = null;
+            this.li_code.SetValueField = null;
+            this.li_code.Size = new System.Drawing.Size(130, 32);
+            this.li_code.TabIndex = 76;
+            this.li_code.TableName = null;
+            this.li_code.TextBoxEnable = false;
             // 
-            // currStatusLab
+            // ma_code
             // 
-            this.currStatusLab.AutoSize = true;
-            this.currStatusLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.currStatusLab.Location = new System.Drawing.Point(641, 53);
-            this.currStatusLab.Name = "currStatusLab";
-            this.currStatusLab.Size = new System.Drawing.Size(117, 28);
-            this.currStatusLab.TabIndex = 11;
-            this.currStatusLab.Text = "当前状态：";
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(108, 24);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(227, 32);
+            this.ma_code.TabIndex = 115;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
             // 
             // Make_ToolingManager
             // 
@@ -682,12 +667,12 @@
             this.TopBox.PerformLayout();
             this.ExeBox.ResumeLayout(false);
             this.ExePage1.ResumeLayout(false);
-            this.Container.ResumeLayout(false);
             this.Page1Box.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.Container.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -711,7 +696,6 @@
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Button Receive;
-        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private System.Windows.Forms.Label ma_codeLab;
         private System.Windows.Forms.ComboBox sideVal;
         private System.Windows.Forms.Label sideLab;
@@ -719,7 +703,6 @@
         private System.Windows.Forms.Label li_codeLab;
         private CustomControl.TextBoxWithIcon.EnterTextBox empVal;
         private System.Windows.Forms.Label empLab;
-        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox stA;
         private System.Windows.Forms.Label stALab;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox stB;
@@ -738,5 +721,6 @@
         private System.Windows.Forms.Button Scrap;
         private System.Windows.Forms.TextBox currStatusVal;
         private System.Windows.Forms.Label currStatusLab;
+        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
     }
 }

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.cs

@@ -14,7 +14,6 @@ using UAS_MES_NEW.CustomControl.RichText;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace UAS_MES_NEW.Make
 {
@@ -26,7 +25,6 @@ namespace UAS_MES_NEW.Make
         }
         DataHelper dh;
         DataTable Dbfind;
-        LogStringBuilder sql = new LogStringBuilder();
 
         DataTable dt;
 
@@ -35,13 +33,11 @@ namespace UAS_MES_NEW.Make
             dh = SystemInf.dh;
 
             li_code.Text = User.UserLineCode;
-            //工单号放大镜配置
-            LockMakeCode.GetMakeCodeCtl(ma_code);
-            ma_code.SetLockCheckBox(LockMakeCode);
+
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_detail # 产品名称,ma_softversion # 软件版本,ma_salecode # 销售单号,pr_sendchecktype # 产品送检方式";
             ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_softversion", "ma_salecode", "nvl(pr_sendchecktype,'LineCode')pr_sendchecktype" };
+            ma_code.SetValueField = new string[] { "ma_code" };
             ma_code.DbChange += Ma_code_DbChange;
 
             li_code.TableName = "Line";