yhluo 12 цаг өмнө
parent
commit
d9726b4206

+ 284 - 183
UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.Designer.cs

@@ -44,36 +44,42 @@
             this.ExePage1 = new System.Windows.Forms.TabPage();
             this.Page1Box = new System.Windows.Forms.TableLayoutPanel();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.useCountVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.useCountLab = new System.Windows.Forms.Label();
             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();
             this.ma_codeLab = new System.Windows.Forms.Label();
             this.Receive = new System.Windows.Forms.Button();
             this.Container = new System.Windows.Forms.TableLayoutPanel();
+            this.gapLab1 = new System.Windows.Forms.Label();
+            this.gapLab2 = new System.Windows.Forms.Label();
+            this.gapLab3 = new System.Windows.Forms.Label();
             this.MsgBox = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.useCountVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            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.gapVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.gapVal2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.gapVal3 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.empVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.TopBox.SuspendLayout();
             this.ExeBox.SuspendLayout();
             this.ExePage1.SuspendLayout();
@@ -277,22 +283,6 @@
             this.panel2.Size = new System.Drawing.Size(870, 188);
             this.panel2.TabIndex = 1;
             // 
-            // 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 = 156;
-            // 
             // useCountLab
             // 
             this.useCountLab.AutoSize = true;
@@ -328,23 +318,6 @@
             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 = 150;
-            // 
             // stALab
             // 
             this.stALab.AutoSize = true;
@@ -356,22 +329,6 @@
             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 = 153;
-            // 
             // stBLab
             // 
             this.stBLab.AutoSize = true;
@@ -383,23 +340,6 @@
             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 = 151;
-            // 
             // stCLab
             // 
             this.stCLab.AutoSize = true;
@@ -411,22 +351,6 @@
             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 = 154;
-            // 
             // stDLab
             // 
             this.stDLab.AutoSize = true;
@@ -438,22 +362,6 @@
             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 = 152;
-            // 
             // stELab
             // 
             this.stELab.AutoSize = true;
@@ -476,22 +384,6 @@
             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 = 155;
-            // 
             // empLab1
             // 
             this.empLab1.AutoSize = true;
@@ -517,6 +409,12 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.gapVal1);
+            this.panel1.Controls.Add(this.gapLab1);
+            this.panel1.Controls.Add(this.gapVal2);
+            this.panel1.Controls.Add(this.gapLab2);
+            this.panel1.Controls.Add(this.gapVal3);
+            this.panel1.Controls.Add(this.gapLab3);
             this.panel1.Controls.Add(this.ma_code);
             this.panel1.Controls.Add(this.empVal);
             this.panel1.Controls.Add(this.empLab);
@@ -532,43 +430,6 @@
             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;
@@ -580,27 +441,6 @@
             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;
@@ -648,7 +488,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(373, 98);
+            this.Receive.Location = new System.Drawing.Point(729, 146);
             this.Receive.Name = "Receive";
             this.Receive.Size = new System.Drawing.Size(100, 32);
             this.Receive.TabIndex = 11;
@@ -672,6 +512,39 @@
             this.Container.Size = new System.Drawing.Size(1280, 441);
             this.Container.TabIndex = 12;
             // 
+            // gapLab1
+            // 
+            this.gapLab1.AutoSize = true;
+            this.gapLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapLab1.Location = new System.Drawing.Point(301, 102);
+            this.gapLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.gapLab1.Name = "gapLab1";
+            this.gapLab1.Size = new System.Drawing.Size(96, 28);
+            this.gapLab1.TabIndex = 155;
+            this.gapLab1.Text = "间隙范围";
+            // 
+            // gapLab2
+            // 
+            this.gapLab2.AutoSize = true;
+            this.gapLab2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapLab2.Location = new System.Drawing.Point(453, 102);
+            this.gapLab2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.gapLab2.Name = "gapLab2";
+            this.gapLab2.Size = new System.Drawing.Size(96, 28);
+            this.gapLab2.TabIndex = 154;
+            this.gapLab2.Text = "最大间隙";
+            // 
+            // gapLab3
+            // 
+            this.gapLab3.AutoSize = true;
+            this.gapLab3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapLab3.Location = new System.Drawing.Point(613, 102);
+            this.gapLab3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.gapLab3.Name = "gapLab3";
+            this.gapLab3.Size = new System.Drawing.Size(96, 28);
+            this.gapLab3.TabIndex = 153;
+            this.gapLab3.Text = "最小间隙";
+            // 
             // MsgBox
             // 
             this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -683,6 +556,228 @@
             this.MsgBox.TabIndex = 54;
             this.MsgBox.Text = "";
             // 
