Browse Source

微浦MES修改提交

caosy 5 months ago
parent
commit
33f20f6f93

+ 1 - 1
UAS_MES_WEIP/App.config

@@ -78,7 +78,7 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=113.108.109.210)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.105)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
     <UAS_MES.Properties.Settings>

+ 2 - 2
UAS_MES_WEIP/DataOperate/ExcelHandler.cs

@@ -184,8 +184,8 @@ namespace UAS_MES_NEW.DataOperate
             string line;
             while ((line = sr.ReadLine()) != null)
             {
-                string[] elements = line.Replace("\r", "").Replace("\n", "").Replace("\t", "").Split(',');
-
+                //string[] elements = line.Replace("\r", "").Replace("\n", "").Replace("\t", "").Split(',');
+                string[] elements = line.Replace("\r", "").Replace("\n", "").Replace("\t", "").Replace("\"","").Replace(" ","").Split(',');
                 //第一次读取数据时,要创建数据列
                 if (bFirst)
                 {

+ 12 - 4
UAS_MES_WEIP/FunctionCode/Make/Make_SMTBind.cs

@@ -106,7 +106,7 @@ namespace UAS_MES_NEW.Make
                 {
                     if (Loading.Checked)
                     {
-                        if (code.Text.Replace(" ", "") == ""||pr_pcbacount.Value == 0 || pr_pcbacount.Value == 1)
+                        if (code.Text.Replace(" ", "") == ""||pr_pcbacount.Value == 0 )
                         {
                             OperateResult.AppendText(">>采集数据与拼版数不可为空\n", Color.Red);
                             return;
@@ -169,6 +169,8 @@ namespace UAS_MES_NEW.Make
                                     sql.Append("'" + User.UserCode + "',sysdate,0)");
                                     dh.ExecuteSql(sql.GetString(), "insert");
 
+
+
                                     RefreshData();
 
                                     sql.Clear();
@@ -176,6 +178,11 @@ namespace UAS_MES_NEW.Make
                                     sql.Append("where sb_barcode='" + code.Text + "')");
                                     dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                     BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt1);
+                                    if (LabelDataGridView.Rows.Count == pr_pcbacount.Value)
+                                    {
+                                        OperateResult.AppendText(">>拼版主码" + sn_code.Text + "绑定完成\n", Color.Green);
+                                        sn_code.Text = "";
+                                    }
                                     code.Text = "";
                                 }
                             }
@@ -211,6 +218,7 @@ namespace UAS_MES_NEW.Make
                                 BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt1);
                                 if (LabelDataGridView.Rows.Count == pr_pcbacount.Value)
                                 {
+                                    OperateResult.AppendText(">>拼版主码" + sn_code.Text + "绑定完成\n", Color.Green);
                                     sn_code.Text = "";
                                 }
                                 code.Text = "";
@@ -669,11 +677,11 @@ namespace UAS_MES_NEW.Make
             List<string> nowcodelist = new List<string>();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                if (dt.Rows[i]["工单"].ToString().Trim()==ma_code.Text&&dt.Rows[i]["拼板号"].ToString().Trim().Length >2 && dt.Rows[i]["读码内容"].ToString().Trim().Length > 2 && dt.Rows[i]["拼板号"].ToString().Trim().Substring(0, 2)
-                    == dt.Rows[i]["码内容"].ToString().Trim().Substring(0, 2))
+                if (dt.Rows[i]["工单"].ToString().Trim()==ma_code.Text&&dt.Rows[i]["拼板号"].ToString().Trim().Length >2 && dt.Rows[i]["打码内容"].ToString().Trim().Length > 7 && dt.Rows[i]["拼板号"].ToString().Trim().Substring(0, 2)
+                    == dt.Rows[i]["码内容"].ToString().Trim().Substring(0, 2))
                 {
                         maincodelist.Add(dt.Rows[i]["拼板号"].ToString().Trim());
-                        nowcodelist.Add(dt.Rows[i]["码内容"].ToString().Trim());
+                        nowcodelist.Add(dt.Rows[i]["码内容"].ToString().Trim());
                         //number++;
 
                 }

+ 876 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.Designer.cs

@@ -0,0 +1,876 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_SMTSStencil
+    {
+        /// <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_SMTStencil));
+            this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.ma_prodcode_label = new System.Windows.Forms.Label();
+            this.li_code_label = new System.Windows.Forms.Label();
+            this.RadioReceive = new System.Windows.Forms.RadioButton();
+            this.RadioReturn = new System.Windows.Forms.RadioButton();
+            this.SU_DEVCODE_label = new System.Windows.Forms.Label();
+            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.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();
+            this.SU_RETURNIFCLEAN = new System.Windows.Forms.CheckBox();
+            this.em_code_label = new System.Windows.Forms.Label();
+            this.em_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.su_singlepringqty1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.st_table = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
+            this.Receive = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.Return = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.st_combinenumber = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ToolsBom = new UAS_MES_NEW.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_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ma_prodcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.em_code1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.em_code1_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONA_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONB_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONC_label = new System.Windows.Forms.Label();
+            this.ST_ENSIOND = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.ST_ENSIONE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONE_label = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.Scrap = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.st_usecount = new System.Windows.Forms.Label();
+            this.normalButton1 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // 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(3, 13);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.TabIndex = 68;
+            this.ms_makecode_label.Text = "归属工单";
+            // 
+            // 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(343, 13);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode_label.Name = "ma_prodcode_label";
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
+            this.ma_prodcode_label.TabIndex = 69;
+            this.ma_prodcode_label.Text = "产品编号";
+            // 
+            // li_code_label
+            // 
+            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(908, 742);
+            this.li_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.li_code_label.Name = "li_code_label";
+            this.li_code_label.Size = new System.Drawing.Size(110, 31);
+            this.li_code_label.TabIndex = 73;
+            this.li_code_label.Text = "产线编号";
+            // 
+            // 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(9, 742);
+            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.RadioReceive.Name = "RadioReceive";
+            this.RadioReceive.Size = new System.Drawing.Size(79, 32);
+            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(9, 823);
+            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.RadioReturn.Name = "RadioReturn";
+            this.RadioReturn.Size = new System.Drawing.Size(79, 32);
+            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(89, 742);
+            this.SU_DEVCODE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(110, 31);
+            this.SU_DEVCODE_label.TabIndex = 81;
+            this.SU_DEVCODE_label.Text = "钢网编号";
+            // 
+            // st_table_label
+            // 
+            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(399, 742);
+            this.st_table_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.st_table_label.Name = "st_table_label";
+            this.st_table_label.Size = new System.Drawing.Size(76, 31);
+            this.st_table_label.TabIndex = 83;
+            this.st_table_label.Text = "Table";
+            // 
+            // 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(89, 828);
+            this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(110, 31);
+            this.SU_DEVCODE1_label.TabIndex = 87;
+            this.SU_DEVCODE1_label.Text = "钢网编号";
+            // 
+            // st_combinenumber_label
+            // 
+            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(1158, 881);
+            this.st_combinenumber_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.st_combinenumber_label.Name = "st_combinenumber_label";
+            this.st_combinenumber_label.Size = new System.Drawing.Size(134, 31);
+            this.st_combinenumber_label.TabIndex = 89;
+            this.st_combinenumber_label.Text = "加工小板数";
+            this.st_combinenumber_label.Visible = false;
+            // 
+            // 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(1022, 13);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(86, 31);
+            this.ma_qty_label.TabIndex = 105;
+            this.ma_qty_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(1133, 13);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 31);
+            this.ma_qty.TabIndex = 106;
+            // 
+            // su_singlepringqty1_label
+            // 
+            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(670, 742);
+            this.su_singlepringqty1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.su_singlepringqty1_label.Name = "su_singlepringqty1_label";
+            this.su_singlepringqty1_label.Size = new System.Drawing.Size(158, 31);
+            this.su_singlepringqty1_label.TabIndex = 108;
+            this.su_singlepringqty1_label.Text = "单片印刷次数";
+            // 
+            // 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(708, 828);
+            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
+            this.SU_RETURNIFCLEAN.TabIndex = 110;
+            this.SU_RETURNIFCLEAN.Text = "是否清洗";
+            this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
+            // 
+            // em_code_label
+            // 
+            this.em_code_label.AutoSize = true;
+            this.em_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.em_code_label.Location = new System.Drawing.Point(89, 786);
+            this.em_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_code_label.Name = "em_code_label";
+            this.em_code_label.Size = new System.Drawing.Size(110, 31);
+            this.em_code_label.TabIndex = 111;
+            this.em_code_label.Text = "人员编号";
+            // 
+            // em_code
+            // 
+            this.em_code.AllPower = null;
+            this.em_code.BackColor = System.Drawing.Color.White;
+            this.em_code.ID = null;
+            this.em_code.Location = new System.Drawing.Point(208, 787);
+            this.em_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.em_code.Name = "em_code";
+            this.em_code.Power = null;
+            this.em_code.Size = new System.Drawing.Size(178, 28);
+            this.em_code.Str = null;
+            this.em_code.Str1 = null;
+            this.em_code.Str2 = null;
+            this.em_code.TabIndex = 112;
+            // 
+            // su_singlepringqty1
+            // 
+            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(838, 744);
+            this.su_singlepringqty1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.su_singlepringqty1.Name = "su_singlepringqty1";
+            this.su_singlepringqty1.Negative = false;
+            this.su_singlepringqty1.Power = null;
+            this.su_singlepringqty1.Size = new System.Drawing.Size(57, 28);
+            this.su_singlepringqty1.Str = null;
+            this.su_singlepringqty1.Str1 = null;
+            this.su_singlepringqty1.Str2 = null;
+            this.su_singlepringqty1.TabIndex = 109;
+            this.su_singlepringqty1.Text = "1";
+            // 
+            // st_table
+            // 
+            this.st_table.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.st_table.FormattingEnabled = true;
+            this.st_table.Items.AddRange(new object[] {
+            "BOTTOM",
+            "TOP"});
+            this.st_table.Location = new System.Drawing.Point(483, 743);
+            this.st_table.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.st_table.Name = "st_table";
+            this.st_table.Size = new System.Drawing.Size(180, 26);
+            this.st_table.TabIndex = 107;
+            // 
+            // 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(1246, 733);
+            this.Receive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            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(102, 42);
+            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(1027, 820);
+            this.Return.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            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(102, 42);
+            this.Return.TabIndex = 103;
+            this.Return.Text = "退回";
+            this.Return.UseVisualStyleBackColor = false;
+            this.Return.Click += new System.EventHandler(this.Return_Click);
+            // 
+            // 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(1154, 848);
+            this.st_combinenumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.st_combinenumber.Name = "st_combinenumber";
+            this.st_combinenumber.Power = null;
+            this.st_combinenumber.Size = new System.Drawing.Size(178, 28);
+            this.st_combinenumber.Str = null;
+            this.st_combinenumber.Str1 = null;
+            this.st_combinenumber.Str2 = null;
+            this.st_combinenumber.TabIndex = 90;
+            this.st_combinenumber.Visible = false;
+            // 
+            // 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(208, 829);
+            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.SU_DEVCODE1.Name = "SU_DEVCODE1";
+            this.SU_DEVCODE1.Power = null;
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(178, 28);
+            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(208, 743);
+            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.SU_DEVCODE.Name = "SU_DEVCODE";
+            this.SU_DEVCODE.Power = null;
+            this.SU_DEVCODE.Size = new System.Drawing.Size(178, 28);
+            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, 58);
+            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ToolsBom.Name = "ToolsBom";
+            this.ToolsBom.RowHeadersWidth = 51;
+            this.ToolsBom.RowTemplate.Height = 27;
+            this.ToolsBom.Size = new System.Drawing.Size(1359, 671);
+            this.ToolsBom.TabIndex = 76;
+            // 
+            // su_stcode
+            // 
+            this.su_stcode.DataPropertyName = "su_stcode";
+            this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.MinimumWidth = 6;
+            this.su_stcode.Name = "su_stcode";
+            this.su_stcode.Width = 125;
+            // 
+            // st_pcbcode
+            // 
+            this.st_pcbcode.DataPropertyName = "st_pcbcode";
+            this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.MinimumWidth = 6;
+            this.st_pcbcode.Name = "st_pcbcode";
+            this.st_pcbcode.Width = 125;
+            // 
+            // su_status
+            // 
+            this.su_status.DataPropertyName = "su_status";
+            this.su_status.HeaderText = "领用状态";
+            this.su_status.MinimumWidth = 6;
+            this.su_status.Name = "su_status";
+            this.su_status.Width = 125;
+            // 
+            // SU_LINECODE
+            // 
+            this.SU_LINECODE.DataPropertyName = "SU_LINECODE";
+            this.SU_LINECODE.HeaderText = "线别";
+            this.SU_LINECODE.MinimumWidth = 6;
+            this.SU_LINECODE.Name = "SU_LINECODE";
+            this.SU_LINECODE.Width = 125;
+            // 
+            // su_stverison
+            // 
+            this.su_stverison.DataPropertyName = "su_stverison";
+            this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.MinimumWidth = 6;
+            this.su_stverison.Name = "su_stverison";
+            this.su_stverison.Width = 125;
+            // 
+            // su_singlepringqty
+            // 
+            this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
+            this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.MinimumWidth = 6;
+            this.su_singlepringqty.Name = "su_singlepringqty";
+            this.su_singlepringqty.Width = 125;
+            // 
+            // su_table
+            // 
+            this.su_table.DataPropertyName = "su_table";
+            this.su_table.HeaderText = "板面";
+            this.su_table.MinimumWidth = 6;
+            this.su_table.Name = "su_table";
+            this.su_table.Width = 125;
+            // 
+            // su_usemacode
+            // 
+            this.su_usemacode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.su_usemacode.DataPropertyName = "su_usemacode";
+            this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.MinimumWidth = 6;
+            this.su_usemacode.Name = "su_usemacode";
+            this.su_usemacode.Width = 91;
+            // 
+            // 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(1242, 6);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            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(102, 42);
+            this.Confirm.TabIndex = 75;
+            this.Confirm.Text = "确定";
+            this.Confirm.UseVisualStyleBackColor = false;
+            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 
+            // li_code
+            // 
+            this.li_code.AllPower = null;
+            this.li_code.BackColor = System.Drawing.Color.White;
+            this.li_code.Caller = null;
+            this.li_code.Condition = null;
+            this.li_code.DBTitle = null;
+            this.li_code.FormName = null;
+            this.li_code.Location = new System.Drawing.Point(1027, 742);
+            this.li_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.li_code.Name = "li_code";
+            this.li_code.Power = null;
+            this.li_code.ReturnData = null;
+            this.li_code.SelectField = null;
+            this.li_code.SetValueField = null;
+            this.li_code.Size = new System.Drawing.Size(190, 31);
+            this.li_code.TabIndex = 74;
+            this.li_code.TableName = null;
+            this.li_code.TextBoxEnable = false;
+            // 
+            // ma_prodcode
+            // 
+            this.ma_prodcode.AllPower = null;
+            this.ma_prodcode.BackColor = System.Drawing.Color.White;
+            this.ma_prodcode.Enabled = false;
+            this.ma_prodcode.ID = null;
+            this.ma_prodcode.Location = new System.Drawing.Point(464, 13);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Power = null;
+            this.ma_prodcode.Size = new System.Drawing.Size(208, 28);
+            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(123, 13);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            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(212, 31);
+            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_NEW.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
+            // 
+            // em_code1
+            // 
+            this.em_code1.AllPower = null;
+            this.em_code1.BackColor = System.Drawing.Color.White;
+            this.em_code1.ID = null;
+            this.em_code1.Location = new System.Drawing.Point(519, 829);
+            this.em_code1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.em_code1.Name = "em_code1";
+            this.em_code1.Power = null;
+            this.em_code1.Size = new System.Drawing.Size(178, 28);
+            this.em_code1.Str = null;
+            this.em_code1.Str1 = null;
+            this.em_code1.Str2 = null;
+            this.em_code1.TabIndex = 114;
+            // 
+            // em_code1_label
+            // 
+            this.em_code1_label.AutoSize = true;
+            this.em_code1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.em_code1_label.Location = new System.Drawing.Point(399, 828);
+            this.em_code1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_code1_label.Name = "em_code1_label";
+            this.em_code1_label.Size = new System.Drawing.Size(110, 31);
+            this.em_code1_label.TabIndex = 113;
+            this.em_code1_label.Text = "人员编号";
+            // 
+            // 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(248, 888);
+            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ST_ENSIONA.Name = "ST_ENSIONA";
+            this.ST_ENSIONA.Negative = false;
+            this.ST_ENSIONA.Power = null;
+            this.ST_ENSIONA.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONA.Str = null;
+            this.ST_ENSIONA.Str1 = null;
+            this.ST_ENSIONA.Str2 = null;
+            this.ST_ENSIONA.TabIndex = 125;
+            // 
+            // 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(207, 888);
+            this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(31, 31);
+            this.ST_ENSIONA_label.TabIndex = 124;
+            this.ST_ENSIONA_label.Text = "A";
+            // 
+            // 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(540, 888);
+            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ST_ENSIONB.Name = "ST_ENSIONB";
+            this.ST_ENSIONB.Negative = false;
+            this.ST_ENSIONB.Power = null;
+            this.ST_ENSIONB.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONB.Str = null;
+            this.ST_ENSIONB.Str1 = null;
+            this.ST_ENSIONB.Str2 = null;
+            this.ST_ENSIONB.TabIndex = 123;
+            // 
+            // 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(500, 888);
+            this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(29, 31);
+            this.ST_ENSIONB_label.TabIndex = 122;
+            this.ST_ENSIONB_label.Text = "B";
+            // 
+            // 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(838, 888);
+            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ST_ENSIONC.Name = "ST_ENSIONC";
+            this.ST_ENSIONC.Negative = false;
+            this.ST_ENSIONC.Power = null;
+            this.ST_ENSIONC.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONC.Str = null;
+            this.ST_ENSIONC.Str1 = null;
+            this.ST_ENSIONC.Str2 = null;
+            this.ST_ENSIONC.TabIndex = 121;
+            // 
+            // 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(798, 888);
+            this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(30, 31);
+            this.ST_ENSIONC_label.TabIndex = 120;
+            this.ST_ENSIONC_label.Text = "C";
+            // 
+            // 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(248, 929);
+            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ST_ENSIOND.Name = "ST_ENSIOND";
+            this.ST_ENSIOND.Negative = false;
+            this.ST_ENSIOND.Power = null;
+            this.ST_ENSIOND.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIOND.Str = null;
+            this.ST_ENSIOND.Str1 = null;
+            this.ST_ENSIOND.Str2 = null;
+            this.ST_ENSIOND.TabIndex = 119;
+            // 
+            // 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(207, 929);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(32, 31);
+            this.label9.TabIndex = 118;
+            this.label9.Text = "D";
+            // 
+            // 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(540, 929);
+            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ST_ENSIONE.Name = "ST_ENSIONE";
+            this.ST_ENSIONE.Negative = false;
+            this.ST_ENSIONE.Power = null;
+            this.ST_ENSIONE.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONE.Str = null;
+            this.ST_ENSIONE.Str1 = null;
+            this.ST_ENSIONE.Str2 = null;
+            this.ST_ENSIONE.TabIndex = 117;
+            // 
+            // 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(501, 929);
+            this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(27, 31);
+            this.ST_ENSIONE_label.TabIndex = 116;
+            this.ST_ENSIONE_label.Text = "E";
+            // 
+            // 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(10, 888);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(194, 31);
+            this.label7.TabIndex = 115;
+            this.label7.Text = "张力测试结果(N)";
+            // 
+            // 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(1027, 920);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            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(102, 42);
+            this.Scrap.TabIndex = 126;
+            this.Scrap.Text = "报废";
+            this.Scrap.UseVisualStyleBackColor = false;
+            this.Scrap.Click += new System.EventHandler(this.Scrap_Click_1);
+            // 
+            // st_usecount
+            // 
+            this.st_usecount.AutoSize = true;
+            this.st_usecount.Location = new System.Drawing.Point(504, 792);
+            this.st_usecount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.st_usecount.Name = "st_usecount";
+            this.st_usecount.Size = new System.Drawing.Size(0, 18);
+            this.st_usecount.TabIndex = 127;
+            this.st_usecount.Visible = false;
+            // 
+            // normalButton1
+            // 
+            this.normalButton1.AllPower = null;
+            this.normalButton1.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
+            this.normalButton1.Image = null;
+            this.normalButton1.IsShowBorder = true;
+            this.normalButton1.Location = new System.Drawing.Point(838, 820);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
+            this.normalButton1.Name = "normalButton1";
+            this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
+            this.normalButton1.Power = null;
+            this.normalButton1.Size = new System.Drawing.Size(107, 42);
+            this.normalButton1.TabIndex = 128;
+            this.normalButton1.Text = "6小时清洗";
+            this.normalButton1.UseVisualStyleBackColor = false;
+            this.normalButton1.Click += new System.EventHandler(this.normalButton1_Click);
+            // 
+            // Make_SMTStencil
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1362, 983);
+            this.Controls.Add(this.normalButton1);
+            this.Controls.Add(this.st_usecount);
+            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.em_code1);
+            this.Controls.Add(this.em_code1_label);
+            this.Controls.Add(this.em_code);
+            this.Controls.Add(this.em_code_label);
+            this.Controls.Add(this.SU_RETURNIFCLEAN);
+            this.Controls.Add(this.su_singlepringqty1);
+            this.Controls.Add(this.su_singlepringqty1_label);
+            this.Controls.Add(this.st_table);
+            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.st_combinenumber);
+            this.Controls.Add(this.st_combinenumber_label);
+            this.Controls.Add(this.SU_DEVCODE1);
+            this.Controls.Add(this.SU_DEVCODE1_label);
+            this.Controls.Add(this.st_table_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.li_code);
+            this.Controls.Add(this.li_code_label);
+            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.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Name = "Make_SMTStencil";
+            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.TextBoxWithIcon.SearchTextBox ma_code;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private System.Windows.Forms.Label ma_prodcode_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ma_prodcode;
+        private System.Windows.Forms.Label li_code_label;
+        private CustomControl.TextBoxWithIcon.SearchTextBox li_code;
+        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 System.Windows.Forms.Label st_table_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox SU_DEVCODE1;
+        private System.Windows.Forms.Label SU_DEVCODE1_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox st_combinenumber;
+        private System.Windows.Forms.Label st_combinenumber_label;
+        private CustomControl.ButtonUtil.NormalButton Return;
+        private CustomControl.ButtonUtil.NormalButton Receive;
+        private System.Windows.Forms.Label ma_qty_label;
+        private System.Windows.Forms.Label ma_qty;
+        private CustomControl.ComBoxWithFocus.ComBoxWithFocus st_table;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox su_singlepringqty1;
+        private System.Windows.Forms.Label su_singlepringqty1_label;
+        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 CustomControl.TextBoxWithIcon.EnterTextBox em_code;
+        private System.Windows.Forms.Label em_code_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox em_code1;
+        private System.Windows.Forms.Label em_code1_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIONA;
+        private System.Windows.Forms.Label ST_ENSIONA_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIONB;
+        private System.Windows.Forms.Label ST_ENSIONB_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIONC;
+        private System.Windows.Forms.Label ST_ENSIONC_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIOND;
+        private System.Windows.Forms.Label label9;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIONE;
+        private System.Windows.Forms.Label ST_ENSIONE_label;
+        private System.Windows.Forms.Label label7;
+        private CustomControl.ButtonUtil.NormalButton Scrap;
+        private System.Windows.Forms.Label st_usecount;
+        private CustomControl.ButtonUtil.NormalButton normalButton1;
+    }
+}

