Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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

@@ -38,12 +38,6 @@
             this.st_table_label = new System.Windows.Forms.Label();
             this.SU_DEVCODE1_label = new System.Windows.Forms.Label();
             this.st_combinenumber_label = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.ST_ENSIONE_label = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.ST_ENSIONC_label = new System.Windows.Forms.Label();
-            this.ST_ENSIONB_label = new System.Windows.Forms.Label();
-            this.ST_ENSIONA_label = new System.Windows.Forms.Label();
             this.ma_qty_label = new System.Windows.Forms.Label();
             this.ma_qty = new System.Windows.Forms.Label();
             this.su_singlepringqty1_label = new System.Windows.Forms.Label();
@@ -52,12 +46,6 @@
             this.st_table = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.Receive = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Return = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Scrap = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ST_ENSIONA = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ST_ENSIONB = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ST_ENSIONC = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ST_ENSIOND = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ST_ENSIONE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.st_combinenumber = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SU_DEVCODE1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SU_DEVCODE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -101,7 +89,7 @@
             // 
             this.li_code_label.AutoSize = true;
             this.li_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.li_code_label.Location = new System.Drawing.Point(602, 430);
+            this.li_code_label.Location = new System.Drawing.Point(605, 494);
             this.li_code_label.Name = "li_code_label";
             this.li_code_label.Size = new System.Drawing.Size(74, 21);
             this.li_code_label.TabIndex = 73;
@@ -111,7 +99,7 @@
             // 
             this.RadioReceive.AutoSize = true;
             this.RadioReceive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.RadioReceive.Location = new System.Drawing.Point(3, 430);
+            this.RadioReceive.Location = new System.Drawing.Point(6, 494);
             this.RadioReceive.Name = "RadioReceive";
             this.RadioReceive.Size = new System.Drawing.Size(55, 24);
             this.RadioReceive.TabIndex = 77;
@@ -124,7 +112,7 @@
             // 
             this.RadioReturn.AutoSize = true;
             this.RadioReturn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.RadioReturn.Location = new System.Drawing.Point(3, 457);
+            this.RadioReturn.Location = new System.Drawing.Point(6, 521);
             this.RadioReturn.Name = "RadioReturn";
             this.RadioReturn.Size = new System.Drawing.Size(55, 24);
             this.RadioReturn.TabIndex = 78;
@@ -137,7 +125,7 @@
             // 
             this.SU_DEVCODE_label.AutoSize = true;
             this.SU_DEVCODE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_DEVCODE_label.Location = new System.Drawing.Point(56, 430);
+            this.SU_DEVCODE_label.Location = new System.Drawing.Point(59, 494);
             this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
             this.SU_DEVCODE_label.Size = new System.Drawing.Size(74, 21);
             this.SU_DEVCODE_label.TabIndex = 81;
@@ -147,7 +135,7 @@
             // 
             this.st_table_label.AutoSize = true;
             this.st_table_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_table_label.Location = new System.Drawing.Point(263, 430);
+            this.st_table_label.Location = new System.Drawing.Point(266, 494);
             this.st_table_label.Name = "st_table_label";
             this.st_table_label.Size = new System.Drawing.Size(51, 21);
             this.st_table_label.TabIndex = 83;
@@ -157,7 +145,7 @@
             // 
             this.SU_DEVCODE1_label.AutoSize = true;
             this.SU_DEVCODE1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(56, 460);
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(59, 524);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
             this.SU_DEVCODE1_label.Size = new System.Drawing.Size(74, 21);
             this.SU_DEVCODE1_label.TabIndex = 87;
@@ -167,72 +155,12 @@
             // 
             this.st_combinenumber_label.AutoSize = true;
             this.st_combinenumber_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_combinenumber_label.Location = new System.Drawing.Point(263, 460);
+            this.st_combinenumber_label.Location = new System.Drawing.Point(266, 524);
             this.st_combinenumber_label.Name = "st_combinenumber_label";
             this.st_combinenumber_label.Size = new System.Drawing.Size(90, 21);
             this.st_combinenumber_label.TabIndex = 89;
             this.st_combinenumber_label.Text = "加工小板数";
             // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(2, 493);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(129, 21);
-            this.label7.TabIndex = 91;
-            this.label7.Text = "张力测试结果(N)";
-            // 
-            // ST_ENSIONE_label
-            // 
-            this.ST_ENSIONE_label.AutoSize = true;
-            this.ST_ENSIONE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONE_label.Location = new System.Drawing.Point(299, 520);
-            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
-            this.ST_ENSIONE_label.Size = new System.Drawing.Size(19, 21);
-            this.ST_ENSIONE_label.TabIndex = 92;
-            this.ST_ENSIONE_label.Text = "E";
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(133, 520);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(22, 21);
-            this.label9.TabIndex = 94;
-            this.label9.Text = "D";
-            // 
-            // ST_ENSIONC_label
-            // 
-            this.ST_ENSIONC_label.AutoSize = true;
-            this.ST_ENSIONC_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONC_label.Location = new System.Drawing.Point(462, 493);
-            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
-            this.ST_ENSIONC_label.Size = new System.Drawing.Size(21, 21);
-            this.ST_ENSIONC_label.TabIndex = 96;
-            this.ST_ENSIONC_label.Text = "C";
-            // 
-            // ST_ENSIONB_label
-            // 
-            this.ST_ENSIONB_label.AutoSize = true;
-            this.ST_ENSIONB_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONB_label.Location = new System.Drawing.Point(298, 493);
-            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
-            this.ST_ENSIONB_label.Size = new System.Drawing.Size(20, 21);
-            this.ST_ENSIONB_label.TabIndex = 98;
-            this.ST_ENSIONB_label.Text = "B";
-            // 
-            // ST_ENSIONA_label
-            // 
-            this.ST_ENSIONA_label.AutoSize = true;
-            this.ST_ENSIONA_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONA_label.Location = new System.Drawing.Point(133, 493);
-            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
-            this.ST_ENSIONA_label.Size = new System.Drawing.Size(21, 21);
-            this.ST_ENSIONA_label.TabIndex = 100;
-            this.ST_ENSIONA_label.Text = "A";
-            // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
@@ -256,7 +184,7 @@
             // 
             this.su_singlepringqty1_label.AutoSize = true;
             this.su_singlepringqty1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.su_singlepringqty1_label.Location = new System.Drawing.Point(444, 430);
+            this.su_singlepringqty1_label.Location = new System.Drawing.Point(447, 494);
             this.su_singlepringqty1_label.Name = "su_singlepringqty1_label";
             this.su_singlepringqty1_label.Size = new System.Drawing.Size(106, 21);
             this.su_singlepringqty1_label.TabIndex = 108;
@@ -266,7 +194,7 @@
             // 
             this.SU_RETURNIFCLEAN.AutoSize = true;
             this.SU_RETURNIFCLEAN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(489, 459);
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(492, 523);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
             this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(84, 24);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
@@ -278,7 +206,7 @@
             this.su_singlepringqty1.AllPower = null;
             this.su_singlepringqty1.BackColor = System.Drawing.Color.White;
             this.su_singlepringqty1.ID = null;
-            this.su_singlepringqty1.Location = new System.Drawing.Point(556, 432);
+            this.su_singlepringqty1.Location = new System.Drawing.Point(559, 496);
             this.su_singlepringqty1.Name = "su_singlepringqty1";
             this.su_singlepringqty1.Power = null;
             this.su_singlepringqty1.Size = new System.Drawing.Size(39, 21);
@@ -295,7 +223,7 @@
             this.st_table.Items.AddRange(new object[] {
             "BOTTOM",
             "TOP"});
