优化

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.Designer.cs

@@ -46,16 +46,25 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.Scrap = new System.Windows.Forms.Button();
             this.Return = new System.Windows.Forms.Button();
+            this.stA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             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.panel1 = new System.Windows.Forms.Panel();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.empVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.empLab = new System.Windows.Forms.Label();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.li_codeLab = new System.Windows.Forms.Label();
             this.sideVal = new System.Windows.Forms.ComboBox();
             this.sideLab = new System.Windows.Forms.Label();
@@ -63,15 +72,8 @@
             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.useCountVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.useCountLab = new System.Windows.Forms.Label();
             this.TopBox.SuspendLayout();
             this.ExeBox.SuspendLayout();
             this.ExePage1.SuspendLayout();
@@ -250,6 +252,8 @@
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.useCountVal);
+            this.panel2.Controls.Add(this.useCountLab);
             this.panel2.Controls.Add(this.Scrap);
             this.panel2.Controls.Add(this.Return);
             this.panel2.Controls.Add(this.stA);
@@ -276,7 +280,7 @@
             // 
             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.Location = new System.Drawing.Point(751, 116);
             this.Scrap.Name = "Scrap";
             this.Scrap.Size = new System.Drawing.Size(100, 32);
             this.Scrap.TabIndex = 141;
@@ -288,7 +292,7 @@
             // 
             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.Location = new System.Drawing.Point(645, 117);
             this.Return.Name = "Return";
             this.Return.Size = new System.Drawing.Size(100, 32);
             this.Return.TabIndex = 140;
@@ -296,6 +300,23 @@
             this.Return.UseVisualStyleBackColor = true;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 
+            // stA
+            // 
+            this.stA.AllPower = null;
+            this.stA.BackColor = System.Drawing.Color.White;
+            this.stA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stA.ID = null;
+            this.stA.Location = new System.Drawing.Point(225, 21);
+            this.stA.Margin = new System.Windows.Forms.Padding(4);
+            this.stA.Name = "stA";
+            this.stA.Negative = false;
+            this.stA.Power = null;
+            this.stA.Size = new System.Drawing.Size(80, 31);
+            this.stA.Str = null;
+            this.stA.Str1 = null;
+            this.stA.Str2 = null;
+            this.stA.TabIndex = 139;
+            // 
             // stALab
             // 
             this.stALab.AutoSize = true;
@@ -307,6 +328,22 @@
             this.stALab.TabIndex = 138;
             this.stALab.Text = "A";
             // 
+            // stB
+            // 
+            this.stB.AllPower = null;
+            this.stB.BackColor = System.Drawing.Color.White;
+            this.stB.ID = null;
+            this.stB.Location = new System.Drawing.Point(224, 66);
+            this.stB.Margin = new System.Windows.Forms.Padding(4);
+            this.stB.Name = "stB";
+            this.stB.Negative = false;
+            this.stB.Power = null;
+            this.stB.Size = new System.Drawing.Size(80, 35);
+            this.stB.Str = null;
+            this.stB.Str1 = null;
+            this.stB.Str2 = null;
+            this.stB.TabIndex = 137;
+            // 
             // stBLab
             // 
             this.stBLab.AutoSize = true;
@@ -318,6 +355,23 @@
             this.stBLab.TabIndex = 136;
             this.stBLab.Text = "B";
             // 
+            // stC
+            // 
+            this.stC.AllPower = null;
+            this.stC.BackColor = System.Drawing.Color.White;
+            this.stC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stC.ID = null;
+            this.stC.Location = new System.Drawing.Point(373, 21);
+            this.stC.Margin = new System.Windows.Forms.Padding(4);
+            this.stC.Name = "stC";
+            this.stC.Negative = false;
+            this.stC.Power = null;
+            this.stC.Size = new System.Drawing.Size(80, 31);
+            this.stC.Str = null;
+            this.stC.Str1 = null;
+            this.stC.Str2 = null;
+            this.stC.TabIndex = 135;
+            // 
             // stCLab
             // 
             this.stCLab.AutoSize = true;