+ 565 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -0,0 +1,565 @@
+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_NEW;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_SMTSStencil : Form
+    {
+
+        DataTable Dbfind;
+        bool ifUsed = false;
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataHelper dh = SystemInf.dh;
+
+        StringBuilder sql = new StringBuilder();
+
+        public Make_SMTSStencil()
+        {
+            InitializeComponent();
+            SU_DEVCODE.Enabled = false;
+            st_combinenumber.Enabled = false;
+            SU_DEVCODE1.Enabled = false;
+
+            st_table.Enabled = false;
+            su_singlepringqty1.Enabled = false;
+            Receive.Enabled = false;
+            Return.Enabled = false;
+
+            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;
+            Scrap.Enabled = false;
+
+        }
+
+        private void Make_SMTStencil_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            li_code.Text = User.UserLineCode;
+            //工单号放大镜配置
+            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.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;
+            ma_code.Controls["TextBox"].Focus();
+        }
+
+        private void Li_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = li_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
+        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)
+        {
+            if (ma_code.Text == "")
+            {
+                MessageBox.Show("工单号不能为空");
+            }
+            int WaringCount =int.Parse(dh.GetConfig("WaringCount", "Stencil").ToString());
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,st_version,nvl(st_maxusecount,0)st_maxusecount,nvl(st_usecount,0)st_usecount from Stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
+            string status = "";
+            string version = "";
+            int st_maxusecount = 0;
+            int st_usecount = 0;
+            if (dt.Rows.Count > 0)
+            {
+                status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                version = dt.Rows[0]["st_version"].ToString();
+                st_maxusecount =int.Parse( dt.Rows[0]["st_maxusecount"].ToString());
+                st_usecount = int.Parse(dt.Rows[0]["st_usecount"].ToString());
+                if (status == "在线" || status == "报废" || status == "在仓")
+                {
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法领用");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
+                return;
+            }
+            //使用次数预警
+            if (st_maxusecount - st_usecount < WaringCount)
+            {
+                string close = MessageBox.Show(this.ParentForm, "钢网已使用"+ st_usecount+",距离使用上限还有"+(st_maxusecount - st_usecount)+"次", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close != "Yes")
+                {
+                    return;
+                }
+            }
+            //限制钢网使用的产品
+            String pr_spec = dh.getFieldDataByCondition("product", "pr_spec", "pr_code = '" + ma_prodcode.Text + "'").ToString();
+            String st_vendcode = dh.getFieldDataByCondition("STENCIL", "nvl(st_vendcode,'aabbcc')", "st_code = '" + SU_DEVCODE.Text + "'").ToString();
+            if (!pr_spec.Contains(st_vendcode))
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不能在产品" + ma_prodcode.Text + "中使用");
+                return;
+            }
+            //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)
+            //{
+            //    MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不能在产品" + ma_prodcode.Text + "中使用");
+            //    return;
+            //}
+            //一条线只能在线一个钢网
+            dt = (DataTable)dh.ExecuteSql("select su_stcode from stenciluse where su_linecode='" + li_code.Text + "' and su_status='在线'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                MessageBox.Show("线别" + li_code.Text + "已有领用的钢网" + dt.Rows[0]["su_stcode"].ToString() + ",请先退回");
+                return;
+            }
+            else
+            {
+                dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + em_code.Text + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    if (int.Parse(su_singlepringqty1.Text) > 0)
+                    {
+                        string em_name = dt.Rows[0]["em_name"].ToString();
+                        sql.Clear();
+                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,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_CLEANNUMS,st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + em_code.Text + "','" + 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");
+                        MessageBox.Show("领用成功");
+                        st_table.SelectedItem = null;
+                        SU_DEVCODE.Text = "";
+                        em_code.Text = "";
+                        Receive.Enabled = false;
+                        LoadGridData();
+                    }
+                    else
+                    {
+                        MessageBox.Show("单片印刷次数必须大于0");
+                    }
+                }
+                else
+                {
+                    MessageBox.Show("人员编号" + em_code.Text + "不存在");
+                }
+            }
+        }
+
+        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 == "在仓" || 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();
+                dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + em_code1.Text + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    if (int.Parse(st_combinenumber.Text) >= 0)
+                    {
+                        sql.Clear();
+                        sql.Append("update StencilUse set 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 + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
+                        sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : 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 + "' and su_status='在线')");
+                        dh.ExecuteSql(sql.ToString(), "update");
+                        sql.Clear();
+                        sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "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 = "";
+                        em_code1.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("加工小板数必须大于等于0");
+                    }
+                }
+                else
+                {
+                    MessageBox.Show("人员编号" + em_code1.Text + "不存在");
+                }
+            }
+            else
+            {
+                MessageBox.Show("请确认是否清洗钢网");
+            }
+        }
+            else
+            {
+                MessageBox.Show("请维护完成的测试参数");
+            }
+}
+
+        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;
+                        st_table.Enabled = true;
+                        su_singlepringqty1.Enabled = true;
+                        Receive.Enabled = true;
+                        st_combinenumber.Enabled = false;
+                        SU_DEVCODE1.Enabled = false;
+                        Return.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_combinenumber.Enabled = true;
+                        Return.Enabled = true;
+                        SU_DEVCODE.Enabled = false;
+                        st_table.Enabled = false;
+                        su_singlepringqty1.Enabled = false;
+                        Receive.Enabled = false;
+                        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;
+            }
+        }
+
+        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)
+                {
+                    for (int i = 0; i < st_table.Items.Count; i++)
+                    {
+                        if (st_table.Items[i].ToString() == dt.Rows[0]["st_table"].ToString())
+                        {
+                            st_table.SelectedItem = st_table.Items[i];
+                        }
+                    }
+                    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)
+                //{
+                //    try
+                //    {
+                //        st_combinenumber.Text = (Math.Ceiling(decimal.Parse(ma_qty.Text) / decimal.Parse(dt.Rows[0][0].ToString()))).ToString();
+                //    }
+                //    catch (Exception)
+                //    {
+
+                //    }
+                //}
+                //else
+                //{
+                //    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                //}
+
+
+                 dt = (DataTable)dh.ExecuteSql("select nvl(st_usecount,0)st_usecount,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 + "不存在或者未审核");
+                }
+                else
+                {
+                    st_usecount.Text = dt.Rows[0]["st_usecount"].ToString();
+                    if (int.Parse(st_usecount.Text) > 0)
+                    {
+                        ifUsed = true;
+                    }
+                    else
+                    {
+                        ifUsed = false;
+                    }
+                }
+
+            }
+        }
+
+
+        //默认范围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))
+                    {
+                        //如果使用过张力范围39-55,使用过30-55
+                        if (ifUsed)
+                        {
+                            if (Range > 30 && Range <= 50)
+                            {
+                                CheckCount = CheckCount + 1;
+                            }
+                        }
+                        else
+                        {
+                            if (Range > 30 && Range <= 50)
+                            {
+                                CheckCount = CheckCount + 1;
+                            }
+                        }
+                    }
+                }
+            }
+            if (FillCount == 5)
+            {
+                if (CheckCount == 5)
+                {
+                    Return.Enabled = true;
+                    Scrap.Enabled = false;
+                }
+                else
+                {
+                    Return.Enabled = false;
+                    Scrap.Enabled = true;
+                }
+            }
+        }
+
+
+
+        Make_StencilScrapReason form;
+        private void Scrap_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_status from stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "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();
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+            }
+        }
+
+        private void Make_SMTStencil_Click(object sender, EventArgs e)
+        {
+            string Code = "";
+            string scrapreason = form.Controls["Reason"].Text;
+            if (scrapreason == "")
+            {
+                MessageBox.Show("报废原因不能为空");
+                return;
+            }
+            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_SCRAPMANCODE='" + User.UserCode + "',st_scrapman='" + User.UserName + "',st_scrapdate=sysdate,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 + "已报废" + ",原因" + scrapreason + ",人员" + User.UserName);
+            //}
+            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;
+            MessageBox.Show("报废成功!");
+        }
+
+        private void ma_code_TextKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Confirm.PerformClick();
+            }
+        }
+
+        private void Scrap_Click_1(object sender, EventArgs e)
+        {
+
+        }
+
+        private void normalButton1_Click(object sender, EventArgs e)
+        {
+
+                    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 == "在仓" || status == "借出")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未在线,无法操作");
+                            return;
+                        }
+                        if (status == "报废")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                return;
+                    }
+
+                            sql.Clear();
+                            sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
+                            sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+                            dh.ExecuteSql(sql.ToString(), "update");
+                            MessageBox.Show("钢网" + SU_DEVCODE1.Text + "6小时清洗成功!");
+                            SU_DEVCODE1.Text = "";
+                            st_combinenumber.Text = "";
+                            em_code1.Text = "";
+                            ST_ENSIONA.Text = "";
+                            ST_ENSIONB.Text = "";
+                            ST_ENSIONC.Text = "";
+                            ST_ENSIOND.Text = "";
+                            ST_ENSIONE.Text = "";
+                            Confirm.PerformClick();
+
+        }
+    }
+}