-            this.st_table.Location = new System.Drawing.Point(319, 431);
+            this.st_table.Location = new System.Drawing.Point(322, 495);
             this.st_table.Name = "st_table";
             this.st_table.Size = new System.Drawing.Size(121, 20);
             this.st_table.TabIndex = 107;
@@ -307,7 +235,7 @@
             this.Receive.DownImage = ((System.Drawing.Image)(resources.GetObject("Receive.DownImage")));
             this.Receive.Image = null;
             this.Receive.IsShowBorder = true;
-            this.Receive.Location = new System.Drawing.Point(828, 425);
+            this.Receive.Location = new System.Drawing.Point(831, 489);
             this.Receive.MoveImage = ((System.Drawing.Image)(resources.GetObject("Receive.MoveImage")));
             this.Receive.Name = "Receive";
             this.Receive.NormalImage = ((System.Drawing.Image)(resources.GetObject("Receive.NormalImage")));
@@ -325,7 +253,7 @@
             this.Return.DownImage = ((System.Drawing.Image)(resources.GetObject("Return.DownImage")));
             this.Return.Image = null;
             this.Return.IsShowBorder = true;
-            this.Return.Location = new System.Drawing.Point(642, 520);
+            this.Return.Location = new System.Drawing.Point(582, 522);
             this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
             this.Return.Name = "Return";
             this.Return.NormalImage = ((System.Drawing.Image)(resources.GetObject("Return.NormalImage")));
@@ -336,105 +264,12 @@
             this.Return.UseVisualStyleBackColor = false;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 
-            // Scrap
-            // 
-            this.Scrap.AllPower = null;
-            this.Scrap.BackColor = System.Drawing.Color.Transparent;
-            this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
-            this.Scrap.Image = null;
-            this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(728, 520);
-            this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
-            this.Scrap.Name = "Scrap";
-            this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
-            this.Scrap.Power = null;
-            this.Scrap.Size = new System.Drawing.Size(68, 28);
-            this.Scrap.TabIndex = 102;
-            this.Scrap.Text = "报废";
-            this.Scrap.UseVisualStyleBackColor = false;
-            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
-            // 
-            // ST_ENSIONA
-            // 
-            this.ST_ENSIONA.AllPower = null;
-            this.ST_ENSIONA.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONA.ID = null;
-            this.ST_ENSIONA.Location = new System.Drawing.Point(160, 493);
-            this.ST_ENSIONA.Name = "ST_ENSIONA";
-            this.ST_ENSIONA.Power = null;
-            this.ST_ENSIONA.Size = new System.Drawing.Size(120, 21);
-            this.ST_ENSIONA.Str = null;
-            this.ST_ENSIONA.Str1 = null;
-            this.ST_ENSIONA.Str2 = null;
-            this.ST_ENSIONA.TabIndex = 101;
-            this.ST_ENSIONA.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
-            // 
-            // ST_ENSIONB
-            // 
-            this.ST_ENSIONB.AllPower = null;
-            this.ST_ENSIONB.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONB.ID = null;
-            this.ST_ENSIONB.Location = new System.Drawing.Point(325, 493);
-            this.ST_ENSIONB.Name = "ST_ENSIONB";
-            this.ST_ENSIONB.Power = null;
-            this.ST_ENSIONB.Size = new System.Drawing.Size(120, 21);
-            this.ST_ENSIONB.Str = null;
-            this.ST_ENSIONB.Str1 = null;
-            this.ST_ENSIONB.Str2 = null;
-            this.ST_ENSIONB.TabIndex = 99;
-            this.ST_ENSIONB.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
-            // 
-            // ST_ENSIONC
-            // 
-            this.ST_ENSIONC.AllPower = null;
-            this.ST_ENSIONC.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONC.ID = null;
-            this.ST_ENSIONC.Location = new System.Drawing.Point(489, 493);
-            this.ST_ENSIONC.Name = "ST_ENSIONC";
-            this.ST_ENSIONC.Power = null;
-            this.ST_ENSIONC.Size = new System.Drawing.Size(120, 21);
-            this.ST_ENSIONC.Str = null;
-            this.ST_ENSIONC.Str1 = null;
-            this.ST_ENSIONC.Str2 = null;
-            this.ST_ENSIONC.TabIndex = 97;
-            this.ST_ENSIONC.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
-            // 
-            // ST_ENSIOND
-            // 
-            this.ST_ENSIOND.AllPower = null;
-            this.ST_ENSIOND.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIOND.ID = null;
-            this.ST_ENSIOND.Location = new System.Drawing.Point(160, 520);
-            this.ST_ENSIOND.Name = "ST_ENSIOND";
-            this.ST_ENSIOND.Power = null;
-            this.ST_ENSIOND.Size = new System.Drawing.Size(120, 21);
-            this.ST_ENSIOND.Str = null;
-            this.ST_ENSIOND.Str1 = null;
-            this.ST_ENSIOND.Str2 = null;
-            this.ST_ENSIOND.TabIndex = 95;
-            this.ST_ENSIOND.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
-            // 
-            // ST_ENSIONE
-            // 
-            this.ST_ENSIONE.AllPower = null;
-            this.ST_ENSIONE.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONE.ID = null;
-            this.ST_ENSIONE.Location = new System.Drawing.Point(325, 520);
-            this.ST_ENSIONE.Name = "ST_ENSIONE";
-            this.ST_ENSIONE.Power = null;
-            this.ST_ENSIONE.Size = new System.Drawing.Size(120, 21);
-            this.ST_ENSIONE.Str = null;
-            this.ST_ENSIONE.Str1 = null;
-            this.ST_ENSIONE.Str2 = null;
-            this.ST_ENSIONE.TabIndex = 93;
-            this.ST_ENSIONE.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
-            // 
             // st_combinenumber
             // 
             this.st_combinenumber.AllPower = null;
             this.st_combinenumber.BackColor = System.Drawing.Color.White;
             this.st_combinenumber.ID = null;
-            this.st_combinenumber.Location = new System.Drawing.Point(357, 461);
+            this.st_combinenumber.Location = new System.Drawing.Point(360, 525);
             this.st_combinenumber.Name = "st_combinenumber";
             this.st_combinenumber.Power = null;
             this.st_combinenumber.Size = new System.Drawing.Size(120, 21);
@@ -448,7 +283,7 @@
             this.SU_DEVCODE1.AllPower = null;
             this.SU_DEVCODE1.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE1.ID = null;
-            this.SU_DEVCODE1.Location = new System.Drawing.Point(136, 461);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(139, 525);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
             this.SU_DEVCODE1.Size = new System.Drawing.Size(120, 21);
@@ -463,7 +298,7 @@
             this.SU_DEVCODE.AllPower = null;
             this.SU_DEVCODE.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE.ID = null;
-            this.SU_DEVCODE.Location = new System.Drawing.Point(136, 431);
+            this.SU_DEVCODE.Location = new System.Drawing.Point(139, 495);
             this.SU_DEVCODE.Name = "SU_DEVCODE";
             this.SU_DEVCODE.Power = null;
             this.SU_DEVCODE.Size = new System.Drawing.Size(120, 21);
@@ -490,7 +325,7 @@
             this.ToolsBom.Location = new System.Drawing.Point(0, 38);
             this.ToolsBom.Name = "ToolsBom";
             this.ToolsBom.RowTemplate.Height = 27;
-            this.ToolsBom.Size = new System.Drawing.Size(906, 384);
+            this.ToolsBom.Size = new System.Drawing.Size(906, 447);
             this.ToolsBom.TabIndex = 76;
             // 
             // su_stcode
@@ -569,7 +404,7 @@
             this.li_code.Condition = null;
             this.li_code.DBTitle = null;
             this.li_code.FormName = null;