@@ -329,6 +383,22 @@
             this.stCLab.TabIndex = 134;
             this.stCLab.Text = "C";
             // 
+            // stD
+            // 
+            this.stD.AllPower = null;
+            this.stD.BackColor = System.Drawing.Color.White;
+            this.stD.ID = null;
+            this.stD.Location = new System.Drawing.Point(373, 66);
+            this.stD.Margin = new System.Windows.Forms.Padding(4);
+            this.stD.Name = "stD";
+            this.stD.Negative = false;
+            this.stD.Power = null;
+            this.stD.Size = new System.Drawing.Size(80, 35);
+            this.stD.Str = null;
+            this.stD.Str1 = null;
+            this.stD.Str2 = null;
+            this.stD.TabIndex = 133;
+            // 
             // stDLab
             // 
             this.stDLab.AutoSize = true;
@@ -340,6 +410,22 @@
             this.stDLab.TabIndex = 132;
             this.stDLab.Text = "D";
             // 
+            // stE
+            // 
+            this.stE.AllPower = null;
+            this.stE.BackColor = System.Drawing.Color.White;
+            this.stE.ID = null;
+            this.stE.Location = new System.Drawing.Point(517, 21);
+            this.stE.Margin = new System.Windows.Forms.Padding(4);
+            this.stE.Name = "stE";
+            this.stE.Negative = false;
+            this.stE.Power = null;
+            this.stE.Size = new System.Drawing.Size(80, 35);
+            this.stE.Str = null;
+            this.stE.Str1 = null;
+            this.stE.Str2 = null;
+            this.stE.TabIndex = 131;
+            // 
             // stELab
             // 
             this.stELab.AutoSize = true;
@@ -362,11 +448,27 @@
             this.stLab.TabIndex = 129;
             this.stLab.Text = "张力测试结果(N):";
             // 
+            // empVal1
+            // 
+            this.empVal1.AllPower = null;
+            this.empVal1.BackColor = System.Drawing.Color.White;
+            this.empVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.empVal1.ID = null;
+            this.empVal1.Location = new System.Drawing.Point(157, 117);
+            this.empVal1.Margin = new System.Windows.Forms.Padding(4);
+            this.empVal1.Name = "empVal1";
+            this.empVal1.Power = null;
+            this.empVal1.Size = new System.Drawing.Size(178, 31);
+            this.empVal1.Str = null;
+            this.empVal1.Str1 = null;
+            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.Location = new System.Drawing.Point(67, 118);
             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);
@@ -377,7 +479,7 @@
             // 
             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.Location = new System.Drawing.Point(522, 117);
             this.IsClean.Margin = new System.Windows.Forms.Padding(4);
             this.IsClean.Name = "IsClean";
             this.IsClean.Size = new System.Drawing.Size(122, 32);
@@ -402,6 +504,43 @@
             this.panel1.Size = new System.Drawing.Size(870, 188);
             this.panel1.TabIndex = 0;
             // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.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;
+            // 
+            // empVal
+            // 
+            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;
+            // 
             // empLab
             // 
             this.empLab.AutoSize = true;
@@ -413,6 +552,27 @@
             this.empLab.TabIndex = 113;
             this.empLab.Text = "领用人员:";
             // 
+            // li_code
+            // 
+            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;
+            // 
             // li_codeLab
             // 
             this.li_codeLab.AutoSize = true;
@@ -460,7 +620,7 @@
             // 
             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.Location = new System.Drawing.Point(373, 98);
             this.Receive.Name = "Receive";
             this.Receive.Size = new System.Drawing.Size(100, 32);
             this.Receive.TabIndex = 11;
@@ -495,161 +655,32 @@
             this.MsgBox.TabIndex = 54;
             this.MsgBox.Text = "";
             // 