+ 335 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.resx

@@ -0,0 +1,335 @@
+<?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>
+  <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>
+  <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>
+  <data name="normalButton1.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="normalButton1.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="normalButton1.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>

+ 135 - 111
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -79,6 +79,7 @@
             this.label7 = new System.Windows.Forms.Label();
             this.Scrap = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.st_usecount = new System.Windows.Forms.Label();
+            this.normalButton1 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
             this.SuspendLayout();
             // 
@@ -86,10 +87,10 @@
             // 
             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(3, 11);
+            this.ms_makecode_label.Location = new System.Drawing.Point(3, 13);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
             this.ms_makecode_label.TabIndex = 68;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -97,10 +98,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(305, 11);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(343, 13);
             this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 69;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -108,10 +109,10 @@
             // 
             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(807, 618);
+            this.li_code_label.Location = new System.Drawing.Point(908, 742);
             this.li_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.li_code_label.Name = "li_code_label";
-            this.li_code_label.Size = new System.Drawing.Size(92, 27);
+            this.li_code_label.Size = new System.Drawing.Size(110, 31);
             this.li_code_label.TabIndex = 73;
             this.li_code_label.Text = "产线编号";
             // 
@@ -119,10 +120,10 @@
             // 
             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(8, 618);
-            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RadioReceive.Location = new System.Drawing.Point(9, 742);
+            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.RadioReceive.Name = "RadioReceive";
-            this.RadioReceive.Size = new System.Drawing.Size(67, 28);
+            this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
             this.RadioReceive.Text = "领用";
@@ -133,10 +134,10 @@
             // 
             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(8, 686);
-            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RadioReturn.Location = new System.Drawing.Point(9, 823);
+            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.RadioReturn.Name = "RadioReturn";
-            this.RadioReturn.Size = new System.Drawing.Size(67, 28);
+            this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
             this.RadioReturn.Text = "退回";
@@ -147,10 +148,10 @@
             // 
             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(79, 618);
+            this.SU_DEVCODE_label.Location = new System.Drawing.Point(89, 742);
             this.SU_DEVCODE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
-            this.SU_DEVCODE_label.Size = new System.Drawing.Size(92, 27);
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(110, 31);
             this.SU_DEVCODE_label.TabIndex = 81;
             this.SU_DEVCODE_label.Text = "钢网编号";
             // 
@@ -158,10 +159,10 @@
             // 
             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(355, 618);
+            this.st_table_label.Location = new System.Drawing.Point(399, 742);
             this.st_table_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_table_label.Name = "st_table_label";
-            this.st_table_label.Size = new System.Drawing.Size(63, 27);
+            this.st_table_label.Size = new System.Drawing.Size(76, 31);
             this.st_table_label.TabIndex = 83;
             this.st_table_label.Text = "Table";
             // 
@@ -169,10 +170,10 @@
             // 
             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(79, 690);
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(89, 828);
             this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
-            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(92, 27);
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(110, 31);
             this.SU_DEVCODE1_label.TabIndex = 87;
             this.SU_DEVCODE1_label.Text = "钢网编号";
             // 
@@ -180,21 +181,22 @@
             // 
             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(355, 690);
+            this.st_combinenumber_label.Location = new System.Drawing.Point(1158, 881);
             this.st_combinenumber_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_combinenumber_label.Name = "st_combinenumber_label";
-            this.st_combinenumber_label.Size = new System.Drawing.Size(112, 27);
+            this.st_combinenumber_label.Size = new System.Drawing.Size(134, 31);
             this.st_combinenumber_label.TabIndex = 89;
             this.st_combinenumber_label.Text = "加工小板数";
+            this.st_combinenumber_label.Visible = false;
             // 
             // 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(908, 11);