-            this.li_code.Location = new System.Drawing.Point(682, 430);
+            this.li_code.Location = new System.Drawing.Point(685, 494);
             this.li_code.Name = "li_code";
             this.li_code.Power = null;
             this.li_code.ReturnData = null;
@@ -627,18 +462,6 @@
             this.Controls.Add(this.ma_qty_label);
             this.Controls.Add(this.Receive);
             this.Controls.Add(this.Return);
-            this.Controls.Add(this.Scrap);
-            this.Controls.Add(this.ST_ENSIONA);
-            this.Controls.Add(this.ST_ENSIONA_label);
-            this.Controls.Add(this.ST_ENSIONB);
-            this.Controls.Add(this.ST_ENSIONB_label);
-            this.Controls.Add(this.ST_ENSIONC);
-            this.Controls.Add(this.ST_ENSIONC_label);
-            this.Controls.Add(this.ST_ENSIOND);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.ST_ENSIONE);
-            this.Controls.Add(this.ST_ENSIONE_label);
-            this.Controls.Add(this.label7);
             this.Controls.Add(this.st_combinenumber);
             this.Controls.Add(this.st_combinenumber_label);
             this.Controls.Add(this.SU_DEVCODE1);
@@ -687,18 +510,6 @@
         private System.Windows.Forms.Label SU_DEVCODE1_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox st_combinenumber;
         private System.Windows.Forms.Label st_combinenumber_label;
-        private System.Windows.Forms.Label label7;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONE;
-        private System.Windows.Forms.Label ST_ENSIONE_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIOND;
-        private System.Windows.Forms.Label label9;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONC;
-        private System.Windows.Forms.Label ST_ENSIONC_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONB;
-        private System.Windows.Forms.Label ST_ENSIONB_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONA;
-        private System.Windows.Forms.Label ST_ENSIONA_label;
-        private CustomControl.ButtonUtil.NormalButton Scrap;
         private CustomControl.ButtonUtil.NormalButton Return;
         private CustomControl.ButtonUtil.NormalButton Receive;
         private System.Windows.Forms.Label ma_qty_label;

UAS-MES/FunctionCode/Make/Make_SMTStencil.cs

@@ -30,17 +30,11 @@ namespace UAS_MES.Make
             SU_DEVCODE.Enabled = false;
             st_combinenumber.Enabled = false;
             SU_DEVCODE1.Enabled = false;
-            ST_ENSIONA.Enabled = false;
-            ST_ENSIONB.Enabled = false;
-            ST_ENSIONC.Enabled = false;
-            ST_ENSIOND.Enabled = false;
-            ST_ENSIONE.Enabled = false;
+
             st_table.Enabled = false;
             su_singlepringqty1.Enabled = false;
             Receive.Enabled = false;
             Return.Enabled = false;
-            Scrap.Enabled = false;
-
         }
 
         private void Make_SMTStencil_Load(object sender, EventArgs e)
@@ -52,11 +46,12 @@ namespace UAS_MES.Make
             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.Condition = "ma_statuscode='STARTED'";
+            ma_code.Condition = "ma_statuscode in('STARTED','AUDITED')";
             ma_code.DbChange += Ma_code_DbChange;
 
             li_code.TableName = "Line";
             li_code.SelectField = "li_code # 线别编号,li_name # 线别名称";
+            li_code.Condition = "li_wccode='SMT'";
             li_code.FormName = Name;
             li_code.SetValueField = new string[] { "li_code", "li_name" };
             li_code.DbChange += Li_code_DbChange;
@@ -84,7 +79,7 @@ namespace UAS_MES.Make
         {
             sql.Clear();
             sql.Append("select St_PCBCODE,su_stcode,su_table,su_status,su_linecode,su_usemacode,su_singlepringqty,su_stverison ");
-            sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "' and su_status='借出'");
+            sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "' and su_status='在线'");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             BaseUtil.FillDgvWithDataTable(ToolsBom, dt);
         }
@@ -100,19 +95,22 @@ namespace UAS_MES.Make
             {
                 MessageBox.Show("工单号不能为空");
             }
-            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS from Stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,st_version from Stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
+            string status = "";
+            string version = "";
             if (dt.Rows.Count > 0)
             {
-                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
-                if (status == "借出" || status == "报废")
+                status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                version = dt.Rows[0]["st_version"].ToString();
+                if (status == "在线" || status == "报废" || status == "在仓")
                 {
-                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法再次领用");
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法领用");
                     return;
                 }
             }
             else
             {
-                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
             }
             dt = (DataTable)dh.ExecuteSql("select 1 from STENILCANUSEPRO where sp_stcode='" + SU_DEVCODE.Text + "' and sp_prodcode='" + ma_prodcode.Text + "'", "select");
             if (dt.Rows.Count == 0)
@@ -121,12 +119,12 @@ namespace UAS_MES.Make
                 return;
             }
             sql.Clear();