+            // 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 = 156;
+            // 
+            // 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 = 150;
+            // 
+            // 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 = 153;
+            // 
+            // 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 = 151;
+            // 
+            // 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 = 154;
+            // 
+            // 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 = 152;
+            // 
+            // 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 = 155;
+            // 
+            // gapVal1
+            // 
+            this.gapVal1.AllPower = null;
+            this.gapVal1.BackColor = System.Drawing.Color.White;
+            this.gapVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapVal1.ID = null;
+            this.gapVal1.Location = new System.Drawing.Point(370, 100);
+            this.gapVal1.Margin = new System.Windows.Forms.Padding(4);
+            this.gapVal1.Name = "gapVal1";
+            this.gapVal1.Negative = false;
+            this.gapVal1.Power = null;
+            this.gapVal1.Size = new System.Drawing.Size(69, 31);
+            this.gapVal1.Str = null;
+            this.gapVal1.Str1 = null;
+            this.gapVal1.Str2 = null;
+            this.gapVal1.TabIndex = 156;
+            // 
+            // gapVal2
+            // 
+            this.gapVal2.AllPower = null;
+            this.gapVal2.BackColor = System.Drawing.Color.White;
+            this.gapVal2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapVal2.ID = null;
+            this.gapVal2.Location = new System.Drawing.Point(523, 100);
+            this.gapVal2.Margin = new System.Windows.Forms.Padding(4);
+            this.gapVal2.Name = "gapVal2";
+            this.gapVal2.Negative = false;
+            this.gapVal2.Power = null;
+            this.gapVal2.Size = new System.Drawing.Size(73, 31);
+            this.gapVal2.Str = null;
+            this.gapVal2.Str1 = null;
+            this.gapVal2.Str2 = null;
+            this.gapVal2.TabIndex = 157;
+            // 
+            // gapVal3
+            // 
+            this.gapVal3.AllPower = null;
+            this.gapVal3.BackColor = System.Drawing.Color.White;
+            this.gapVal3.ID = null;
+            this.gapVal3.Location = new System.Drawing.Point(681, 100);
+            this.gapVal3.Margin = new System.Windows.Forms.Padding(4);
+            this.gapVal3.Name = "gapVal3";
+            this.gapVal3.Negative = false;
+            this.gapVal3.Power = null;
+            this.gapVal3.Size = new System.Drawing.Size(80, 35);
+            this.gapVal3.Str = null;
+            this.gapVal3.Str1 = null;
+            this.gapVal3.Str2 = null;
+            this.gapVal3.TabIndex = 158;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
             // Make_ToolingManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
@@ -756,5 +851,11 @@
         private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
         private CustomControl.TextBoxWithIcon.EnterTextBox useCountVal;
         private System.Windows.Forms.Label useCountLab;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox gapVal1;
+        private System.Windows.Forms.Label gapLab1;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox gapVal2;
+        private System.Windows.Forms.Label gapLab2;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox gapVal3;
+        private System.Windows.Forms.Label gapLab3;
     }
 }

+ 26 - 2
UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.cs

@@ -105,6 +105,13 @@ namespace UAS_MES_NEW.Make
                 stC.Enabled = true;
                 stD.Enabled = true;
                 stE.Enabled = true;
+
+                gapVal1.Visible = false;
+                gapLab1.Visible = false;
+                gapVal2.Visible = false;
+                gapLab2.Visible = false;
+                gapVal3.Visible = false;
+                gapLab3.Visible = false;
             }
             else
             {
@@ -113,6 +120,13 @@ namespace UAS_MES_NEW.Make
                 stC.Enabled = false;
                 stD.Enabled = false;
                 stE.Enabled = false;
+
+                gapVal1.Visible = true;
+                gapLab1.Visible = true;
+                gapVal2.Visible = true;
+                gapLab2.Visible = true;
+                gapVal3.Visible = true;
+                gapLab3.Visible = true;
             }
 
             dt = (DataTable)dh.ExecuteSql($"select su_status,su_usedate from (select su_status,su_usedate from stenciluse where su_stcode = '{toolingVal.Text.Trim()}' order by su_usedate desc) where rownum=1", "select");
@@ -271,11 +285,21 @@ namespace UAS_MES_NEW.Make
                     return;
                 }
 
-                dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
+                dt = (DataTable)dh.ExecuteSql("select stenciluse_seq.NEXTVAL seq from dual", "select");
+                if(dt.Rows.Count > 1)
+                {
+                    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,
+                    SELECT '{dt.Rows[0]["seq"].ToString()}','{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");
+
+                    if(!string.IsNullOrEmpty(gapVal1.Text) && !string.IsNullOrEmpty(gapVal2.Text)&& !string.IsNullOrEmpty(gapVal3.Text))
+                    {
+                        dh.ExecuteSql($@"INSERT INTO steptestdetail( std_id, std_subclass1, std_subclass2, std_value9, std_value10, std_value11) 
+                            VALUES ( steptestdetail_seq.NEXTVAL, '{dt.Rows[0]["seq"].ToString()}', '刮刀', '{gapVal1.Text}', '{gapVal2.Text}', '{gapVal3.Text}' )", "insert");
+                    }
+                }
             }
             dh.ExecuteSql($@"update stencil set st_usestatus= '出库',st_line = '{li_code.Text}',st_macode = '{ma_code.Text}',
                 st_useofproduct = '{ma_prodcode}' where st_code='" + toolingVal.Text + "'", "update");