-            // stA
-            // 
-            this.stA.AllPower = null;
-            this.stA.BackColor = System.Drawing.Color.White;
-            this.stA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stA.ID = null;
-            this.stA.Location = new System.Drawing.Point(225, 21);
-            this.stA.Margin = new System.Windows.Forms.Padding(4);
-            this.stA.Name = "stA";
-            this.stA.Negative = false;
-            this.stA.Power = null;
-            this.stA.Size = new System.Drawing.Size(80, 31);
-            this.stA.Str = null;
-            this.stA.Str1 = null;
-            this.stA.Str2 = null;
-            this.stA.TabIndex = 139;
-            // 
-            // stB
-            // 
-            this.stB.AllPower = null;
-            this.stB.BackColor = System.Drawing.Color.White;
-            this.stB.ID = null;
-            this.stB.Location = new System.Drawing.Point(224, 66);
-            this.stB.Margin = new System.Windows.Forms.Padding(4);
-            this.stB.Name = "stB";
-            this.stB.Negative = false;
-            this.stB.Power = null;
-            this.stB.Size = new System.Drawing.Size(80, 35);
-            this.stB.Str = null;
-            this.stB.Str1 = null;
-            this.stB.Str2 = null;
-            this.stB.TabIndex = 137;
-            // 
-            // stC
-            // 
-            this.stC.AllPower = null;
-            this.stC.BackColor = System.Drawing.Color.White;
-            this.stC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stC.ID = null;
-            this.stC.Location = new System.Drawing.Point(373, 21);
-            this.stC.Margin = new System.Windows.Forms.Padding(4);
-            this.stC.Name = "stC";
-            this.stC.Negative = false;
-            this.stC.Power = null;
-            this.stC.Size = new System.Drawing.Size(80, 31);
-            this.stC.Str = null;
-            this.stC.Str1 = null;
-            this.stC.Str2 = null;
-            this.stC.TabIndex = 135;
-            // 
-            // stD
-            // 
-            this.stD.AllPower = null;
-            this.stD.BackColor = System.Drawing.Color.White;
-            this.stD.ID = null;
-            this.stD.Location = new System.Drawing.Point(373, 66);
-            this.stD.Margin = new System.Windows.Forms.Padding(4);
-            this.stD.Name = "stD";
-            this.stD.Negative = false;
-            this.stD.Power = null;
-            this.stD.Size = new System.Drawing.Size(80, 35);
-            this.stD.Str = null;
-            this.stD.Str1 = null;
-            this.stD.Str2 = null;
-            this.stD.TabIndex = 133;
-            // 
-            // stE
-            // 
-            this.stE.AllPower = null;
-            this.stE.BackColor = System.Drawing.Color.White;
-            this.stE.ID = null;
-            this.stE.Location = new System.Drawing.Point(517, 21);
-            this.stE.Margin = new System.Windows.Forms.Padding(4);
-            this.stE.Name = "stE";
-            this.stE.Negative = false;
-            this.stE.Power = null;
-            this.stE.Size = new System.Drawing.Size(80, 35);
-            this.stE.Str = null;
-            this.stE.Str1 = null;
-            this.stE.Str2 = null;
-            this.stE.TabIndex = 131;
-            // 
-            // empVal1
-            // 
-            this.empVal1.AllPower = null;
-            this.empVal1.BackColor = System.Drawing.Color.White;
-            this.empVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.empVal1.ID = null;
-            this.empVal1.Location = new System.Drawing.Point(157, 119);
-            this.empVal1.Margin = new System.Windows.Forms.Padding(4);
-            this.empVal1.Name = "empVal1";
-            this.empVal1.Power = null;
-            this.empVal1.Size = new System.Drawing.Size(178, 31);
-            this.empVal1.Str = null;
-            this.empVal1.Str1 = null;
-            this.empVal1.Str2 = null;
-            this.empVal1.TabIndex = 128;
-            // 
-            // empVal
-            // 
-            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;
-            // 
-            // li_code
-            // 
-            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;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.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;
+            // useCountVal
+            // 
+            this.useCountVal.AllPower = null;
+            this.useCountVal.BackColor = System.Drawing.Color.White;
+            this.useCountVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.useCountVal.ID = null;
+            this.useCountVal.Location = new System.Drawing.Point(438, 117);
+            this.useCountVal.Margin = new System.Windows.Forms.Padding(4);
+            this.useCountVal.Name = "useCountVal";
+            this.useCountVal.Power = null;
+            this.useCountVal.Size = new System.Drawing.Size(72, 31);
+            this.useCountVal.Str = null;
+            this.useCountVal.Str1 = null;
+            this.useCountVal.Str2 = null;
+            this.useCountVal.TabIndex = 143;
+            // 
+            // useCountLab
+            // 
+            this.useCountLab.AutoSize = true;
+            this.useCountLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.useCountLab.Location = new System.Drawing.Point(348, 118);
+            this.useCountLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.useCountLab.Name = "useCountLab";
+            this.useCountLab.Size = new System.Drawing.Size(101, 28);
+            this.useCountLab.TabIndex = 142;
+            this.useCountLab.Text = "使用次数:";
             // 
             // Make_ToolingManager
             // 