+            this.ma_qty_label.Location = new System.Drawing.Point(1022, 13);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(72, 27);
+            this.ma_qty_label.Size = new System.Drawing.Size(86, 31);
             this.ma_qty_label.TabIndex = 105;
             this.ma_qty_label.Text = "工单数";
             // 
@@ -202,20 +204,20 @@
             // 
             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(1007, 11);
+            this.ma_qty.Location = new System.Drawing.Point(1133, 13);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 27);
+            this.ma_qty.Size = new System.Drawing.Size(0, 31);
             this.ma_qty.TabIndex = 106;
             // 
             // su_singlepringqty1_label
             // 
             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(596, 618);
+            this.su_singlepringqty1_label.Location = new System.Drawing.Point(670, 742);
             this.su_singlepringqty1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.su_singlepringqty1_label.Name = "su_singlepringqty1_label";
-            this.su_singlepringqty1_label.Size = new System.Drawing.Size(132, 27);
+            this.su_singlepringqty1_label.Size = new System.Drawing.Size(158, 31);
             this.su_singlepringqty1_label.TabIndex = 108;
             this.su_singlepringqty1_label.Text = "单片印刷次数";
             // 
@@ -223,10 +225,10 @@
             // 
             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(923, 690);
-            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(708, 828);
+            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
-            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(104, 28);
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
             this.SU_RETURNIFCLEAN.Text = "是否清洗";
             this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
@@ -235,10 +237,10 @@
             // 
             this.em_code_label.AutoSize = true;
             this.em_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code_label.Location = new System.Drawing.Point(79, 655);
+            this.em_code_label.Location = new System.Drawing.Point(89, 786);
             this.em_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code_label.Name = "em_code_label";
-            this.em_code_label.Size = new System.Drawing.Size(92, 27);
+            this.em_code_label.Size = new System.Drawing.Size(110, 31);
             this.em_code_label.TabIndex = 111;
             this.em_code_label.Text = "人员编号";
             // 
@@ -247,11 +249,11 @@
             this.em_code.AllPower = null;
             this.em_code.BackColor = System.Drawing.Color.White;
             this.em_code.ID = null;
-            this.em_code.Location = new System.Drawing.Point(185, 656);
-            this.em_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.em_code.Location = new System.Drawing.Point(208, 787);
+            this.em_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.em_code.Name = "em_code";
             this.em_code.Power = null;
-            this.em_code.Size = new System.Drawing.Size(159, 25);
+            this.em_code.Size = new System.Drawing.Size(178, 28);
             this.em_code.Str = null;
             this.em_code.Str1 = null;
             this.em_code.Str2 = null;
@@ -262,12 +264,12 @@
             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(745, 620);
-            this.su_singlepringqty1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.su_singlepringqty1.Location = new System.Drawing.Point(838, 744);
+            this.su_singlepringqty1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.su_singlepringqty1.Name = "su_singlepringqty1";
             this.su_singlepringqty1.Negative = false;
             this.su_singlepringqty1.Power = null;
-            this.su_singlepringqty1.Size = new System.Drawing.Size(51, 25);
+            this.su_singlepringqty1.Size = new System.Drawing.Size(57, 28);
             this.su_singlepringqty1.Str = null;
             this.su_singlepringqty1.Str1 = null;
             this.su_singlepringqty1.Str2 = null;
@@ -281,10 +283,10 @@
             this.st_table.Items.AddRange(new object[] {
             "BOTTOM",
             "TOP"});
-            this.st_table.Location = new System.Drawing.Point(429, 619);
-            this.st_table.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.st_table.Location = new System.Drawing.Point(483, 743);
+            this.st_table.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.st_table.Name = "st_table";
-            this.st_table.Size = new System.Drawing.Size(160, 23);
+            this.st_table.Size = new System.Drawing.Size(180, 26);
             this.st_table.TabIndex = 107;
             // 
             // Receive
@@ -294,13 +296,13 @@
             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(1108, 611);
-            this.Receive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Receive.Location = new System.Drawing.Point(1246, 733);
+            this.Receive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(91, 35);
+            this.Receive.Size = new System.Drawing.Size(102, 42);
             this.Receive.TabIndex = 104;
             this.Receive.Text = "领用";
             this.Receive.UseVisualStyleBackColor = false;
@@ -313,13 +315,13 @@
             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(1043, 685);
-            this.Return.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Return.Location = new System.Drawing.Point(1027, 820);
+            this.Return.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(91, 35);
+            this.Return.Size = new System.Drawing.Size(102, 42);
             this.Return.TabIndex = 103;
             this.Return.Text = "退回";
             this.Return.UseVisualStyleBackColor = false;
@@ -330,26 +332,27 @@
             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(480, 691);
-            this.st_combinenumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.st_combinenumber.Location = new System.Drawing.Point(1154, 848);
+            this.st_combinenumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.st_combinenumber.Name = "st_combinenumber";
             this.st_combinenumber.Power = null;
-            this.st_combinenumber.Size = new System.Drawing.Size(159, 25);
+            this.st_combinenumber.Size = new System.Drawing.Size(178, 28);
             this.st_combinenumber.Str = null;
             this.st_combinenumber.Str1 = null;
             this.st_combinenumber.Str2 = null;
             this.st_combinenumber.TabIndex = 90;
+            this.st_combinenumber.Visible = false;
             // 
             // 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(185, 691);
-            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(208, 829);
+            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
-            this.SU_DEVCODE1.Size = new System.Drawing.Size(159, 25);
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(178, 28);
             this.SU_DEVCODE1.Str = null;
             this.SU_DEVCODE1.Str1 = null;
             this.SU_DEVCODE1.Str2 = null;
@@ -361,11 +364,11 @@
             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(185, 619);
-            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SU_DEVCODE.Location = new System.Drawing.Point(208, 743);
+            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_DEVCODE.Name = "SU_DEVCODE";
             this.SU_DEVCODE.Power = null;
-            this.SU_DEVCODE.Size = new System.Drawing.Size(159, 25);
+            this.SU_DEVCODE.Size = new System.Drawing.Size(178, 28);
             this.SU_DEVCODE.Str = null;
             this.SU_DEVCODE.Str1 = null;
             this.SU_DEVCODE.Str2 = null;
@@ -386,12 +389,12 @@
             this.su_table,
             this.su_usemacode});
             this.ToolsBom.EnableContentClick = true;
-            this.ToolsBom.Location = new System.Drawing.Point(0, 48);
-            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ToolsBom.Location = new System.Drawing.Point(0, 58);
+            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ToolsBom.Name = "ToolsBom";
             this.ToolsBom.RowHeadersWidth = 51;
             this.ToolsBom.RowTemplate.Height = 27;
-            this.ToolsBom.Size = new System.Drawing.Size(1208, 559);
+            this.ToolsBom.Size = new System.Drawing.Size(1359, 671);
             this.ToolsBom.TabIndex = 76;
             // 
             // su_stcode
@@ -457,7 +460,7 @@
             this.su_usemacode.HeaderText = "领用工单";
             this.su_usemacode.MinimumWidth = 6;
             this.su_usemacode.Name = "su_usemacode";
-            this.su_usemacode.Width = 75;
+            this.su_usemacode.Width = 91;
             // 
             // Confirm
             // 
@@ -466,13 +469,13 @@
             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(1104, 5);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Location = new System.Drawing.Point(1242, 6);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(91, 35);
+            this.Confirm.Size = new System.Drawing.Size(102, 42);
             this.Confirm.TabIndex = 75;
             this.Confirm.Text = "确定";
             this.Confirm.UseVisualStyleBackColor = false;
@@ -486,14 +489,14 @@
             this.li_code.Condition = null;
             this.li_code.DBTitle = null;
             this.li_code.FormName = null;
-            this.li_code.Location = new System.Drawing.Point(913, 618);
-            this.li_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.li_code.Location = new System.Drawing.Point(1027, 742);
+            this.li_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.li_code.Name = "li_code";
             this.li_code.Power = null;
             this.li_code.ReturnData = null;
             this.li_code.SelectField = null;
             this.li_code.SetValueField = null;
-            this.li_code.Size = new System.Drawing.Size(169, 26);
+            this.li_code.Size = new System.Drawing.Size(190, 31);
             this.li_code.TabIndex = 74;
             this.li_code.TableName = null;
             this.li_code.TextBoxEnable = false;
@@ -504,11 +507,11 @@
             this.ma_prodcode.BackColor = System.Drawing.Color.White;
             this.ma_prodcode.Enabled = false;
             this.ma_prodcode.ID = null;
-            this.ma_prodcode.Location = new System.Drawing.Point(412, 11);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_prodcode.Location = new System.Drawing.Point(464, 13);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(185, 25);
+            this.ma_prodcode.Size = new System.Drawing.Size(208, 28);
             this.ma_prodcode.Str = null;
             this.ma_prodcode.Str1 = null;
             this.ma_prodcode.Str2 = null;
@@ -521,14 +524,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(109, 11);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_code.Location = new System.Drawing.Point(123, 13);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(188, 26);
+            this.ma_code.Size = new System.Drawing.Size(212, 31);
             this.ma_code.TabIndex = 71;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -540,11 +543,11 @@
             this.em_code1.AllPower = null;
             this.em_code1.BackColor = System.Drawing.Color.White;
             this.em_code1.ID = null;
-            this.em_code1.Location = new System.Drawing.Point(755, 691);
-            this.em_code1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.em_code1.Location = new System.Drawing.Point(519, 829);
+            this.em_code1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.em_code1.Name = "em_code1";
             this.em_code1.Power = null;
-            this.em_code1.Size = new System.Drawing.Size(159, 25);
+            this.em_code1.Size = new System.Drawing.Size(178, 28);
             this.em_code1.Str = null;
             this.em_code1.Str1 = null;
             this.em_code1.Str2 = null;
@@ -554,10 +557,10 @@
             // 
             this.em_code1_label.AutoSize = true;
             this.em_code1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code1_label.Location = new System.Drawing.Point(648, 690);
+            this.em_code1_label.Location = new System.Drawing.Point(399, 828);
             this.em_code1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code1_label.Name = "em_code1_label";
-            this.em_code1_label.Size = new System.Drawing.Size(92, 27);
+            this.em_code1_label.Size = new System.Drawing.Size(110, 31);
             this.em_code1_label.TabIndex = 113;
             this.em_code1_label.Text = "人员编号";
             // 
@@ -566,12 +569,12 @@
             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(220, 740);
-            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ST_ENSIONA.Location = new System.Drawing.Point(248, 888);
+            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ST_ENSIONA.Name = "ST_ENSIONA";
             this.ST_ENSIONA.Negative = false;
             this.ST_ENSIONA.Power = null;
-            this.ST_ENSIONA.Size = new System.Drawing.Size(159, 25);
+            this.ST_ENSIONA.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONA.Str = null;
             this.ST_ENSIONA.Str1 = null;
             this.ST_ENSIONA.Str2 = null;
@@ -581,10 +584,10 @@
             // 
             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(184, 740);
+            this.ST_ENSIONA_label.Location = new System.Drawing.Point(207, 888);
             this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
-            this.ST_ENSIONA_label.Size = new System.Drawing.Size(26, 27);
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(31, 31);
             this.ST_ENSIONA_label.TabIndex = 124;
             this.ST_ENSIONA_label.Text = "A";
             // 
@@ -593,12 +596,12 @@
             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(480, 740);
-            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ST_ENSIONB.Location = new System.Drawing.Point(540, 888);
+            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ST_ENSIONB.Name = "ST_ENSIONB";
             this.ST_ENSIONB.Negative = false;
             this.ST_ENSIONB.Power = null;
-            this.ST_ENSIONB.Size = new System.Drawing.Size(159, 25);
+            this.ST_ENSIONB.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONB.Str = null;
             this.ST_ENSIONB.Str1 = null;
             this.ST_ENSIONB.Str2 = null;
@@ -608,10 +611,10 @@
             // 
             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(444, 740);
+            this.ST_ENSIONB_label.Location = new System.Drawing.Point(500, 888);
             this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