-            sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
-            sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "','" + st_table.Text + "','" + ma_code.Text + "'");
-            sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'借出' from ");
-            sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
-            dh.ExecuteSql(sql.ToString(), "insert");
-            dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
+            sql.Append("update StencilUse set su_usedate=sysdate,SU_USEPRODCODE='" + ma_prodcode.Text + "',su_usemacode='" + ma_code.Text + "', ");
+            sql.Append("su_useman='" + User.UserName + "',SU_TABLE='" + st_table.Text + "',su_singlepringqty='" + su_singlepringqty1.Text + "',");
+            sql.Append("su_stverison='" + version + "',SU_STATUS='在线',su_linecode='" + li_code.Text + "' ");
+            sql.Append("where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE.Text + "')");
+            dh.ExecuteSql(sql.ToString(), "update");
+            dh.ExecuteSql("update Stencil set ST_USESTATUS='在线' where st_code='" + SU_DEVCODE.Text + "'", "update");
             MessageBox.Show("领用成功");
             st_table.SelectedItem = null;
             SU_DEVCODE.Text = "";
@@ -136,120 +134,48 @@ namespace UAS_MES.Make
 
         private void Return_Click(object sender, EventArgs e)
         {
-            if (ST_ENSIONA.Text != "" && ST_ENSIONB.Text != "" && ST_ENSIONC.Text != "" && ST_ENSIOND.Text != "" && ST_ENSIONE.Text != "")
+            if (SU_RETURNIFCLEAN.Checked)
             {
-                if (SU_RETURNIFCLEAN.Checked)
+                DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
+                if (dt.Rows.Count > 0)
                 {
-                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
-                    if (dt.Rows.Count > 0)
+                    string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                    if (status == "在仓")
                     {
-                        string status = dt.Rows[0]["ST_USESTATUS"].ToString();
-                        if (status == "在仓")
-                        {
-                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未借出,无需归还");
-                            return;
-                        }
-                        if (status == "报废")
-                        {
-                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
-                            return;
-                        }
+                        MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未在线,无需归还");
+                        return;
                     }
-                    else
+                    if (status == "报废")
                     {
-                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
+                        MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
+                        return;
                     }
-                    string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
-                    sql.Clear();
-                    sql.Append("update StencilUse set SU_BACKDATE=sysdate,SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',");
-                    sql.Append("SU_ENSIONE='" + ST_ENSIONE.Text + "',SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='在仓',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
-                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
-                    dh.ExecuteSql(sql.ToString(), "update");
-                    sql.Clear();
-                    sql.Append("update Stencil set St_USECOUNT=nvl(St_USECOUNT,0)+" + st_combinenumber.Text + ",ST_USESTATUS='在仓',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");
-                    sql.Append("ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "' ");
-                    sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
-                    dh.ExecuteSql(sql.ToString(), "update");
-                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
-                    SU_DEVCODE1.Text = "";
-                    st_combinenumber.Text = "";
-                    ST_ENSIONA.Text = "";
-                    ST_ENSIONB.Text = "";
-                    ST_ENSIONC.Text = "";
-                    ST_ENSIOND.Text = "";
-                    ST_ENSIONE.Text = "";
-                    SU_RETURNIFCLEAN.Checked = false;
-                    Return.Enabled = false;
-                    Confirm.PerformClick();
                 }
                 else
                 {
-                    MessageBox.Show("请确认是否清洗钢网");
+                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
                 }
+                string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
+                sql.Clear();
+                sql.Append("update StencilUse set SU_BACKDATE=sysdate,");
+                sql.Append("SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='借出',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
+                sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+                dh.ExecuteSql(sql.ToString(), "update");
+                sql.Clear();
+                sql.Append("update Stencil set St_USECOUNT=nvl(St_USECOUNT,0)+" + st_combinenumber.Text + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
+                dh.ExecuteSql(sql.ToString(), "update");
+                MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
+                SU_DEVCODE1.Text = "";
+                st_combinenumber.Text = "";
+                SU_RETURNIFCLEAN.Checked = false;
+                Confirm.PerformClick();
             }
             else
             {
-                MessageBox.Show("请维护完成的测试参数");
-            }
-        }
-
-        Make_StencilScrapReason form;
-        private void Scrap_Click(object sender, EventArgs e)
-        {
-            DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
-            if (dt.Rows.Count > 0)
-            {
-                if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
-                {
-                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "已处于报废状态");
-                    return;
-                }
-                if (dt.Rows[0]["st_usestatus"].ToString() != "借出")
-                {
-                    MessageBox.Show("报废钢网必须" + SU_DEVCODE1.Text + "处于借出状态");
-                    return;
-                }
-                string closetab_confirm = MessageBox.Show(this.ParentForm, "报废后不可撤销，是否确认报废", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                if (closetab_confirm != "Yes")
-                {
-                    return;
-                }
-                form = new Make_StencilScrapReason();
-                BaseUtil.SetFormCenter(form);
-                form.Controls["ConfirmScrap"].Click += Make_SMTStencil_Click;
-                form.ShowDialog();
+                MessageBox.Show("请确认是否清洗钢网");
             }
         }
 
-        private void Make_SMTStencil_Click(object sender, EventArgs e)
-        {
-            string Code = "";
-            string scrapreason = form.Controls["Reason"].Text;
-            if (scrapreason == "")
-            {
-                MessageBox.Show("报废原因不能为空");
-                return;
-            }
-            DataTable dt = (DataTable)dh.ExecuteSql("select St_USECOUNT from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
-            string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
-            sql.Clear();
-            sql.Append("update StencilUse set SU_IFSCRAPOLD=-1,SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='报废',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
-            sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
-            dh.ExecuteSql(sql.ToString(), "update");
-            sql.Clear();
-            sql.Append("update STENCIL set ST_SCRAPREASON='" + scrapreason + "',ST_USESTATUS='报废' where st_code='" + SU_DEVCODE1.Text + "'");
-            dh.ExecuteSql(sql.ToString(), "insert");
-            //推送人员信息
-            string[] emid = dh.GetConfig("sendEmp", "Stencil").ToString().Replace("\n", "#").Split('#');
-            for (int i = 0; i < emid.Length; i++)
-            {
-                string em_name = dh.getFieldDataByCondition("employee", "em_name", "em_id='" + emid[i] + "'").ToString();
-                LogicHandler.SendMessage(emid[i], em_name, "钢网" + SU_DEVCODE1.Text + "已报废");
-            }
-            form.Close();
-            Scrap.Enabled = false;
-        }
-
         private void Radio_CheckedChanged(object sender, EventArgs e)
         {
             switch ((sender as Control).Name)
@@ -264,13 +190,7 @@ namespace UAS_MES.Make
                         Receive.Enabled = true;
                         st_combinenumber.Enabled = false;
                         SU_DEVCODE1.Enabled = false;
-                        ST_ENSIONA.Enabled = false;
-                        ST_ENSIONB.Enabled = false;
-                        ST_ENSIONC.Enabled = false;
-                        ST_ENSIOND.Enabled = false;
-                        ST_ENSIONE.Enabled = false;
                         Return.Enabled = false;
-                        Scrap.Enabled = false;
                     }
                     break;
                 case "RadioReturn":
@@ -278,16 +198,11 @@ namespace UAS_MES.Make
                     {
                         SU_DEVCODE1.Enabled = true;
                         st_combinenumber.Enabled = true;
-                        ST_ENSIONA.Enabled = true;
-                        ST_ENSIONB.Enabled = true;
-                        ST_ENSIONC.Enabled = true;
-                        ST_ENSIOND.Enabled = true;
-                        ST_ENSIONE.Enabled = true;
+                        Return.Enabled = true;
                         SU_DEVCODE.Enabled = false;
                         st_table.Enabled = false;
                         su_singlepringqty1.Enabled = false;
                         Receive.Enabled = false;
-                        Receive.Enabled = false;
                     }
                     break;
                 default:
@@ -295,36 +210,14 @@ namespace UAS_MES.Make
             }
         }
 
-        //默认范围39-55，如不在范围内则可以报废
-        private void ST_ENSION_TextChanged(object sender, EventArgs e)
-        {
-            double Range = 0;
-            if (ST_ENSIONA.Text != "" && ST_ENSIONB.Text != "" && ST_ENSIONC.Text != "" && ST_ENSIOND.Text != "" && ST_ENSIONE.Text != "")
-            {
-                if (double.TryParse((sender as Control).Text, out Range))
-                {
-                    if (Range >= 39 && Range <= 55)
-                    {
-                        Return.Enabled = true;
-                        Scrap.Enabled = false;
-                    }
-                    else
-                    {
-                        Return.Enabled = false;
-                        Scrap.Enabled = true;
-                    }
-                }
-            }
-        }
-
         private void SU_DEVCODE_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
                 if (dt.Rows.Count == 0)
                 {
-                    MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
+                    MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
                 }
                 if (dt.Rows.Count > 0)
                 {
@@ -348,15 +241,21 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "'", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    Console.WriteLine(dt.Rows[0][0].ToString());
-                    st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
+                    try
+                    {
+                        st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
+                    }
+                    catch (Exception)
+                    {
+
+                    }
                 }
                 else
                 {
-                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
+                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
                 }
             }
         }

UAS-MES/FunctionCode/Make/Make_SMTStencil.resx

@@ -194,44 +194,30 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Scrap.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Scrap.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Scrap.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
+  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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

@@ -0,0 +1,595 @@
+namespace UAS_MES.Make
+{
+    partial class Make_SMTStockStencil
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_SMTStockStencil));
+            this.RadioReceive = new System.Windows.Forms.RadioButton();
+            this.RadioReturn = new System.Windows.Forms.RadioButton();
+            this.SU_DEVCODE_label = new System.Windows.Forms.Label();
+            this.SU_DEVCODE1_label = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.ST_ENSIONE_label = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.ST_ENSIONC_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONB_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONA_label = new System.Windows.Forms.Label();
+            this.SU_RETURNIFCLEAN = new System.Windows.Forms.CheckBox();
+            this.ma_prodcode_label = new System.Windows.Forms.Label();
+            this.ma_qty = new System.Windows.Forms.Label();
+            this.ma_qty_label = new System.Windows.Forms.Label();
+            this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.Receive = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Return = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Scrap = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ST_ENSIONA = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIONB = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIONC = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIOND = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIONE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ToolsBom = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.su_stcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.st_pcbcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SU_LINECODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_stverison = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_singlepringqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_usemacode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // RadioReceive
+            // 
+            this.RadioReceive.AutoSize = true;
+            this.RadioReceive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.RadioReceive.Location = new System.Drawing.Point(3, 430);
+            this.RadioReceive.Name = "RadioReceive";
+            this.RadioReceive.Size = new System.Drawing.Size(55, 24);
+            this.RadioReceive.TabIndex = 77;
+            this.RadioReceive.TabStop = true;
+            this.RadioReceive.Text = "领用";
+            this.RadioReceive.UseVisualStyleBackColor = true;
+            this.RadioReceive.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
+            // 
+            // RadioReturn
+            // 
+            this.RadioReturn.AutoSize = true;
+            this.RadioReturn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.RadioReturn.Location = new System.Drawing.Point(3, 458);
+            this.RadioReturn.Name = "RadioReturn";
+            this.RadioReturn.Size = new System.Drawing.Size(55, 24);
+            this.RadioReturn.TabIndex = 78;
+            this.RadioReturn.TabStop = true;
+            this.RadioReturn.Text = "退回";
+            this.RadioReturn.UseVisualStyleBackColor = true;
+            this.RadioReturn.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
+            // 
+            // SU_DEVCODE_label
+            // 
+            this.SU_DEVCODE_label.AutoSize = true;
+            this.SU_DEVCODE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SU_DEVCODE_label.Location = new System.Drawing.Point(56, 430);
+            this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE_label.TabIndex = 81;
+            this.SU_DEVCODE_label.Text = "钢网编号";
+            // 
+            // SU_DEVCODE1_label
+            // 
+            this.SU_DEVCODE1_label.AutoSize = true;
+            this.SU_DEVCODE1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(56, 460);
+            this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE1_label.TabIndex = 87;
+            this.SU_DEVCODE1_label.Text = "钢网编号";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(2, 493);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(129, 21);
+            this.label7.TabIndex = 91;
+            this.label7.Text = "张力测试结果(N)";
+            // 
+            // ST_ENSIONE_label
+            // 
+            this.ST_ENSIONE_label.AutoSize = true;
+            this.ST_ENSIONE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONE_label.Location = new System.Drawing.Point(299, 520);
+            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(19, 21);
+            this.ST_ENSIONE_label.TabIndex = 92;
+            this.ST_ENSIONE_label.Text = "E";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.Location = new System.Drawing.Point(133, 520);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(22, 21);
+            this.label9.TabIndex = 94;
+            this.label9.Text = "D";
+            // 
+            // ST_ENSIONC_label
+            // 
+            this.ST_ENSIONC_label.AutoSize = true;
+            this.ST_ENSIONC_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONC_label.Location = new System.Drawing.Point(462, 493);
+            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONC_label.TabIndex = 96;
+            this.ST_ENSIONC_label.Text = "C";
+            // 
+            // ST_ENSIONB_label
+            // 
+            this.ST_ENSIONB_label.AutoSize = true;
+            this.ST_ENSIONB_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONB_label.Location = new System.Drawing.Point(298, 493);
+            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(20, 21);
+            this.ST_ENSIONB_label.TabIndex = 98;
+            this.ST_ENSIONB_label.Text = "B";
+            // 
+            // ST_ENSIONA_label
+            // 
+            this.ST_ENSIONA_label.AutoSize = true;
+            this.ST_ENSIONA_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONA_label.Location = new System.Drawing.Point(133, 493);
+            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONA_label.TabIndex = 100;
+            this.ST_ENSIONA_label.Text = "A";
+            // 
+            // SU_RETURNIFCLEAN
+            // 
+            this.SU_RETURNIFCLEAN.AutoSize = true;
+            this.SU_RETURNIFCLEAN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(267, 459);
+            this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(84, 24);
+            this.SU_RETURNIFCLEAN.TabIndex = 110;
+            this.SU_RETURNIFCLEAN.Text = "是否清洗";
+            this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
+            // 
+            // ma_prodcode_label
+            // 
+            this.ma_prodcode_label.AutoSize = true;
+            this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_prodcode_label.Location = new System.Drawing.Point(229, 9);
+            this.ma_prodcode_label.Name = "ma_prodcode_label";
+            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.TabIndex = 69;
+            this.ma_prodcode_label.Text = "产品编号";
+            // 
+            // ma_qty
+            // 
+            this.ma_qty.AutoSize = true;
+            this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty.Location = new System.Drawing.Point(755, 9);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.TabIndex = 106;
+            // 
+            // ma_qty_label
+            // 
+            this.ma_qty_label.AutoSize = true;
+            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty_label.Location = new System.Drawing.Point(681, 9);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(58, 21);
+            this.ma_qty_label.TabIndex = 105;
+            this.ma_qty_label.Text = "工单数";
+            // 
+            // ms_makecode_label
+            // 
+            this.ms_makecode_label.AutoSize = true;
+            this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ms_makecode_label.Location = new System.Drawing.Point(2, 9);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.TabIndex = 68;
+            this.ms_makecode_label.Text = "归属工单";
+            // 
+            // Receive
+            // 
+            this.Receive.AllPower = null;
+            this.Receive.BackColor = System.Drawing.Color.Transparent;
+            this.Receive.DownImage = ((System.Drawing.Image)(resources.GetObject("Receive.DownImage")));
+            this.Receive.Image = null;
+            this.Receive.IsShowBorder = true;
+            this.Receive.Location = new System.Drawing.Point(267, 429);
+            this.Receive.MoveImage = ((System.Drawing.Image)(resources.GetObject("Receive.MoveImage")));
+            this.Receive.Name = "Receive";
+            this.Receive.NormalImage = ((System.Drawing.Image)(resources.GetObject("Receive.NormalImage")));
+            this.Receive.Power = null;
+            this.Receive.Size = new System.Drawing.Size(68, 28);
+            this.Receive.TabIndex = 104;
+            this.Receive.Text = "领用";
+            this.Receive.UseVisualStyleBackColor = false;
+            this.Receive.Click += new System.EventHandler(this.Receive_Click);
+            // 
+            // Return
+            // 
+            this.Return.AllPower = null;
+            this.Return.BackColor = System.Drawing.Color.Transparent;
+            this.Return.DownImage = ((System.Drawing.Image)(resources.GetObject("Return.DownImage")));
+            this.Return.Image = null;
+            this.Return.IsShowBorder = true;
+            this.Return.Location = new System.Drawing.Point(642, 520);
+            this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
+            this.Return.Name = "Return";
+            this.Return.NormalImage = ((System.Drawing.Image)(resources.GetObject("Return.NormalImage")));
+            this.Return.Power = null;
+            this.Return.Size = new System.Drawing.Size(68, 28);
+            this.Return.TabIndex = 103;
+            this.Return.Tag = "Make!SMTStockStencil";
+            this.Return.Text = "退回";
+            this.Return.UseVisualStyleBackColor = false;
+            this.Return.Click += new System.EventHandler(this.Return_Click);
+            // 
+            // Scrap
+            // 
+            this.Scrap.AllPower = null;
+            this.Scrap.BackColor = System.Drawing.Color.Transparent;
+            this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
+            this.Scrap.Image = null;
+            this.Scrap.IsShowBorder = true;
+            this.Scrap.Location = new System.Drawing.Point(728, 520);
+            this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
+            this.Scrap.Name = "Scrap";
+            this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
+            this.Scrap.Power = null;
+            this.Scrap.Size = new System.Drawing.Size(68, 28);
+            this.Scrap.TabIndex = 102;
+            this.Scrap.Text = "报废";
+            this.Scrap.UseVisualStyleBackColor = false;
+            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
+            // 
+            // ST_ENSIONA
+            // 
+            this.ST_ENSIONA.AllPower = null;
+            this.ST_ENSIONA.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONA.ID = null;
+            this.ST_ENSIONA.Location = new System.Drawing.Point(160, 493);
+            this.ST_ENSIONA.Name = "ST_ENSIONA";
+            this.ST_ENSIONA.Power = null;
+            this.ST_ENSIONA.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONA.Str = null;
+            this.ST_ENSIONA.Str1 = null;
+            this.ST_ENSIONA.Str2 = null;
+            this.ST_ENSIONA.TabIndex = 101;
+            this.ST_ENSIONA.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIONB
+            // 
+            this.ST_ENSIONB.AllPower = null;
+            this.ST_ENSIONB.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONB.ID = null;
+            this.ST_ENSIONB.Location = new System.Drawing.Point(325, 493);
+            this.ST_ENSIONB.Name = "ST_ENSIONB";
+            this.ST_ENSIONB.Power = null;
+            this.ST_ENSIONB.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONB.Str = null;
+            this.ST_ENSIONB.Str1 = null;
+            this.ST_ENSIONB.Str2 = null;
+            this.ST_ENSIONB.TabIndex = 99;
+            this.ST_ENSIONB.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIONC
+            // 
+            this.ST_ENSIONC.AllPower = null;
+            this.ST_ENSIONC.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONC.ID = null;
+            this.ST_ENSIONC.Location = new System.Drawing.Point(489, 493);
+            this.ST_ENSIONC.Name = "ST_ENSIONC";
+            this.ST_ENSIONC.Power = null;
+            this.ST_ENSIONC.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONC.Str = null;
+            this.ST_ENSIONC.Str1 = null;
+            this.ST_ENSIONC.Str2 = null;
+            this.ST_ENSIONC.TabIndex = 97;
+            this.ST_ENSIONC.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIOND
+            // 
+            this.ST_ENSIOND.AllPower = null;
+            this.ST_ENSIOND.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIOND.ID = null;
+            this.ST_ENSIOND.Location = new System.Drawing.Point(160, 520);
+            this.ST_ENSIOND.Name = "ST_ENSIOND";
+            this.ST_ENSIOND.Power = null;
+            this.ST_ENSIOND.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIOND.Str = null;
+            this.ST_ENSIOND.Str1 = null;
+            this.ST_ENSIOND.Str2 = null;
+            this.ST_ENSIOND.TabIndex = 95;
+            this.ST_ENSIOND.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIONE
+            // 
+            this.ST_ENSIONE.AllPower = null;
+            this.ST_ENSIONE.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONE.ID = null;
+            this.ST_ENSIONE.Location = new System.Drawing.Point(325, 520);
+            this.ST_ENSIONE.Name = "ST_ENSIONE";
+            this.ST_ENSIONE.Power = null;
+            this.ST_ENSIONE.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONE.Str = null;
+            this.ST_ENSIONE.Str1 = null;
+            this.ST_ENSIONE.Str2 = null;
+            this.ST_ENSIONE.TabIndex = 93;
+            this.ST_ENSIONE.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // SU_DEVCODE1
+            // 
+            this.SU_DEVCODE1.AllPower = null;
+            this.SU_DEVCODE1.BackColor = System.Drawing.Color.White;
+            this.SU_DEVCODE1.ID = null;
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(136, 461);
+            this.SU_DEVCODE1.Name = "SU_DEVCODE1";
+            this.SU_DEVCODE1.Power = null;
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE1.Str = null;
+            this.SU_DEVCODE1.Str1 = null;
+            this.SU_DEVCODE1.Str2 = null;
+            this.SU_DEVCODE1.TabIndex = 88;
+            this.SU_DEVCODE1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SU_DEVCODE1_KeyDown);
+            // 
+            // SU_DEVCODE
+            // 
+            this.SU_DEVCODE.AllPower = null;
+            this.SU_DEVCODE.BackColor = System.Drawing.Color.White;
+            this.SU_DEVCODE.ID = null;
+            this.SU_DEVCODE.Location = new System.Drawing.Point(136, 431);
+            this.SU_DEVCODE.Name = "SU_DEVCODE";
+            this.SU_DEVCODE.Power = null;
+            this.SU_DEVCODE.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE.Str = null;
+            this.SU_DEVCODE.Str1 = null;
+            this.SU_DEVCODE.Str2 = null;
+            this.SU_DEVCODE.TabIndex = 82;
+            this.SU_DEVCODE.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SU_DEVCODE_KeyDown);
+            // 
+            // ToolsBom
+            // 
+            this.ToolsBom.AllowUserToAddRows = false;
+            this.ToolsBom.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.ToolsBom.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.su_stcode,
+            this.st_pcbcode,
+            this.su_status,
+            this.SU_LINECODE,
+            this.su_stverison,
+            this.su_singlepringqty,
+            this.su_table,
+            this.su_usemacode});
+            this.ToolsBom.EnableContentClick = true;
+            this.ToolsBom.Location = new System.Drawing.Point(0, 38);
+            this.ToolsBom.Name = "ToolsBom";
+            this.ToolsBom.RowTemplate.Height = 27;
+            this.ToolsBom.Size = new System.Drawing.Size(906, 384);
+            this.ToolsBom.TabIndex = 76;
+            // 
+            // su_stcode
+            // 
+            this.su_stcode.DataPropertyName = "su_stcode";
+            this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.Name = "su_stcode";
+            // 
+            // st_pcbcode
+            // 
+            this.st_pcbcode.DataPropertyName = "st_pcbcode";
+            this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.Name = "st_pcbcode";
+            // 
+            // su_status
+            // 
+            this.su_status.DataPropertyName = "su_status";
+            this.su_status.HeaderText = "领用状态";
+            this.su_status.Name = "su_status";
+            // 
+            // SU_LINECODE
+            // 
+            this.SU_LINECODE.DataPropertyName = "SU_LINECODE";
+            this.SU_LINECODE.HeaderText = "线别";
+            this.SU_LINECODE.Name = "SU_LINECODE";
+            // 
+            // su_stverison
+            // 
+            this.su_stverison.DataPropertyName = "su_stverison";
+            this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.Name = "su_stverison";
+            // 
+            // su_singlepringqty
+            // 
+            this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
+            this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.Name = "su_singlepringqty";
+            // 
+            // su_table
+            // 
+            this.su_table.DataPropertyName = "su_table";
+            this.su_table.HeaderText = "板面";
+            this.su_table.Name = "su_table";
+            // 
+            // su_usemacode
+            // 
+            this.su_usemacode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.su_usemacode.DataPropertyName = "su_usemacode";
+            this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.Name = "su_usemacode";
+            this.su_usemacode.Width = 61;
+            // 
+            // Confirm
+            // 
+            this.Confirm.AllPower = null;
+            this.Confirm.BackColor = System.Drawing.Color.Transparent;
+            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
+            this.Confirm.Image = null;
+            this.Confirm.IsShowBorder = true;
+            this.Confirm.Location = new System.Drawing.Point(828, 4);
+            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
+            this.Confirm.Name = "Confirm";
+            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
+            this.Confirm.Power = null;
+            this.Confirm.Size = new System.Drawing.Size(68, 28);
+            this.Confirm.TabIndex = 75;
+            this.Confirm.Text = "确定";
+            this.Confirm.UseVisualStyleBackColor = false;
+            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 
+            // ma_prodcode
+            // 
+            this.ma_prodcode.AllPower = null;
+            this.ma_prodcode.BackColor = System.Drawing.Color.White;
+            this.ma_prodcode.ID = null;
+            this.ma_prodcode.Location = new System.Drawing.Point(309, 9);
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Power = null;
+            this.ma_prodcode.Size = new System.Drawing.Size(140, 21);
+            this.ma_prodcode.Str = null;
+            this.ma_prodcode.Str1 = null;
+            this.ma_prodcode.Str2 = null;
+            this.ma_prodcode.TabIndex = 72;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(82, 9);
+            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(141, 21);
+            this.ma_code.TabIndex = 71;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            this.ma_code.TextKeyDown += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
+            // 
+            // Make_SMTStockStencil
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(908, 551);
+            this.Controls.Add(this.SU_RETURNIFCLEAN);
+            this.Controls.Add(this.ma_qty);
+            this.Controls.Add(this.ma_qty_label);
+            this.Controls.Add(this.Receive);
+            this.Controls.Add(this.Return);
+            this.Controls.Add(this.Scrap);
+            this.Controls.Add(this.ST_ENSIONA);
+            this.Controls.Add(this.ST_ENSIONA_label);
+            this.Controls.Add(this.ST_ENSIONB);
+            this.Controls.Add(this.ST_ENSIONB_label);
+            this.Controls.Add(this.ST_ENSIONC);
+            this.Controls.Add(this.ST_ENSIONC_label);
+            this.Controls.Add(this.ST_ENSIOND);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.ST_ENSIONE);
+            this.Controls.Add(this.ST_ENSIONE_label);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.SU_DEVCODE1);
+            this.Controls.Add(this.SU_DEVCODE1_label);
+            this.Controls.Add(this.SU_DEVCODE);
+            this.Controls.Add(this.SU_DEVCODE_label);
+            this.Controls.Add(this.RadioReturn);
+            this.Controls.Add(this.RadioReceive);
+            this.Controls.Add(this.ToolsBom);
+            this.Controls.Add(this.Confirm);
+            this.Controls.Add(this.ma_prodcode);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.ms_makecode_label);
+            this.Controls.Add(this.ma_prodcode_label);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "Make_SMTStockStencil";
+            this.Tag = "Make!SMTStencil";
+            this.Text = "Make_SMTStencil";
+            this.Load += new System.EventHandler(this.Make_SMTStencil_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_SMTStencil_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private CustomControl.ButtonUtil.NormalButton Confirm;
+        private CustomControl.DataGrid_View.DataGridViewWithSerialNum ToolsBom;
+        private System.Windows.Forms.RadioButton RadioReceive;
+        private System.Windows.Forms.RadioButton RadioReturn;
+        private CustomControl.TextBoxWithIcon.EnterTextBox SU_DEVCODE;
+        private System.Windows.Forms.Label SU_DEVCODE_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox SU_DEVCODE1;
+        private System.Windows.Forms.Label SU_DEVCODE1_label;
+        private System.Windows.Forms.Label label7;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONE;
+        private System.Windows.Forms.Label ST_ENSIONE_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIOND;
+        private System.Windows.Forms.Label label9;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONC;
+        private System.Windows.Forms.Label ST_ENSIONC_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONB;
+        private System.Windows.Forms.Label ST_ENSIONB_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONA;
+        private System.Windows.Forms.Label ST_ENSIONA_label;
+        private CustomControl.ButtonUtil.NormalButton Scrap;
+        private CustomControl.ButtonUtil.NormalButton Return;
+        private CustomControl.ButtonUtil.NormalButton Receive;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_stcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn st_pcbcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_status;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SU_LINECODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_stverison;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_singlepringqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_table;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_usemacode;
+        private System.Windows.Forms.CheckBox SU_RETURNIFCLEAN;
+        private System.Windows.Forms.Label ma_prodcode_label;
+        private System.Windows.Forms.Label ma_qty;
+        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
+        private System.Windows.Forms.Label ma_qty_label;
+        private System.Windows.Forms.Label ms_makecode_label;
+    }
+}