@@ -722,5 +753,7 @@
         private System.Windows.Forms.TextBox currStatusVal;
         private System.Windows.Forms.Label currStatusLab;
         private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox useCountVal;
+        private System.Windows.Forms.Label useCountLab;
     }
 }

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.cs

@@ -222,6 +222,9 @@ namespace UAS_MES_NEW.Make
                 if (result == DialogResult.No) return;
             }
 
+            dt = (DataTable)dh.ExecuteSql($"select ma_prodcode from make where ma_code='{ma_code.Text}'", "select");
+            string ma_prodcode = dt.Rows[0]["ma_prodcode"].ToString();
+
             dt = (DataTable)dh.ExecuteSql($"select st_code from stencil where st_line='{li_code.Text}' and st_kind = '{typeVal.Text}'", "select");
             if(typeVal.Text == "钢网")
             {
@@ -230,23 +233,46 @@ namespace UAS_MES_NEW.Make
                     ShowMsg(MsgBox, 0, $"NG,线体已有在线{typeVal.Text},编号为:{dt.Rows[0]["st_code"].ToString()}");
                     return;
                 }
-            }else if (typeVal.Text == "刮刀")
+
+                dt = (DataTable)dh.ExecuteSql($@"SELECT su_ensiona, su_ensionb, su_ensionc, su_ensiond, su_ensione FROM 
+                    (SELECT * FROM stenciluse WHERE su_stcode = '{toolingVal.Text.Trim()}' AND su_status = '归还' ORDER BY su_usedate DESC) WHERE ROWNUM = 1", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
+                        su_usemacode,su_useprodcode,su_linecode,su_table,su_useman,su_usedate,su_status,
+                        su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione)
+                        SELECT stenciluse_seq.NEXTVAL,'{toolingVal.Text.Trim()}',st_id,
+                        '{ma_code.Text}','{ma_prodcode}','{li_code.Text}','{sideVal.Text}','{empVal.Text}',sysdate, '领用',
+                        '{dt.Rows[0]["su_ensiona"].ToString()}','{dt.Rows[0]["su_ensionb"].ToString()}','{dt.Rows[0]["su_ensionc"].ToString()}',
+                        '{dt.Rows[0]["su_ensiond"].ToString()}','{dt.Rows[0]["su_ensione"].ToString()}'
+                        FROM stencil WHERE st_code = '{toolingVal.Text.Trim()}'", "insert");
+                }
+                else
+                {
+                    dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
+                        su_usemacode,su_useprodcode,su_linecode,su_table,su_useman,su_usedate,su_status)
+                        SELECT stenciluse_seq.NEXTVAL,'{toolingVal.Text.Trim()}',st_id,
+                        '{ma_code.Text}','{ma_prodcode}','{li_code.Text}','{sideVal.Text}','{empVal.Text}',sysdate, '领用'
+                        FROM stencil WHERE st_code = '{toolingVal.Text.Trim()}'", "insert");
+                }
+
+            }
+            else if (typeVal.Text == "刮刀")
             {
                 if (dt.Rows.Count > 1)
                 {
                     ShowMsg(MsgBox, 0, $"NG,线体已有在线{typeVal.Text},编号为:{dt.Rows[0]["st_code"].ToString()}");
                     return;
                 }
-            }
 