-            this.ST_ENSIONB_label.Size = new System.Drawing.Size(25, 27);
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(29, 31);
             this.ST_ENSIONB_label.TabIndex = 122;
             this.ST_ENSIONB_label.Text = "B";
             // 
@@ -620,12 +623,12 @@
             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(745, 740);
-            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ST_ENSIONC.Location = new System.Drawing.Point(838, 888);
+            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ST_ENSIONC.Name = "ST_ENSIONC";
             this.ST_ENSIONC.Negative = false;
             this.ST_ENSIONC.Power = null;
-            this.ST_ENSIONC.Size = new System.Drawing.Size(159, 25);
+            this.ST_ENSIONC.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONC.Str = null;
             this.ST_ENSIONC.Str1 = null;
             this.ST_ENSIONC.Str2 = null;
@@ -635,10 +638,10 @@
             // 
             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(709, 740);
+            this.ST_ENSIONC_label.Location = new System.Drawing.Point(798, 888);
             this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
-            this.ST_ENSIONC_label.Size = new System.Drawing.Size(25, 27);
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(30, 31);
             this.ST_ENSIONC_label.TabIndex = 120;
             this.ST_ENSIONC_label.Text = "C";
             // 
@@ -647,12 +650,12 @@
             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(220, 774);
-            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ST_ENSIOND.Location = new System.Drawing.Point(248, 929);
+            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ST_ENSIOND.Name = "ST_ENSIOND";
             this.ST_ENSIOND.Negative = false;
             this.ST_ENSIOND.Power = null;
-            this.ST_ENSIOND.Size = new System.Drawing.Size(159, 25);
+            this.ST_ENSIOND.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIOND.Str = null;
             this.ST_ENSIOND.Str1 = null;
             this.ST_ENSIOND.Str2 = null;
@@ -662,10 +665,10 @@
             // 
             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(184, 774);
+            this.label9.Location = new System.Drawing.Point(207, 929);
             this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(27, 27);
+            this.label9.Size = new System.Drawing.Size(32, 31);
             this.label9.TabIndex = 118;
             this.label9.Text = "D";
             // 
@@ -674,12 +677,12 @@
             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(480, 774);
-            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ST_ENSIONE.Location = new System.Drawing.Point(540, 929);
+            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ST_ENSIONE.Name = "ST_ENSIONE";
             this.ST_ENSIONE.Negative = false;
             this.ST_ENSIONE.Power = null;
-            this.ST_ENSIONE.Size = new System.Drawing.Size(159, 25);
+            this.ST_ENSIONE.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONE.Str = null;
             this.ST_ENSIONE.Str1 = null;
             this.ST_ENSIONE.Str2 = null;
@@ -689,10 +692,10 @@
             // 
             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(445, 774);
+            this.ST_ENSIONE_label.Location = new System.Drawing.Point(501, 929);
             this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
-            this.ST_ENSIONE_label.Size = new System.Drawing.Size(23, 27);
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(27, 31);
             this.ST_ENSIONE_label.TabIndex = 116;
             this.ST_ENSIONE_label.Text = "E";
             // 
@@ -700,10 +703,10 @@
             // 
             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(9, 740);
+            this.label7.Location = new System.Drawing.Point(10, 888);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(162, 27);
+            this.label7.Size = new System.Drawing.Size(194, 31);
             this.label7.TabIndex = 115;
             this.label7.Text = "张力测试结果(N)";
             // 
@@ -714,13 +717,13 @@
             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(1043, 768);
-            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Scrap.Location = new System.Drawing.Point(1027, 920);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(91, 35);
+            this.Scrap.Size = new System.Drawing.Size(102, 42);
             this.Scrap.TabIndex = 126;
             this.Scrap.Text = "报废";
             this.Scrap.UseVisualStyleBackColor = false;
@@ -729,18 +732,38 @@
             // st_usecount
             // 
             this.st_usecount.AutoSize = true;
-            this.st_usecount.Location = new System.Drawing.Point(448, 660);
+            this.st_usecount.Location = new System.Drawing.Point(504, 792);
             this.st_usecount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_usecount.Name = "st_usecount";
-            this.st_usecount.Size = new System.Drawing.Size(0, 15);
+            this.st_usecount.Size = new System.Drawing.Size(0, 18);
             this.st_usecount.TabIndex = 127;
             this.st_usecount.Visible = false;
             // 
+            // normalButton1
+            // 
+            this.normalButton1.AllPower = null;
+            this.normalButton1.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
+            this.normalButton1.Image = null;
+            this.normalButton1.IsShowBorder = true;
+            this.normalButton1.Location = new System.Drawing.Point(838, 820);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
+            this.normalButton1.Name = "normalButton1";
+            this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
+            this.normalButton1.Power = null;
+            this.normalButton1.Size = new System.Drawing.Size(107, 42);
+            this.normalButton1.TabIndex = 128;
+            this.normalButton1.Text = "6小时清洗";
+            this.normalButton1.UseVisualStyleBackColor = false;
+            this.normalButton1.Click += new System.EventHandler(this.normalButton1_Click);
+            // 
             // Make_SMTStencil
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1211, 819);
+            this.ClientSize = new System.Drawing.Size(1362, 983);
+            this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.st_usecount);
             this.Controls.Add(this.Scrap);
             this.Controls.Add(this.ST_ENSIONA);
@@ -784,7 +807,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_SMTStencil";
             this.Tag = "Make!SMTStencil";
             this.Text = "Make_SMTStencil";
@@ -848,5 +871,6 @@
         private System.Windows.Forms.Label label7;
         private CustomControl.ButtonUtil.NormalButton Scrap;
         private System.Windows.Forms.Label st_usecount;
+        private CustomControl.ButtonUtil.NormalButton normalButton1;
     }
 }

+ 68 - 27
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -117,7 +117,7 @@ namespace UAS_MES_NEW.Make
                 version = dt.Rows[0]["st_version"].ToString();
                 st_maxusecount =int.Parse( dt.Rows[0]["st_maxusecount"].ToString());
                 st_usecount = int.Parse(dt.Rows[0]["st_usecount"].ToString());
-                if (status == "在线" || status == "报废"/* || status == "在仓"*/)
+                if (status == "在线" || status == "报废" || status == "在仓")
                 {
                     MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法领用");
                     return;
@@ -221,15 +221,15 @@ namespace UAS_MES_NEW.Make
                 dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + em_code1.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    if (int.Parse(st_combinenumber.Text) >= 0)
-                    {
+                    //if (int.Parse(st_combinenumber.Text) >= 0)
+                    //{
                         sql.Clear();
                         sql.Append("update StencilUse set 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 + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
-                        sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
+                        sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.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 + "' and su_status='在线')");
                         dh.ExecuteSql(sql.ToString(), "update");
                         sql.Clear();
-                        sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='在仓' where st_code='" + SU_DEVCODE1.Text + "'");
+                        sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "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 = "";
@@ -243,11 +243,11 @@ namespace UAS_MES_NEW.Make
                             SU_RETURNIFCLEAN.Checked = false;
                             Return.Enabled = false;
                             Confirm.PerformClick();
-                    }
-                    else
-                    {
-                        MessageBox.Show("加工小板数必须大于等于0");
-                    }
+                    //}
+                    //else
+                    //{
+                    //    MessageBox.Show("加工小板数必须大于等于0");
+                    //}
                 }
                 else
                 {
@@ -346,21 +346,21 @@ namespace UAS_MES_NEW.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 + "' and st_statuscode='AUDITED'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    try
-                    {
-                        st_combinenumber.Text = (Math.Ceiling(decimal.Parse(ma_qty.Text) / decimal.Parse(dt.Rows[0][0].ToString()))).ToString();
-                    }
-                    catch (Exception)
-                    {
-
-                    }
-                }
-                else
-                {
-                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
-                }
+                //if (dt.Rows.Count > 0)
+                //{
+                //    try
+                //    {
+                //        st_combinenumber.Text = (Math.Ceiling(decimal.Parse(ma_qty.Text) / decimal.Parse(dt.Rows[0][0].ToString()))).ToString();
+                //    }
+                //    catch (Exception)
+                //    {
+
+                //    }
+                //}
+                //else
+                //{
+                //    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                //}
 
 
                  dt = (DataTable)dh.ExecuteSql("select nvl(st_usecount,0)st_usecount,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");
@@ -407,14 +407,14 @@ namespace UAS_MES_NEW.Make
                         //如果使用过张力范围39-55,使用过30-55
                         if (ifUsed)
                         {
-                            if (Range > 30 && Range <= 55)
+                            if (Range > 30 && Range <= 50)
                             {
                                 CheckCount = CheckCount + 1;
                             }
                         }
                         else
                         {
-                            if (Range > 30 && Range <= 55)
+                            if (Range > 30 && Range <= 50)
                             {
                                 CheckCount = CheckCount + 1;
                             }
@@ -520,5 +520,46 @@ namespace UAS_MES_NEW.Make
         {
 
         }
+
+        private void normalButton1_Click(object sender, EventArgs e)
+        {
+
+                    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 == "在仓" || status == "借出")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未在线,无法操作");
+                            return;
+                        }
+                        if (status == "报废")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                return;
+                    }
+
+                            sql.Clear();
+                            sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
+                            sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+                            dh.ExecuteSql(sql.ToString(), "update");
+                            MessageBox.Show("钢网" + SU_DEVCODE1.Text + "6小时清洗成功!");
+                            SU_DEVCODE1.Text = "";
+                            st_combinenumber.Text = "";
+                            em_code1.Text = "";
+                            ST_ENSIONA.Text = "";
+                            ST_ENSIONB.Text = "";
+                            ST_ENSIONC.Text = "";
+                            ST_ENSIOND.Text = "";
+                            ST_ENSIONE.Text = "";
+                            Confirm.PerformClick();
+
+        }
     }
 }

+ 38 - 24
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.resx

@@ -218,30 +218,6 @@
   <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>
-  <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
@@ -316,6 +292,44 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="normalButton1.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="normalButton1.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="normalButton1.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>

+ 686 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.Designer.cs