UAS-MES/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -0,0 +1,361 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES;
+using UAS_MES.DataOperate;
+using UAS_MES.Entity;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Make
+{
+    public partial class Make_SMTStockStencil : Form
+    {
+
+        DataTable Dbfind;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataHelper dh = SystemInf.dh;
+
+        StringBuilder sql = new StringBuilder();
+
+        public Make_SMTStockStencil()
+        {
+            InitializeComponent();
+            SU_DEVCODE.Enabled = false;
+            SU_DEVCODE1.Enabled = false;
+            ST_ENSIONA.Enabled = false;
+            ST_ENSIONB.Enabled = false;
+            ST_ENSIONC.Enabled = false;
+            ST_ENSIOND.Enabled = false;
+            ST_ENSIONE.Enabled = false;
+            Receive.Enabled = false;
+            Return.Enabled = false;
+            Scrap.Enabled = false;
+
+        }
+
+        private void Make_SMTStencil_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            //工单号放大镜配置
+            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.Condition = "ma_statuscode in('STARTED','AUDITED')";
+            ma_code.DbChange += Ma_code_DbChange;
+
+        }
+
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+            Confirm.PerformClick();
+        }
+
+        private void Make_SMTStencil_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void LoadGridData()
+        {
+            sql.Clear();
+            sql.Append("select St_PCBCODE,su_stcode,su_table,su_status,su_linecode,su_usemacode,su_singlepringqty,su_stverison ");
+            sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "' and su_status='借出'");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            BaseUtil.FillDgvWithDataTable(ToolsBom, dt);
+        }
+
+        private void Confirm_Click(object sender, EventArgs e)
+        {
+            LoadGridData();
+        }
+
+        private void Receive_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS from Stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "借出" || status == "报废" || status == "在线")
+                {
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法领用");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
+                return;
+            }
+            sql.Clear();
+            sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS)");
+            sql.Append("select StencilUse_seq.nextval,st_id,'" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "'");
+            sql.Append(",st_version,'借出' from ");
+            sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
+            MessageBox.Show("领用成功");
+            SU_DEVCODE.Text = "";
+            Receive.Enabled = false;
+            LoadGridData();
+        }
+
+        private void Return_Click(object sender, EventArgs e)
+        {
+            if (ST_ENSIONA.Text != "" && ST_ENSIONB.Text != "" && ST_ENSIONC.Text != "" && ST_ENSIOND.Text != "" && ST_ENSIONE.Text != "")
+            {
+                if (SU_RETURNIFCLEAN.Checked)
+                {
+                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                        if (status == "在线")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于在线状态,无法退回");
+                            return;
+                        }
+                        if (status == "在仓")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未借出,无需归还");
+                            return;
+                        }
+                        if (status == "报废")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                    }
+                    string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
+                    sql.Clear();
+                    sql.Append("update StencilUse set SU_BACKDATE=sysdate,SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',");
+                    sql.Append("SU_ENSIONE='" + ST_ENSIONE.Text + "',SU_STATUS='在仓'");
+                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    sql.Clear();
+                    sql.Append("update Stencil set ST_USESTATUS='在仓',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");
+                    sql.Append("ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "' ");
+                    sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
+                    SU_DEVCODE1.Text = "";
+                    ST_ENSIONA.Text = "";
+                    ST_ENSIONB.Text = "";
+                    ST_ENSIONC.Text = "";
+                    ST_ENSIOND.Text = "";
+                    ST_ENSIONE.Text = "";
+                    SU_RETURNIFCLEAN.Checked = false;
+                    Return.Enabled = false;
+                    Confirm.PerformClick();
+                }
+                else
+                {
+                    MessageBox.Show("请确认是否清洗钢网");
+                }
+            }
+            else
+            {
+                MessageBox.Show("请维护完成的测试参数");
+            }
+        }
+
+        Make_StencilScrapReason form;
+        private void Scrap_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
+                {
+                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "已处于报废状态");
+                    return;
+                }
+                if (dt.Rows[0]["st_usestatus"].ToString() != "借出")
+                {
+                    MessageBox.Show("报废钢网必须" + SU_DEVCODE1.Text + "处于借出状态");
+                    return;
+                }
+                string closetab_confirm = MessageBox.Show(this.ParentForm, "报废后不可撤销，是否确认报废", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (closetab_confirm != "Yes")
+                {
+                    return;
+                }
+                form = new Make_StencilScrapReason();
+                BaseUtil.SetFormCenter(form);
+                form.Controls["ConfirmScrap"].Click += Make_SMTStencil_Click;
+                form.ShowDialog();
+            }
+        }
+
+        private void Make_SMTStencil_Click(object sender, EventArgs e)
+        {
+            string Code = "";
+            string scrapreason = form.Controls["Reason"].Text;
+            if (scrapreason == "")
+            {
+                MessageBox.Show("报废原因不能为空");
+                return;
+            }
+            DataTable dt = (DataTable)dh.ExecuteSql("select St_USECOUNT from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
+            string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
+            sql.Clear();
+            sql.Append("update StencilUse set SU_IFSCRAPOLD=-1,SU_STATUS='报废',SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "'");
+            sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+            dh.ExecuteSql(sql.ToString(), "update");
+            sql.Clear();
+            sql.Append("update Stencil set ST_SCRAPREASON='" + scrapreason + "',ST_USESTATUS='报废',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");
+            sql.Append("ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "' ");
+            sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            //推送人员信息
+            string[] emid = dh.GetConfig("sendEmp", "Stencil").ToString().Replace("\n", "#").Split('#');
+            for (int i = 0; i < emid.Length; i++)
+            {
+                string em_name = dh.getFieldDataByCondition("employee", "em_name", "em_id='" + emid[i] + "'").ToString();
+                LogicHandler.SendMessage(emid[i], em_name, "钢网" + SU_DEVCODE1.Text + "已报废");
+            }
+            form.Close();
+            SU_DEVCODE1.Text = "";
+            ST_ENSIONA.Text = "";
+            ST_ENSIONB.Text = "";
+            ST_ENSIONC.Text = "";
+            ST_ENSIOND.Text = "";
+            ST_ENSIONE.Text = "";
+            SU_RETURNIFCLEAN.Checked = false;
+            Scrap.Enabled = false;
+        }
+
+        private void Radio_CheckedChanged(object sender, EventArgs e)
+        {
+            switch ((sender as Control).Name)
+            {
+                case "RadioReceive":
+                    if ((sender as RadioButton).Checked)
+                    {
+                        SU_DEVCODE.Enabled = true;
+                        Receive.Enabled = true;
+                        Receive.Enabled = true;
+                        SU_DEVCODE1.Enabled = false;
+                        ST_ENSIONA.Enabled = false;
+                        ST_ENSIONB.Enabled = false;
+                        ST_ENSIONC.Enabled = false;
+                        ST_ENSIOND.Enabled = false;
+                        ST_ENSIONE.Enabled = false;
+                        Return.Enabled = false;
+                        Scrap.Enabled = false;
+                    }
+                    break;
+                case "RadioReturn":
+                    if ((sender as RadioButton).Checked)
+                    {
+                        SU_DEVCODE1.Enabled = true;
+                        ST_ENSIONA.Enabled = true;
+                        ST_ENSIONB.Enabled = true;
+                        ST_ENSIONC.Enabled = true;
+                        ST_ENSIOND.Enabled = true;
+                        ST_ENSIONE.Enabled = true;
+                        SU_DEVCODE.Enabled = false;
+                        Receive.Enabled = false;
+                        Receive.Enabled = false;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        //默认范围39-55，如不在范围内则可以报废
+        private void ST_ENSION_TextChanged(object sender, EventArgs e)
+        {
+            double Range = 0;
+            List<string> Num = new List<string>();
+            Num.Add(ST_ENSIONA.Text);
+            Num.Add(ST_ENSIONB.Text);
+            Num.Add(ST_ENSIONC.Text);
+            Num.Add(ST_ENSIOND.Text);
+            Num.Add(ST_ENSIONE.Text);
+            int CheckCount = 0;
+            int FillCount = 0;
+            foreach (string item in Num)
+            {
+                if (item != "")
+                {
+                    FillCount = FillCount + 1;
+                    if (double.TryParse(item, out Range))
+                    {
+                        if (Range >= 39 && Range <= 55)
+                        {
+                            CheckCount = CheckCount + 1;
+                        }
+                    }
+                }
+            }
+            if (FillCount == 5)
+            {
+                if (CheckCount == 5)
+                {
+                    Return.Enabled = true;
+                    Scrap.Enabled = false;
+                }
+                else
+                {
+                    Return.Enabled = false;
+                    Scrap.Enabled = true;
+                }
+            }
+        }
+
+        private void SU_DEVCODE_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
+                }
+                if (dt.Rows.Count > 0)
+                {
+                    Receive.Enabled = true;
+                    if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "已报废");
+                    }
+                }
+            }
+        }
+
+        private void SU_DEVCODE1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                }
+            }
+        }
+
+        private void ma_code_TextKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Confirm.PerformClick();
+            }
+        }
+    }
+}