+                dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
+                    su_usemacode,su_useprodcode,su_linecode,su_table,su_useman,su_usedate,su_status)
+                    SELECT stenciluse_seq.NEXTVAL,'{toolingVal.Text.Trim()}',st_id,
+                    '{ma_code.Text}','{ma_prodcode}','{li_code.Text}','{sideVal.Text}','{empVal.Text}',sysdate, '领用'
+                    FROM stencil WHERE st_code = '{toolingVal.Text.Trim()}'", "insert");
+            }
             dh.ExecuteSql("update stencil set st_usestatus= '出库' where st_code='" + toolingVal.Text + "'", "update");
 
-            dt = (DataTable)dh.ExecuteSql($"select ma_prodcode from make where ma_code='{ma_code.Text}'", "select");
-            dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
-                su_usemacode,su_useprodcode,su_linecode,su_table,su_useman,su_usedate,su_status)
-                SELECT stenciluse_seq.NEXTVAL,'{toolingVal.Text.Trim()}',st_id,
-                '{ma_code.Text}','{dt.Rows[0]["ma_prodcode"].ToString()}','{li_code.Text}','{sideVal.Text}','{empVal.Text}',sysdate, '领用'
-                FROM stencil WHERE st_code = '{toolingVal.Text.Trim()}'", "insert");
 
             ma_code.Text = "";
             sideVal.SelectedIndex = -1;
@@ -280,14 +306,14 @@ namespace UAS_MES_NEW.Make
                     dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,
                         st_ensiona = '{stA.Text.Trim()}',st_ensionb = '{stB.Text.Trim()}',
                         st_ensionc = '{stC.Text.Trim()}',st_ensiond = '{stD.Text.Trim()}',st_ensione = '{stE.Text.Trim()}',
-                        st_usecount = '',st_usestatus = '在库' 
+                        st_usecount = nvl(st_usecount,0) + {Convert.ToInt32(useCountVal.Text.Trim())},st_usestatus = '在库' 
                         WHERE st_code = '{toolingVal.Text.Trim()}'", "update");
                 }
                 else
                 {
                     dh.ExecuteSql($@"UPDATE stencil SET st_ensiona = '{stA.Text.Trim()}',st_ensionb = '{stB.Text.Trim()}',
                         st_ensionc = '{stC.Text.Trim()}',st_ensiond = '{stD.Text.Trim()}',st_ensione = '{stE.Text.Trim()}',
-                        st_usecount = '',st_usestatus = '在库'
+                        st_usecount = nvl(st_usecount,0) + {Convert.ToInt32(useCountVal.Text.Trim())},st_usestatus = '在库'
                         WHERE st_code = '{toolingVal.Text.Trim()}'", "update");
                 }
                 dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
@@ -305,7 +331,7 @@ namespace UAS_MES_NEW.Make
             {
                 if (IsClean.Checked)
                 {
-                    dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_usecount = '',
+                    dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_usecount = '{useCountVal.Text.Trim()}',
                         st_usestatus = '在库' WHERE st_code = '{toolingVal.Text.Trim()}'", "update");
                 }
                 else