@@ -0,0 +1,686 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_SMTStockSStencil
+    {
+        /// <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_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.Return = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.Scrap = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.ST_ENSIONA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIOND = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.SU_DEVCODE1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ToolsBom = new UAS_MES_NEW.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_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.ma_prodcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.st_usecount = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            ((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(4, 645);
+            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4);
+            this.RadioReceive.Name = "RadioReceive";
+            this.RadioReceive.Size = new System.Drawing.Size(79, 32);
+            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(4, 687);
+            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4);
+            this.RadioReturn.Name = "RadioReturn";
+            this.RadioReturn.Size = new System.Drawing.Size(79, 32);
+            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(84, 645);
+            this.SU_DEVCODE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(110, 31);
+            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(84, 690);
+            this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(110, 31);
+            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(1052, 646);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(194, 31);
+            this.label7.TabIndex = 91;
+            this.label7.Text = "张力测试结果(N)";
+            this.label7.Visible = false;
+            // 
+            // 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(1497, 686);
+            this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(27, 31);
+            this.ST_ENSIONE_label.TabIndex = 92;
+            this.ST_ENSIONE_label.Text = "E";
+            this.ST_ENSIONE_label.Visible = false;
+            // 
+            // 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(1249, 686);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(32, 31);
+            this.label9.TabIndex = 94;
+            this.label9.Text = "D";
+            this.label9.Visible = false;
+            // 
+            // 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(1742, 646);
+            this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(30, 31);
+            this.ST_ENSIONC_label.TabIndex = 96;
+            this.ST_ENSIONC_label.Text = "C";
+            this.ST_ENSIONC_label.Visible = false;
+            // 
+            // 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(1496, 646);
+            this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(29, 31);
+            this.ST_ENSIONB_label.TabIndex = 98;
+            this.ST_ENSIONB_label.Text = "B";
+            this.ST_ENSIONB_label.Visible = false;
+            // 
+            // 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(1249, 646);
+            this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(31, 31);
+            this.ST_ENSIONA_label.TabIndex = 100;
+            this.ST_ENSIONA_label.Text = "A";
+            this.ST_ENSIONA_label.Visible = false;
+            // 
+            // SU_RETURNIFCLEAN
+            // 
+            this.SU_RETURNIFCLEAN.AutoSize = true;
+            this.SU_RETURNIFCLEAN.Checked = true;
+            this.SU_RETURNIFCLEAN.CheckState = System.Windows.Forms.CheckState.Checked;
+            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(400, 688);
+            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4);
+            this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
+            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(344, 14);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode_label.Name = "ma_prodcode_label";
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
+            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(1132, 14);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 31);
+            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(1022, 14);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(86, 31);
+            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(3, 14);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            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(400, 644);
+            this.Receive.Margin = new System.Windows.Forms.Padding(4);
+            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(102, 42);
+            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(734, 679);
+            this.Return.Margin = new System.Windows.Forms.Padding(4);
+            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(102, 42);
+            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(863, 679);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4);
+            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(102, 42);
+            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(1289, 646);
+            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONA.Name = "ST_ENSIONA";
+            this.ST_ENSIONA.Negative = false;
+            this.ST_ENSIONA.Power = null;
+            this.ST_ENSIONA.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONA.Str = null;
+            this.ST_ENSIONA.Str1 = null;
+            this.ST_ENSIONA.Str2 = null;
+            this.ST_ENSIONA.TabIndex = 101;
+            this.ST_ENSIONA.Visible = false;
+            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(1537, 646);
+            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONB.Name = "ST_ENSIONB";
+            this.ST_ENSIONB.Negative = false;
+            this.ST_ENSIONB.Power = null;
+            this.ST_ENSIONB.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONB.Str = null;
+            this.ST_ENSIONB.Str1 = null;
+            this.ST_ENSIONB.Str2 = null;
+            this.ST_ENSIONB.TabIndex = 99;
+            this.ST_ENSIONB.Visible = false;
+            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(1783, 646);
+            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONC.Name = "ST_ENSIONC";
+            this.ST_ENSIONC.Negative = false;
+            this.ST_ENSIONC.Power = null;
+            this.ST_ENSIONC.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONC.Str = null;
+            this.ST_ENSIONC.Str1 = null;
+            this.ST_ENSIONC.Str2 = null;
+            this.ST_ENSIONC.TabIndex = 97;
+            this.ST_ENSIONC.Visible = false;
+            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(1289, 686);
+            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIOND.Name = "ST_ENSIOND";
+            this.ST_ENSIOND.Negative = false;
+            this.ST_ENSIOND.Power = null;
+            this.ST_ENSIOND.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIOND.Str = null;
+            this.ST_ENSIOND.Str1 = null;
+            this.ST_ENSIOND.Str2 = null;
+            this.ST_ENSIOND.TabIndex = 95;
+            this.ST_ENSIOND.Visible = false;
+            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(1537, 686);
+            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONE.Name = "ST_ENSIONE";
+            this.ST_ENSIONE.Negative = false;
+            this.ST_ENSIONE.Power = null;
+            this.ST_ENSIONE.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONE.Str = null;
+            this.ST_ENSIONE.Str1 = null;
+            this.ST_ENSIONE.Str2 = null;
+            this.ST_ENSIONE.TabIndex = 93;
+            this.ST_ENSIONE.Visible = false;
+            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(204, 692);
+            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4);
+            this.SU_DEVCODE1.Name = "SU_DEVCODE1";
+            this.SU_DEVCODE1.Power = null;
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(178, 28);
+            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(204, 646);
+            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4);
+            this.SU_DEVCODE.Name = "SU_DEVCODE";
+            this.SU_DEVCODE.Power = null;
+            this.SU_DEVCODE.Size = new System.Drawing.Size(178, 28);
+            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, 57);
+            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4);
+            this.ToolsBom.Name = "ToolsBom";
+            this.ToolsBom.RowHeadersWidth = 62;
+            this.ToolsBom.RowTemplate.Height = 27;
+            this.ToolsBom.Size = new System.Drawing.Size(1359, 576);
+            this.ToolsBom.TabIndex = 76;
+            // 
+            // su_stcode
+            // 
+            this.su_stcode.DataPropertyName = "su_stcode";
+            this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.MinimumWidth = 8;
+            this.su_stcode.Name = "su_stcode";
+            this.su_stcode.Width = 150;
+            // 
+            // st_pcbcode
+            // 
+            this.st_pcbcode.DataPropertyName = "st_pcbcode";
+            this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.MinimumWidth = 8;
+            this.st_pcbcode.Name = "st_pcbcode";
+            this.st_pcbcode.Width = 150;
+            // 
+            // su_status
+            // 
+            this.su_status.DataPropertyName = "su_status";
+            this.su_status.HeaderText = "领用状态";
+            this.su_status.MinimumWidth = 8;
+            this.su_status.Name = "su_status";
+            this.su_status.Width = 150;
+            // 
+            // SU_LINECODE
+            // 
+            this.SU_LINECODE.DataPropertyName = "SU_LINECODE";
+            this.SU_LINECODE.HeaderText = "线别";
+            this.SU_LINECODE.MinimumWidth = 8;
+            this.SU_LINECODE.Name = "SU_LINECODE";
+            this.SU_LINECODE.Width = 150;
+            // 
+            // su_stverison
+            // 
+            this.su_stverison.DataPropertyName = "su_stverison";
+            this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.MinimumWidth = 8;
+            this.su_stverison.Name = "su_stverison";
+            this.su_stverison.Width = 150;
+            // 
+            // su_singlepringqty
+            // 
+            this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
+            this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.MinimumWidth = 8;
+            this.su_singlepringqty.Name = "su_singlepringqty";
+            this.su_singlepringqty.Width = 150;
+            // 
+            // su_table
+            // 
+            this.su_table.DataPropertyName = "su_table";
+            this.su_table.HeaderText = "板面";
+            this.su_table.MinimumWidth = 8;
+            this.su_table.Name = "su_table";
+            this.su_table.Width = 150;
+            // 
+            // su_usemacode
+            // 
+            this.su_usemacode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.su_usemacode.DataPropertyName = "su_usemacode";
+            this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.MinimumWidth = 8;
+            this.su_usemacode.Name = "su_usemacode";
+            this.su_usemacode.Width = 91;
+            // 
+            // 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(1242, 6);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(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(102, 42);
+            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(464, 14);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Power = null;
+            this.ma_prodcode.Size = new System.Drawing.Size(208, 28);
+            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(123, 14);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(212, 32);
+            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_NEW.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
+            // 
+            // st_usecount
+            // 
+            this.st_usecount.AutoSize = true;
+            this.st_usecount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.st_usecount.Location = new System.Drawing.Point(714, 692);
+            this.st_usecount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.st_usecount.Name = "st_usecount";
+            this.st_usecount.Size = new System.Drawing.Size(0, 31);
+            this.st_usecount.TabIndex = 112;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(536, 690);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(158, 31);
+            this.label2.TabIndex = 111;
+            this.label2.Text = "累计使用次数";
+            // 
+            // Make_SMTStockStencil
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1362, 743);
+            this.Controls.Add(this.st_usecount);
+            this.Controls.Add(this.label2);
+            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.Margin = new System.Windows.Forms.Padding(4);
+            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.NumOnlyTextBox ST_ENSIONE;
+        private System.Windows.Forms.Label ST_ENSIONE_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIOND;
+        private System.Windows.Forms.Label label9;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIONC;
+        private System.Windows.Forms.Label ST_ENSIONC_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox ST_ENSIONB;
+        private System.Windows.Forms.Label ST_ENSIONB_label;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox 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;
+        private System.Windows.Forms.Label st_usecount;
+        private System.Windows.Forms.Label label2;
+    }
+}

+ 392 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.cs

@@ -0,0 +1,392 @@
+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_NEW;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_SMTStockSStencil : Form
+    {
+
+        DataTable Dbfind;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataHelper dh = SystemInf.dh;
+
+        StringBuilder sql = new StringBuilder();
+
+        bool ifUsed = false;
+
+        public Make_SMTStockSStencil()
+        {
+            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;
+
+            SU_DEVCODE.Focus();
+
+        }
+
+        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,nvl(st_maxusecount,0)st_maxusecount,nvl(st_usecount,0)st_usecount from Stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED'", "select");
+            int WaringCount = int.Parse(dh.GetConfig("WaringCount", "Stencil").ToString());
+            int st_maxusecount = 0;
+            int st_usecount = 0;
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                st_maxusecount = int.Parse(dt.Rows[0]["st_maxusecount"].ToString());
+                st_usecount = int.Parse(dt.Rows[0]["st_usecount"].ToString());
+                if (status == "借出" || status == "报废" || status == "在线")
+                {
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法领用");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
+                return;
+            }
+            //使用次数预警
+            if (st_maxusecount - st_usecount < WaringCount)
+            {
+                string close = MessageBox.Show(this.ParentForm, "钢网已使用" + st_usecount + ",距离使用上限还有" + (st_maxusecount - st_usecount) + "次", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close != "Yes")
+                {
+                    return;
+                }
+            }
+            sql.Clear();
+            sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS,SU_CLEANNUMS,su_usedate)");
+            sql.Append("select StencilUse_seq.nextval,st_id,'" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "'");
+            sql.Append(",st_version,'借出',ST_CLEANNUMS,sysdate 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)
+        {
+
+
+                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,nvl(St_USECOUNT,0)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_DEVCODE1.Text + "处于在线状态,无法退回");
+                            return;
+                        }
+                        if (status == "在仓")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE1.Text + "未借出,无需归还");
+                            return;
+                        }
+                        if (status == "报废")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE1.Text + "处于" + status + "状态,无法退回");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                        return;
+                    }
+                    sql.Clear();
+                    sql.Append("update StencilUse set SU_CLEANNUMS = nvl(SU_CLEANNUMS,0)+1,su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=sysdate ,su_backdate=sysdate,");
+                    sql.Append(" 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 + "' and su_status='借出' and su_stockusedate is not null)");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    sql.Clear();
+                    sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_USESTATUS='在仓'");
+                    sql.Append("  ");
+                    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 = "";
+                    Confirm.PerformClick();
+
+        }
+
+        Make_StencilScrapReason form;
+        private void Scrap_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_status from stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "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();
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+            }
+        }
+
+        private void Make_SMTStencil_Click(object sender, EventArgs e)
+        {
+            string Code = "";
+            string scrapreason = form.Controls["Reason"].Text;
+            if (scrapreason == "")
+            {
+                MessageBox.Show("报废原因不能为空");
+                return;
+            }
+            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_SCRAPMANCODE='" + User.UserCode + "',st_scrapman='" + User.UserName + "',st_scrapdate=sysdate,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 + "已报废" + ",原因" + scrapreason + ",人员" + User.UserName);
+            //}
+            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;
+            MessageBox.Show("报废成功!");
+        }
+
+        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;
+                        Return.Enabled = true;
+                        Scrap.Enabled = true;
+                    }
+                    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))
+                    {
+                        //如果使用过张力范围39-55,使用过30-55
+                        if (ifUsed)
+                        {
+                            if (Range > 30 && Range <= 55)
+                            {
+                                CheckCount = CheckCount + 1;
+                            }
+                        }
+                        else
+                        {
+                            if (Range > 30 && 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 nvl(st_usecount,0)st_usecount,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 + "不存在或者未审核");
+                }
+                else
+                {
+                    st_usecount.Text = dt.Rows[0]["st_usecount"].ToString();
+                    if (int.Parse(st_usecount.Text) > 0)
+                    {
+                        ifUsed = true;
+                    }
+                    else
+                    {
+                        ifUsed = false;
+                    }
+                }
+            }
+        }
+
+        private void ma_code_TextKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Confirm.PerformClick();
+            }
+        }
+    }
+}

+ 321 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.resx

@@ -0,0 +1,321 @@
+<?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>
+  <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>

+ 126 - 65
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.Designer.cs

@@ -75,9 +75,10 @@
             // 
             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(4, 645);
+            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4);
             this.RadioReceive.Name = "RadioReceive";
-            this.RadioReceive.Size = new System.Drawing.Size(55, 24);
+            this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
             this.RadioReceive.Text = "领用";
@@ -88,9 +89,10 @@
             // 
             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.Location = new System.Drawing.Point(4, 687);
+            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4);
             this.RadioReturn.Name = "RadioReturn";