UAS-MES/FunctionCode/Make/Make_SMTStockStencil.resx

@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Receive.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Receive.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Receive.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Return.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Return.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Return.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Scrap.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Scrap.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Scrap.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

UAS-出货标签管理/生成条码.cs

@@ -464,7 +464,7 @@ namespace UAS_LabelMachine
                         sql.Append("pd_prodcode,pd_piclass,inqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id) pd_id,sum(pd_inqty)inqty,pd_ordercode,pd_orderdetno,pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail  group by pd_piid,pd_ordercode, pd_orderdetno,pd_pdno)T left join product ");
-                        sql.Append("on pr_code=pd_prodcode where nvl(pr_zxbzs,0)>0)  where  pd_piid='" + pi_id + "'");
+                        sql.Append("on pr_code=pd_prodcode )  where  pd_piid='" + pi_id + "'");
                         break;
                     default:
                         break;

UAS-出货标签管理/采集策略.cs

@@ -97,9 +97,9 @@ namespace UAS_LabelMachine
                     }
                     string si_id = dh.GetSEQ("scanitem_seq");
                     sql.Clear();
-                    sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable,si_innerdetno) values(" + si_id + "," + sg_id.Text);
+                    sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable,si_innerdetno,si_length) values(" + si_id + "," + sg_id.Text);
                     sql.Append(",'" + Controls["si_detno" + i].Text + "','" + Controls["si_item" + i].Text + "','" + Controls["si_kind" + i].Text + "',");
-                    sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ",'" + Controls["si_innerdetno" + i].Text + "')");
+                    sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ",'" + Controls["si_innerdetno" + i].Text + "','" + Controls["si_length" + i].Text + "')");
                     dh.ExecuteSql(sql.ToString(), "insert", new string[] { Controls["si_expression" + i].Text });
                     Controls["si_id" + i].Text = si_id;
                 }
@@ -127,9 +127,9 @@ namespace UAS_LabelMachine
                         }
                         string si_id = dh.GetSEQ("scanitem_seq");
                         sql.Clear();
-                        sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable,si_innerdetno) values(" + si_id + "," + sg_id1);
+                        sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable,si_innerdetno,si_length) values(" + si_id + "," + sg_id1);
                         sql.Append(",'" + Controls["si_detno" + i].Text + "','" + Controls["si_item" + i].Text + "','" + Controls["si_kind" + i].Text + "',");
-                        sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ",'" + Controls["si_innerdetno" + i].Text + "')");
+                        sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ",'" + Controls["si_innerdetno" + i].Text + "','" + Controls["si_length" + i].Text + "')");
                         dh.ExecuteSql(sql.ToString(), "insert", new string[] { Controls["si_expression" + i].Text });
                         Controls["si_id" + i].Text = si_id;
                     }