-            this.RadioReturn.Size = new System.Drawing.Size(55, 24);
+            this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
             this.RadioReturn.Text = "退回";
@@ -101,9 +103,10 @@
             // 
             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(84, 645);
+            this.SU_DEVCODE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
-            this.SU_DEVCODE_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(110, 31);
             this.SU_DEVCODE_label.TabIndex = 81;
             this.SU_DEVCODE_label.Text = "钢网编号";
             // 
@@ -111,9 +114,10 @@
             // 
             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(84, 690);
+            this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
-            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(110, 31);
             this.SU_DEVCODE1_label.TabIndex = 87;
             this.SU_DEVCODE1_label.Text = "钢网编号";
             // 
@@ -121,69 +125,84 @@
             // 
             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.Location = new System.Drawing.Point(1052, 646);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(129, 21);
+            this.label7.Size = new System.Drawing.Size(194, 31);
             this.label7.TabIndex = 91;
             this.label7.Text = "张力测试结果(N)";
+            this.label7.Visible = false;
             // 
             // 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.Location = new System.Drawing.Point(1497, 686);
+            this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
-            this.ST_ENSIONE_label.Size = new System.Drawing.Size(19, 21);
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(27, 31);
             this.ST_ENSIONE_label.TabIndex = 92;
             this.ST_ENSIONE_label.Text = "E";
+            this.ST_ENSIONE_label.Visible = false;
             // 
             // 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.Location = new System.Drawing.Point(1249, 686);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(22, 21);
+            this.label9.Size = new System.Drawing.Size(32, 31);
             this.label9.TabIndex = 94;
             this.label9.Text = "D";
+            this.label9.Visible = false;
             // 
             // 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.Location = new System.Drawing.Point(1742, 646);
+            this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
-            this.ST_ENSIONC_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(30, 31);
             this.ST_ENSIONC_label.TabIndex = 96;
             this.ST_ENSIONC_label.Text = "C";
+            this.ST_ENSIONC_label.Visible = false;
             // 
             // 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.Location = new System.Drawing.Point(1496, 646);
+            this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
-            this.ST_ENSIONB_label.Size = new System.Drawing.Size(20, 21);
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(29, 31);
             this.ST_ENSIONB_label.TabIndex = 98;
             this.ST_ENSIONB_label.Text = "B";
+            this.ST_ENSIONB_label.Visible = false;
             // 
             // 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.Location = new System.Drawing.Point(1249, 646);
+            this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
-            this.ST_ENSIONA_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(31, 31);
             this.ST_ENSIONA_label.TabIndex = 100;
             this.ST_ENSIONA_label.Text = "A";
+            this.ST_ENSIONA_label.Visible = false;
             // 
             // SU_RETURNIFCLEAN
             // 
             this.SU_RETURNIFCLEAN.AutoSize = true;
+            this.SU_RETURNIFCLEAN.Checked = true;
+            this.SU_RETURNIFCLEAN.CheckState = System.Windows.Forms.CheckState.Checked;
             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.Location = new System.Drawing.Point(400, 688);
+            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
-            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(84, 24);
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
             this.SU_RETURNIFCLEAN.Text = "是否清洗";
             this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
@@ -192,9 +211,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(229, 9);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(344, 14);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 69;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -202,18 +222,20 @@
             // 
             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.Location = new System.Drawing.Point(1132, 14);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 31);
             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.Location = new System.Drawing.Point(1022, 14);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(58, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(86, 31);
             this.ma_qty_label.TabIndex = 105;
             this.ma_qty_label.Text = "工单数";
             // 
@@ -221,9 +243,10 @@
             // 
             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.Location = new System.Drawing.Point(3, 14);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
             this.ms_makecode_label.TabIndex = 68;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -234,12 +257,13 @@
             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.Location = new System.Drawing.Point(400, 644);
+            this.Receive.Margin = new System.Windows.Forms.Padding(4);
             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.Size = new System.Drawing.Size(102, 42);
             this.Receive.TabIndex = 104;
             this.Receive.Text = "领用";
             this.Receive.UseVisualStyleBackColor = false;
@@ -252,12 +276,13 @@
             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(734, 679);
+            this.Return.Margin = new System.Windows.Forms.Padding(4);
             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.Size = new System.Drawing.Size(102, 42);
             this.Return.TabIndex = 103;
             this.Return.Tag = "Make!SMTStockStencil";
             this.Return.Text = "退回";
@@ -271,12 +296,13 @@
             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.Location = new System.Drawing.Point(863, 679);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4);
             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.Size = new System.Drawing.Size(102, 42);
             this.Scrap.TabIndex = 102;
             this.Scrap.Text = "报废";
             this.Scrap.UseVisualStyleBackColor = false;
@@ -287,15 +313,17 @@
             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.Location = new System.Drawing.Point(1289, 646);
+            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4);
             this.ST_ENSIONA.Name = "ST_ENSIONA";
             this.ST_ENSIONA.Negative = false;
             this.ST_ENSIONA.Power = null;
-            this.ST_ENSIONA.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONA.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONA.Str = null;
             this.ST_ENSIONA.Str1 = null;
             this.ST_ENSIONA.Str2 = null;
             this.ST_ENSIONA.TabIndex = 101;
+            this.ST_ENSIONA.Visible = false;
             this.ST_ENSIONA.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
             // 
             // ST_ENSIONB
@@ -303,15 +331,17 @@
             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.Location = new System.Drawing.Point(1537, 646);
+            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4);
             this.ST_ENSIONB.Name = "ST_ENSIONB";
             this.ST_ENSIONB.Negative = false;
             this.ST_ENSIONB.Power = null;
-            this.ST_ENSIONB.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONB.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONB.Str = null;
             this.ST_ENSIONB.Str1 = null;
             this.ST_ENSIONB.Str2 = null;
             this.ST_ENSIONB.TabIndex = 99;
+            this.ST_ENSIONB.Visible = false;
             this.ST_ENSIONB.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
             // 
             // ST_ENSIONC
@@ -319,15 +349,17 @@
             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.Location = new System.Drawing.Point(1783, 646);
+            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4);
             this.ST_ENSIONC.Name = "ST_ENSIONC";
             this.ST_ENSIONC.Negative = false;
             this.ST_ENSIONC.Power = null;
-            this.ST_ENSIONC.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONC.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONC.Str = null;
             this.ST_ENSIONC.Str1 = null;
             this.ST_ENSIONC.Str2 = null;
             this.ST_ENSIONC.TabIndex = 97;
+            this.ST_ENSIONC.Visible = false;
             this.ST_ENSIONC.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
             // 
             // ST_ENSIOND
@@ -335,15 +367,17 @@
             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.Location = new System.Drawing.Point(1289, 686);
+            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4);
             this.ST_ENSIOND.Name = "ST_ENSIOND";
             this.ST_ENSIOND.Negative = false;
             this.ST_ENSIOND.Power = null;
-            this.ST_ENSIOND.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIOND.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIOND.Str = null;
             this.ST_ENSIOND.Str1 = null;
             this.ST_ENSIOND.Str2 = null;
             this.ST_ENSIOND.TabIndex = 95;
+            this.ST_ENSIOND.Visible = false;
             this.ST_ENSIOND.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
             // 
             // ST_ENSIONE
@@ -351,15 +385,17 @@
             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.Location = new System.Drawing.Point(1537, 686);
+            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4);
             this.ST_ENSIONE.Name = "ST_ENSIONE";
             this.ST_ENSIONE.Negative = false;
             this.ST_ENSIONE.Power = null;
-            this.ST_ENSIONE.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONE.Size = new System.Drawing.Size(178, 28);
             this.ST_ENSIONE.Str = null;
             this.ST_ENSIONE.Str1 = null;
             this.ST_ENSIONE.Str2 = null;
             this.ST_ENSIONE.TabIndex = 93;
+            this.ST_ENSIONE.Visible = false;
             this.ST_ENSIONE.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
             // 
             // SU_DEVCODE1
@@ -367,10 +403,11 @@
             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(204, 692);
+            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
-            this.SU_DEVCODE1.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(178, 28);
             this.SU_DEVCODE1.Str = null;
             this.SU_DEVCODE1.Str1 = null;
             this.SU_DEVCODE1.Str2 = null;
@@ -382,10 +419,11 @@
             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(204, 646);
+            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4);
             this.SU_DEVCODE.Name = "SU_DEVCODE";
             this.SU_DEVCODE.Power = null;
-            this.SU_DEVCODE.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE.Size = new System.Drawing.Size(178, 28);
             this.SU_DEVCODE.Str = null;
             this.SU_DEVCODE.Str1 = null;
             this.SU_DEVCODE.Str2 = null;
@@ -406,61 +444,78 @@
             this.su_table,
             this.su_usemacode});
             this.ToolsBom.EnableContentClick = true;
-            this.ToolsBom.Location = new System.Drawing.Point(0, 38);
+            this.ToolsBom.Location = new System.Drawing.Point(0, 57);
+            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4);
             this.ToolsBom.Name = "ToolsBom";
+            this.ToolsBom.RowHeadersWidth = 62;
             this.ToolsBom.RowTemplate.Height = 27;
-            this.ToolsBom.Size = new System.Drawing.Size(906, 384);
+            this.ToolsBom.Size = new System.Drawing.Size(1359, 576);
             this.ToolsBom.TabIndex = 76;
             // 
             // su_stcode
             // 
             this.su_stcode.DataPropertyName = "su_stcode";
             this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.MinimumWidth = 8;
             this.su_stcode.Name = "su_stcode";
+            this.su_stcode.Width = 150;
             // 
             // st_pcbcode
             // 
             this.st_pcbcode.DataPropertyName = "st_pcbcode";
             this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.MinimumWidth = 8;
             this.st_pcbcode.Name = "st_pcbcode";
+            this.st_pcbcode.Width = 150;
             // 
             // su_status
             // 
             this.su_status.DataPropertyName = "su_status";
             this.su_status.HeaderText = "领用状态";
+            this.su_status.MinimumWidth = 8;
             this.su_status.Name = "su_status";
+            this.su_status.Width = 150;
             // 
             // SU_LINECODE
             // 
             this.SU_LINECODE.DataPropertyName = "SU_LINECODE";
             this.SU_LINECODE.HeaderText = "线别";
+            this.SU_LINECODE.MinimumWidth = 8;
             this.SU_LINECODE.Name = "SU_LINECODE";
+            this.SU_LINECODE.Width = 150;
             // 
             // su_stverison
             // 
             this.su_stverison.DataPropertyName = "su_stverison";
             this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.MinimumWidth = 8;
             this.su_stverison.Name = "su_stverison";
+            this.su_stverison.Width = 150;
             // 
             // su_singlepringqty
             // 
             this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
             this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.MinimumWidth = 8;
             this.su_singlepringqty.Name = "su_singlepringqty";
+            this.su_singlepringqty.Width = 150;
             // 
             // su_table
             // 
             this.su_table.DataPropertyName = "su_table";
             this.su_table.HeaderText = "板面";
+            this.su_table.MinimumWidth = 8;
             this.su_table.Name = "su_table";
+            this.su_table.Width = 150;
             // 
             // su_usemacode
             // 
             this.su_usemacode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
             this.su_usemacode.DataPropertyName = "su_usemacode";
             this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.MinimumWidth = 8;
             this.su_usemacode.Name = "su_usemacode";
-            this.su_usemacode.Width = 61;
+            this.su_usemacode.Width = 91;
             // 
             // Confirm
             // 
@@ -469,12 +524,13 @@
             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.Location = new System.Drawing.Point(1242, 6);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(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.Size = new System.Drawing.Size(102, 42);
             this.Confirm.TabIndex = 75;
             this.Confirm.Text = "确定";
             this.Confirm.UseVisualStyleBackColor = false;
@@ -485,10 +541,11 @@
             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.Location = new System.Drawing.Point(464, 14);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(140, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(208, 28);
             this.ma_prodcode.Str = null;
             this.ma_prodcode.Str1 = null;
             this.ma_prodcode.Str2 = null;
@@ -501,13 +558,14 @@
             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.Location = new System.Drawing.Point(123, 14);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(141, 21);
+            this.ma_code.Size = new System.Drawing.Size(212, 32);
             this.ma_code.TabIndex = 71;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -518,26 +576,28 @@
             // 
             this.st_usecount.AutoSize = true;
             this.st_usecount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_usecount.Location = new System.Drawing.Point(476, 461);
+            this.st_usecount.Location = new System.Drawing.Point(714, 692);
+            this.st_usecount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_usecount.Name = "st_usecount";
-            this.st_usecount.Size = new System.Drawing.Size(0, 21);
+            this.st_usecount.Size = new System.Drawing.Size(0, 31);
             this.st_usecount.TabIndex = 112;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(357, 460);
+            this.label2.Location = new System.Drawing.Point(536, 690);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(106, 21);
+            this.label2.Size = new System.Drawing.Size(158, 31);
             this.label2.TabIndex = 111;
             this.label2.Text = "累计使用次数";
             // 
             // Make_SMTStockStencil
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(908, 551);
+            this.ClientSize = new System.Drawing.Size(1362, 743);
             this.Controls.Add(this.st_usecount);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.SU_RETURNIFCLEAN);
@@ -570,6 +630,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_SMTStockStencil";
             this.Tag = "Make!SMTStencil";
             this.Text = "Make_SMTStencil";

+ 11 - 24
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -115,9 +115,9 @@ namespace UAS_MES_NEW.Make
                 }
             }
             sql.Clear();
-            sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS,SU_CLEANNUMS)");
+            sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS,SU_CLEANNUMS,su_usedate)");
             sql.Append("select StencilUse_seq.nextval,st_id,'" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "'");
-            sql.Append(",st_version,'借出',ST_CLEANNUMS from ");
+            sql.Append(",st_version,'借出',ST_CLEANNUMS,sysdate 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");
@@ -129,10 +129,8 @@ namespace UAS_MES_NEW.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)
-                {
+
+
                     DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,nvl(St_USECOUNT,0)St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED'", "select");
                     if (dt.Rows.Count > 0)
                     {
@@ -159,13 +157,13 @@ namespace UAS_MES_NEW.Make
                         return;
                     }
                     sql.Clear();
-                    sql.Append("update StencilUse set SU_CLEANNUMS = nvl(SU_CLEANNUMS,0)+1,su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=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("update StencilUse set SU_CLEANNUMS = nvl(SU_CLEANNUMS,0)+1,su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=sysdate ,su_backdate=sysdate,");
+                    sql.Append(" 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 + "' and su_status='借出' and su_stockusedate is not null)");
                     dh.ExecuteSql(sql.ToString(), "update");
                     sql.Clear();
-                    sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,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("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_USESTATUS='在仓'");
+                    sql.Append("  ");
                     sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
                     dh.ExecuteSql(sql.ToString(), "update");
                     MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功!");
@@ -175,19 +173,8 @@ namespace UAS_MES_NEW.Make
                     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;
@@ -289,8 +276,8 @@ namespace UAS_MES_NEW.Make
                         ST_ENSIOND.Enabled = true;
                         ST_ENSIONE.Enabled = true;
                         SU_DEVCODE.Enabled = false;
-                        Receive.Enabled = false;
-                        Receive.Enabled = false;
+                        Return.Enabled = true;
+                        Scrap.Enabled = true;
                     }
                     break;
                 default:

+ 4 - 2
UAS_MES_WEIP/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -203,6 +203,7 @@
             this.columnHeader9});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WaitRejectList.FullRowSelect = true;
+            this.WaitRejectList.HideSelection = false;
             this.WaitRejectList.Location = new System.Drawing.Point(6, 423);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
@@ -284,6 +285,7 @@
             this.columnHeader8,
             this.columnHeader10});
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ChoosedRejectList.HideSelection = false;
             this.ChoosedRejectList.Location = new System.Drawing.Point(552, 423);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
@@ -438,7 +440,7 @@
             this.SMTBind.Checked = true;
             this.SMTBind.CheckState = System.Windows.Forms.CheckState.Checked;
             this.SMTBind.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SMTBind.Location = new System.Drawing.Point(837, 750);
+            this.SMTBind.Location = new System.Drawing.Point(1007, 751);
             this.SMTBind.Name = "SMTBind";
             this.SMTBind.Size = new System.Drawing.Size(146, 28);
             this.SMTBind.TabIndex = 195;
@@ -685,7 +687,7 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
-            this.CleanInfo.Location = new System.Drawing.Point(1080, 746);
+            this.CleanInfo.Location = new System.Drawing.Point(1160, 745);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";

+ 42 - 42
UAS_MES_WEIP/FunctionCode/Make/Make_TestCollection.cs

@@ -352,8 +352,8 @@ namespace UAS_MES_NEW.Make
             {
                 LoadBadCodeListView();
                 LoadChoosedBadListView();
-                //OperateResult.AppendText(">>请采集不良代码\n", Color.Green);
-                //bc_code.Focus();
+                OperateResult.AppendText(">>请采集不良代码\n", Color.Green);
+                bc_code.Focus();
                 ////勾选了自动产生代码
                 //if (AutoBadCode.Checked)
                 //    Save_Click(new object(), new EventArgs());
@@ -398,45 +398,45 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                         return;
                     }
-                    //int RejectCount = ChoosedRejectList.Items.Count;
-                    //string[] bccode = new string[RejectCount];
-                    //string[] bcremark = new string[RejectCount];
-                    //string[] bgcode = new string[RejectCount];
-                    //string[] bgname = new string[RejectCount];
-                    //string[] bcname = new string[RejectCount];
-                    //if (AutoBadCode.Checked)
-                    //{
-                    //    string defaultvalue = Properties.Settings.Default.DefaultCollectionValue;
-                    //    bccode = new string[] { defaultvalue };
-                    //    bcremark = new string[] { defaultvalue };
-                    //    bgcode = new string[] { defaultvalue };
-                    //    bgname = new string[] { defaultvalue };
-                    //    bcname = new string[] { defaultvalue };
-                    //}
-                    //else
-                    //{
-                    //    if (ChoosedRejectList.Items.Count == 0)
-                    //    {
-                    //        OperateResult.AppendText(">>不良品必须选择不良原因和不良代码!\n", Color.Red);
-                    //        return;
-                    //    }
-                    //    else
-                    //    {
-                    //        for (int i = 0; i < RejectCount; i++)
-                    //        {
-                    //            //获取不良代码组
-                    //            bgcode[i] = ChoosedRejectList.Items[i].SubItems[1].Text.Split(':')[0];
-                    //            //获取不良代码组名称
-                    //            bgname[i] = ChoosedRejectList.Items[i].SubItems[1].Text.Split(':')[1];
-                    //            //获取所有的不良代码
-                    //            bccode[i] = ChoosedRejectList.Items[i].SubItems[2].Text;
-                    //            //获取不良名称
-                    //            bcname[i] = ChoosedRejectList.Items[i].SubItems[3].Text;
-                    //            //获取所有的不良备注
-                    //            bcremark[i] = bc_remark.Text;
-                    //        }
-                    //    }
-                    //}
+                    int RejectCount = ChoosedRejectList.Items.Count;
+                    string[] bccode = new string[RejectCount];
+                    string[] bcremark = new string[RejectCount];
+                    string[] bgcode = new string[RejectCount];
+                    string[] bgname = new string[RejectCount];
+                    string[] bcname = new string[RejectCount];
+                    if (AutoBadCode.Checked)
+                    {
+                        string defaultvalue = Properties.Settings.Default.DefaultCollectionValue;
+                        bccode = new string[] { defaultvalue };
+                        bcremark = new string[] { defaultvalue };
+                        bgcode = new string[] { defaultvalue };
+                        bgname = new string[] { defaultvalue };
+                        bcname = new string[] { defaultvalue };
+                    }
+                    else
+                    {
+                        if (ChoosedRejectList.Items.Count == 0)
+                        {
+                            OperateResult.AppendText(">>不良品必须选择不良原因和不良代码!\n", Color.Red);
+                            return;
+                        }
+                        else
+                        {
+                            for (int i = 0; i < RejectCount; i++)
+                            {
+                                //获取不良代码组
+                                bgcode[i] = ChoosedRejectList.Items[i].SubItems[1].Text.Split(':')[0];
+                                //获取不良代码组名称
+                                bgname[i] = ChoosedRejectList.Items[i].SubItems[1].Text.Split(':')[1];
+                                //获取所有的不良代码
+                                bccode[i] = ChoosedRejectList.Items[i].SubItems[2].Text;
+                                //获取不良名称
+                                bcname[i] = ChoosedRejectList.Items[i].SubItems[3].Text;
+                                //获取所有的不良备注
+                                bcremark[i] = bc_remark.Text;
+                            }
+                        }
+                    }
                     //如果之前是良品的
                     dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
                     if (dt.Rows.Count > 0)
@@ -991,7 +991,7 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (SMTBind.Checked)
+                if (SMTBind.Checked&& GoodProduct.Checked)
                 {
                     DataTable dt = (DataTable)dh.ExecuteSql("select A.SB_BARCODE from smtbind A LEFT JOIN SMTBIND B ON A.SB_MAINCODE = B.SB_MAINCODE WHERE B.SB_BARCODE = '" + ms_sncode.Text + "'", "select");
                     if (dt.Rows.Count > 0)

+ 1 - 1
UAS_MES_WEIP/FunctionCode/Make/Make_TestCollection.resx

@@ -300,7 +300,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

+ 0 - 1
UAS_MES_WEIP/Login.cs

@@ -90,7 +90,6 @@ namespace UAS_MES_NEW
             string Address = DB.SelectedValue.ToString().Split('#')[1];
             //DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + Address + ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=113.108.109.210)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-            //DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.6.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.CurrentDB = DBUser;
             //设置屏幕的宽高信息
             SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;

+ 13 - 11
UAS_MES_WEIP/PublicMethod/LogicHandler.cs

@@ -591,17 +591,19 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "" && oStatus != "2")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单"+ oMakeCode + "与当前工单"+ iMakeCode + "不同,是否切换?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                    //如果选择不切换赋值当前界面工单
-                    if (ChangeMakeCode != "Yes")
-                    {
-                        oErrorMessage = "请重新采集序列号";
-                        NoteAlready = true;
-                    }
-                    else
-                    {
-                        NoteAlready = true;
-                    }
+                    //string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单"+ oMakeCode + "与当前工单"+ iMakeCode + "不同,是否切换?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    ////如果选择不切换赋值当前界面工单
+                    //if (ChangeMakeCode != "Yes")
+                    //{
+                    //    oErrorMessage = "请重新采集序列号";
+                    //    NoteAlready = true;
+                    //}
+                    //else
+                    //{
+                    //    NoteAlready = true;
+                    //}
+                      oErrorMessage = "序列号" + iSN + "所属工单"+ oMakeCode + "与当前工单"+ iMakeCode + "不同";
+                      NoteAlready = true;
                 }
                 else
                 {

+ 19 - 1
UAS_MES_WEIP/UAS_MES_WEIP.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{408D4A17-EED9-4ABE-9542-EC39F17C48F2}</ProjectGuid>
+    <ProjectGuid>{620AC1B1-F6AB-400D-BFF4-463143D22A5E}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UAS_MES_NEW</RootNamespace>
@@ -568,12 +568,24 @@
     <Compile Include="FunctionCode\Make\Make_SMTBind.Designer.cs">
       <DependentUpon>Make_SMTBind.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTSStencil.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTSStencil.Designer.cs">
+      <DependentUpon>Make_SMTSStencil.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SMTStencil.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_SMTStencil.Designer.cs">
       <DependentUpon>Make_SMTStencil.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTStockSStencil.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTStockSStencil.Designer.cs">
+      <DependentUpon>Make_SMTStockSStencil.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SMTStockStencil.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1322,9 +1334,15 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SMTBind.resx">
       <DependentUpon>Make_SMTBind.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SMTSStencil.resx">
+      <DependentUpon>Make_SMTSStencil.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SMTStencil.resx">
       <DependentUpon>Make_SMTStencil.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SMTStockSStencil.resx">
+      <DependentUpon>Make_SMTStockSStencil.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SMTStockStencil.resx">
       <DependentUpon>Make_SMTStockStencil.cs</DependentUpon>
     </EmbeddedResource>