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

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

@@ -0,0 +1,742 @@
+namespace UAS_MES.Make
+{
+    partial class Make_SMTStencil
+    {
+        /// <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_USEMAN_label = new System.Windows.Forms.Label();
+            this.SU_DEVCODE_label = new System.Windows.Forms.Label();
+            this.st_table_label = new System.Windows.Forms.Label();
+            this.SU_RETURNMAN_label = new System.Windows.Forms.Label();
+            this.SU_DEVCODE1_label = new System.Windows.Forms.Label();
+            this.st_combinenumber_label = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.ST_ENSIONE_label = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.ST_ENSIONC_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONB_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONA_label = new System.Windows.Forms.Label();
+            this.ma_qty_label = new System.Windows.Forms.Label();
+            this.ma_qty = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.st_table = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
+            this.Receive = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Return = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Scrap = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ST_ENSIONA = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIONB = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIONC = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIOND = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ST_ENSIONE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.st_combinenumber = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_RETURNMAN = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_DEVCODE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SU_USEMAN = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ToolsBom = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.li_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.su_usemacode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_singlepringqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_stverison = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.st_pcbcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_stcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((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(2, 9);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.TabIndex = 68;
+            this.ms_makecode_label.Text = "归属工单";
+            // 
+            // ma_prodcode_label
+            // 
+            this.ma_prodcode_label.AutoSize = true;
+            this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_prodcode_label.Location = new System.Drawing.Point(229, 9);
+            this.ma_prodcode_label.Name = "ma_prodcode_label";
+            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.TabIndex = 69;
+            this.ma_prodcode_label.Text = "产品编号";
+            // 
+            // 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(455, 9);
+            this.li_code_label.Name = "li_code_label";
+            this.li_code_label.Size = new System.Drawing.Size(74, 21);
+            this.li_code_label.TabIndex = 73;
+            this.li_code_label.Text = "产线编号";
+            // 
+            // RadioReceive
+            // 
+            this.RadioReceive.AutoSize = true;
+            this.RadioReceive.Location = new System.Drawing.Point(3, 434);
+            this.RadioReceive.Name = "RadioReceive";
+            this.RadioReceive.Size = new System.Drawing.Size(47, 16);
+            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.Location = new System.Drawing.Point(3, 465);
+            this.RadioReturn.Name = "RadioReturn";
+            this.RadioReturn.Size = new System.Drawing.Size(47, 16);
+            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_USEMAN_label
+            // 
+            this.SU_USEMAN_label.AutoSize = true;
+            this.SU_USEMAN_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SU_USEMAN_label.Location = new System.Drawing.Point(57, 431);
+            this.SU_USEMAN_label.Name = "SU_USEMAN_label";
+            this.SU_USEMAN_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_USEMAN_label.TabIndex = 79;
+            this.SU_USEMAN_label.Text = "领用人员";
+            // 
+            // 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(260, 431);
+            this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
+            this.SU_DEVCODE_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE_label.TabIndex = 81;
+            this.SU_DEVCODE_label.Text = "钢网编号";
+            // 
+            // 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(467, 431);
+            this.st_table_label.Name = "st_table_label";
+            this.st_table_label.Size = new System.Drawing.Size(51, 21);
+            this.st_table_label.TabIndex = 83;
+            this.st_table_label.Text = "Table";
+            // 
+            // SU_RETURNMAN_label
+            // 
+            this.SU_RETURNMAN_label.AutoSize = true;
+            this.SU_RETURNMAN_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SU_RETURNMAN_label.Location = new System.Drawing.Point(57, 461);
+            this.SU_RETURNMAN_label.Name = "SU_RETURNMAN_label";
+            this.SU_RETURNMAN_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_RETURNMAN_label.TabIndex = 85;
+            this.SU_RETURNMAN_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(260, 461);
+            this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
+            this.SU_DEVCODE1_label.Size = new System.Drawing.Size(74, 21);
+            this.SU_DEVCODE1_label.TabIndex = 87;
+            this.SU_DEVCODE1_label.Text = "钢网编号";
+            // 
+            // 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(467, 461);
+            this.st_combinenumber_label.Name = "st_combinenumber_label";
+            this.st_combinenumber_label.Size = new System.Drawing.Size(90, 21);
+            this.st_combinenumber_label.TabIndex = 89;
+            this.st_combinenumber_label.Text = "加工小板数";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(2, 493);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(129, 21);
+            this.label7.TabIndex = 91;
+            this.label7.Text = "张力测试结果(N)";
+            // 
+            // ST_ENSIONE_label
+            // 
+            this.ST_ENSIONE_label.AutoSize = true;
+            this.ST_ENSIONE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONE_label.Location = new System.Drawing.Point(299, 520);
+            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(19, 21);
+            this.ST_ENSIONE_label.TabIndex = 92;
+            this.ST_ENSIONE_label.Text = "E";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.Location = new System.Drawing.Point(133, 520);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(22, 21);
+            this.label9.TabIndex = 94;
+            this.label9.Text = "D";
+            // 
+            // ST_ENSIONC_label
+            // 
+            this.ST_ENSIONC_label.AutoSize = true;
+            this.ST_ENSIONC_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONC_label.Location = new System.Drawing.Point(462, 493);
+            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONC_label.TabIndex = 96;
+            this.ST_ENSIONC_label.Text = "C";
+            // 
+            // ST_ENSIONB_label
+            // 
+            this.ST_ENSIONB_label.AutoSize = true;
+            this.ST_ENSIONB_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONB_label.Location = new System.Drawing.Point(298, 493);
+            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(20, 21);
+            this.ST_ENSIONB_label.TabIndex = 98;
+            this.ST_ENSIONB_label.Text = "B";
+            // 
+            // ST_ENSIONA_label
+            // 
+            this.ST_ENSIONA_label.AutoSize = true;
+            this.ST_ENSIONA_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONA_label.Location = new System.Drawing.Point(133, 493);
+            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(21, 21);
+            this.ST_ENSIONA_label.TabIndex = 100;
+            this.ST_ENSIONA_label.Text = "A";
+            // 
+            // ma_qty_label
+            // 
+            this.ma_qty_label.AutoSize = true;
+            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty_label.Location = new System.Drawing.Point(681, 9);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(58, 21);
+            this.ma_qty_label.TabIndex = 105;
+            this.ma_qty_label.Text = "工单数";
+            // 
+            // ma_qty
+            // 
+            this.ma_qty.AutoSize = true;
+            this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_qty.Location = new System.Drawing.Point(755, 9);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.TabIndex = 106;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(648, 431);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(106, 21);
+            this.label1.TabIndex = 108;
+            this.label1.Text = "单片印刷次数";
+            // 
+            // enterTextBox1
+            // 
+            this.enterTextBox1.AllPower = null;
+            this.enterTextBox1.BackColor = System.Drawing.Color.White;
+            this.enterTextBox1.ID = null;
+            this.enterTextBox1.Location = new System.Drawing.Point(760, 433);
+            this.enterTextBox1.Name = "enterTextBox1";
+            this.enterTextBox1.Power = null;
+            this.enterTextBox1.Size = new System.Drawing.Size(62, 21);
+            this.enterTextBox1.Str = null;
+            this.enterTextBox1.Str1 = null;
+            this.enterTextBox1.Str2 = null;
+            this.enterTextBox1.TabIndex = 109;
+            this.enterTextBox1.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(523, 432);
+            this.st_table.Name = "st_table";
+            this.st_table.Size = new System.Drawing.Size(121, 20);
+            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(828, 428);
+            this.Receive.MoveImage = ((System.Drawing.Image)(resources.GetObject("Receive.MoveImage")));
+            this.Receive.Name = "Receive";
+            this.Receive.NormalImage = ((System.Drawing.Image)(resources.GetObject("Receive.NormalImage")));
+            this.Receive.Power = null;
+            this.Receive.Size = new System.Drawing.Size(68, 28);
+            this.Receive.TabIndex = 104;
+            this.Receive.Text = "领用";
+            this.Receive.UseVisualStyleBackColor = false;
+            this.Receive.Click += new System.EventHandler(this.Receive_Click);
+            // 
+            // Return
+            // 
+            this.Return.AllPower = null;
+            this.Return.BackColor = System.Drawing.Color.Transparent;
+            this.Return.DownImage = ((System.Drawing.Image)(resources.GetObject("Return.DownImage")));
+            this.Return.Image = null;
+            this.Return.IsShowBorder = true;
+            this.Return.Location = new System.Drawing.Point(642, 520);
+            this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
+            this.Return.Name = "Return";
+            this.Return.NormalImage = ((System.Drawing.Image)(resources.GetObject("Return.NormalImage")));
+            this.Return.Power = null;
+            this.Return.Size = new System.Drawing.Size(68, 28);
+            this.Return.TabIndex = 103;
+            this.Return.Text = "退回";
+            this.Return.UseVisualStyleBackColor = false;
+            this.Return.Click += new System.EventHandler(this.Return_Click);
+            // 
+            // Scrap
+            // 
+            this.Scrap.AllPower = null;
+            this.Scrap.BackColor = System.Drawing.Color.Transparent;
+            this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
+            this.Scrap.Image = null;
+            this.Scrap.IsShowBorder = true;
+            this.Scrap.Location = new System.Drawing.Point(728, 520);
+            this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
+            this.Scrap.Name = "Scrap";
+            this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
+            this.Scrap.Power = null;
+            this.Scrap.Size = new System.Drawing.Size(68, 28);
+            this.Scrap.TabIndex = 102;
+            this.Scrap.Text = "报废";
+            this.Scrap.UseVisualStyleBackColor = false;
+            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
+            // 
+            // ST_ENSIONA
+            // 
+            this.ST_ENSIONA.AllPower = null;
+            this.ST_ENSIONA.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONA.ID = null;
+            this.ST_ENSIONA.Location = new System.Drawing.Point(160, 493);
+            this.ST_ENSIONA.Name = "ST_ENSIONA";
+            this.ST_ENSIONA.Power = null;
+            this.ST_ENSIONA.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONA.Str = null;
+            this.ST_ENSIONA.Str1 = null;
+            this.ST_ENSIONA.Str2 = null;
+            this.ST_ENSIONA.TabIndex = 101;
+            this.ST_ENSIONA.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIONB
+            // 
+            this.ST_ENSIONB.AllPower = null;
+            this.ST_ENSIONB.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONB.ID = null;
+            this.ST_ENSIONB.Location = new System.Drawing.Point(325, 493);
+            this.ST_ENSIONB.Name = "ST_ENSIONB";
+            this.ST_ENSIONB.Power = null;
+            this.ST_ENSIONB.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONB.Str = null;
+            this.ST_ENSIONB.Str1 = null;
+            this.ST_ENSIONB.Str2 = null;
+            this.ST_ENSIONB.TabIndex = 99;
+            this.ST_ENSIONB.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIONC
+            // 
+            this.ST_ENSIONC.AllPower = null;
+            this.ST_ENSIONC.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONC.ID = null;
+            this.ST_ENSIONC.Location = new System.Drawing.Point(489, 493);
+            this.ST_ENSIONC.Name = "ST_ENSIONC";
+            this.ST_ENSIONC.Power = null;
+            this.ST_ENSIONC.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONC.Str = null;
+            this.ST_ENSIONC.Str1 = null;
+            this.ST_ENSIONC.Str2 = null;
+            this.ST_ENSIONC.TabIndex = 97;
+            this.ST_ENSIONC.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIOND
+            // 
+            this.ST_ENSIOND.AllPower = null;
+            this.ST_ENSIOND.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIOND.ID = null;
+            this.ST_ENSIOND.Location = new System.Drawing.Point(160, 520);
+            this.ST_ENSIOND.Name = "ST_ENSIOND";
+            this.ST_ENSIOND.Power = null;
+            this.ST_ENSIOND.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIOND.Str = null;
+            this.ST_ENSIOND.Str1 = null;
+            this.ST_ENSIOND.Str2 = null;
+            this.ST_ENSIOND.TabIndex = 95;
+            this.ST_ENSIOND.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // ST_ENSIONE
+            // 
+            this.ST_ENSIONE.AllPower = null;
+            this.ST_ENSIONE.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONE.ID = null;
+            this.ST_ENSIONE.Location = new System.Drawing.Point(325, 520);
+            this.ST_ENSIONE.Name = "ST_ENSIONE";
+            this.ST_ENSIONE.Power = null;
+            this.ST_ENSIONE.Size = new System.Drawing.Size(120, 21);
+            this.ST_ENSIONE.Str = null;
+            this.ST_ENSIONE.Str1 = null;
+            this.ST_ENSIONE.Str2 = null;
+            this.ST_ENSIONE.TabIndex = 93;
+            this.ST_ENSIONE.TextChanged += new System.EventHandler(this.ST_ENSION_TextChanged);
+            // 
+            // 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(568, 464);
+            this.st_combinenumber.Name = "st_combinenumber";
+            this.st_combinenumber.Power = null;
+            this.st_combinenumber.Size = new System.Drawing.Size(120, 21);
+            this.st_combinenumber.Str = null;
+            this.st_combinenumber.Str1 = null;
+            this.st_combinenumber.Str2 = null;
+            this.st_combinenumber.TabIndex = 90;
+            // 
+            // 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(340, 462);
+            this.SU_DEVCODE1.Name = "SU_DEVCODE1";
+            this.SU_DEVCODE1.Power = null;
+            this.SU_DEVCODE1.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE1.Str = null;
+            this.SU_DEVCODE1.Str1 = null;
+            this.SU_DEVCODE1.Str2 = null;
+            this.SU_DEVCODE1.TabIndex = 88;
+            this.SU_DEVCODE1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SU_DEVCODE1_KeyDown);
+            // 
+            // SU_RETURNMAN
+            // 
+            this.SU_RETURNMAN.AllPower = null;
+            this.SU_RETURNMAN.BackColor = System.Drawing.Color.White;
+            this.SU_RETURNMAN.ID = null;
+            this.SU_RETURNMAN.Location = new System.Drawing.Point(134, 465);
+            this.SU_RETURNMAN.Name = "SU_RETURNMAN";
+            this.SU_RETURNMAN.Power = null;
+            this.SU_RETURNMAN.Size = new System.Drawing.Size(120, 21);
+            this.SU_RETURNMAN.Str = null;
+            this.SU_RETURNMAN.Str1 = null;
+            this.SU_RETURNMAN.Str2 = null;
+            this.SU_RETURNMAN.TabIndex = 86;
+            // 
+            // 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(340, 432);
+            this.SU_DEVCODE.Name = "SU_DEVCODE";
+            this.SU_DEVCODE.Power = null;
+            this.SU_DEVCODE.Size = new System.Drawing.Size(120, 21);
+            this.SU_DEVCODE.Str = null;
+            this.SU_DEVCODE.Str1 = null;
+            this.SU_DEVCODE.Str2 = null;
+            this.SU_DEVCODE.TabIndex = 82;
+            this.SU_DEVCODE.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SU_DEVCODE_KeyDown);
+            // 
+            // SU_USEMAN
+            // 
+            this.SU_USEMAN.AllPower = null;
+            this.SU_USEMAN.BackColor = System.Drawing.Color.White;
+            this.SU_USEMAN.ID = null;
+            this.SU_USEMAN.Location = new System.Drawing.Point(134, 432);
+            this.SU_USEMAN.Name = "SU_USEMAN";
+            this.SU_USEMAN.Power = null;
+            this.SU_USEMAN.Size = new System.Drawing.Size(120, 21);
+            this.SU_USEMAN.Str = null;
+            this.SU_USEMAN.Str1 = null;
+            this.SU_USEMAN.Str2 = null;
+            this.SU_USEMAN.TabIndex = 80;
+            // 
+            // 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_stverison,
+            this.su_singlepringqty,
+            this.su_table,
+            this.su_usemacode});
+            this.ToolsBom.EnableContentClick = true;
+            this.ToolsBom.Location = new System.Drawing.Point(0, 38);
+            this.ToolsBom.Name = "ToolsBom";
+            this.ToolsBom.RowTemplate.Height = 27;
+            this.ToolsBom.Size = new System.Drawing.Size(906, 384);
+            this.ToolsBom.TabIndex = 76;
+            // 
+            // Confirm
+            // 
+            this.Confirm.AllPower = null;
+            this.Confirm.BackColor = System.Drawing.Color.Transparent;
+            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
+            this.Confirm.Image = null;
+            this.Confirm.IsShowBorder = true;
+            this.Confirm.Location = new System.Drawing.Point(828, 4);
+            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
+            this.Confirm.Name = "Confirm";
+            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
+            this.Confirm.Power = null;
+            this.Confirm.Size = new System.Drawing.Size(68, 28);
+            this.Confirm.TabIndex = 75;
+            this.Confirm.Text = "确定";
+            this.Confirm.UseVisualStyleBackColor = false;
+            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 
+            // 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(535, 9);
+            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(140, 21);
+            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.ID = null;
+            this.ma_prodcode.Location = new System.Drawing.Point(309, 9);
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Power = null;
+            this.ma_prodcode.Size = new System.Drawing.Size(140, 21);
+            this.ma_prodcode.Str = null;
+            this.ma_prodcode.Str1 = null;
+            this.ma_prodcode.Str2 = null;
+            this.ma_prodcode.TabIndex = 72;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(82, 9);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(141, 21);
+            this.ma_code.TabIndex = 71;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // su_usemacode
+            // 
+            this.su_usemacode.DataPropertyName = "su_usemacode";
+            this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.Name = "su_usemacode";
+            // 
+            // su_table
+            // 
+            this.su_table.DataPropertyName = "su_table";
+            this.su_table.HeaderText = "板面";
+            this.su_table.Name = "su_table";
+            // 
+            // su_singlepringqty
+            // 
+            this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
+            this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.Name = "su_singlepringqty";
+            // 
+            // su_stverison
+            // 
+            this.su_stverison.DataPropertyName = "su_stverison";
+            this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.Name = "su_stverison";
+            // 
+            // st_pcbcode
+            // 
+            this.st_pcbcode.DataPropertyName = "st_pcbcode";
+            this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.Name = "st_pcbcode";
+            // 
+            // su_stcode
+            // 
+            this.su_stcode.DataPropertyName = "su_stcode";
+            this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.Name = "su_stcode";
+            // 
+            // Make_SMTStencil
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(908, 551);
+            this.Controls.Add(this.enterTextBox1);
+            this.Controls.Add(this.label1);
+            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.Scrap);
+            this.Controls.Add(this.ST_ENSIONA);
+            this.Controls.Add(this.ST_ENSIONA_label);
+            this.Controls.Add(this.ST_ENSIONB);
+            this.Controls.Add(this.ST_ENSIONB_label);
+            this.Controls.Add(this.ST_ENSIONC);
+            this.Controls.Add(this.ST_ENSIONC_label);
+            this.Controls.Add(this.ST_ENSIOND);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.ST_ENSIONE);
+            this.Controls.Add(this.ST_ENSIONE_label);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.st_combinenumber);
+            this.Controls.Add(this.st_combinenumber_label);
+            this.Controls.Add(this.SU_DEVCODE1);
+            this.Controls.Add(this.SU_DEVCODE1_label);
+            this.Controls.Add(this.SU_RETURNMAN);
+            this.Controls.Add(this.SU_RETURNMAN_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.SU_USEMAN);
+            this.Controls.Add(this.SU_USEMAN_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.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_USEMAN;
+        private System.Windows.Forms.Label SU_USEMAN_label;
+        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_RETURNMAN;
+        private System.Windows.Forms.Label SU_RETURNMAN_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 System.Windows.Forms.Label label7;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONE;
+        private System.Windows.Forms.Label ST_ENSIONE_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIOND;
+        private System.Windows.Forms.Label label9;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONC;
+        private System.Windows.Forms.Label ST_ENSIONC_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONB;
+        private System.Windows.Forms.Label ST_ENSIONB_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ST_ENSIONA;
+        private System.Windows.Forms.Label ST_ENSIONA_label;
+        private CustomControl.ButtonUtil.NormalButton Scrap;
+        private CustomControl.ButtonUtil.NormalButton Return;
+        private CustomControl.ButtonUtil.NormalButton Receive;
+        private System.Windows.Forms.Label ma_qty_label;
+        private System.Windows.Forms.Label ma_qty;
+        private CustomControl.ComBoxWithFocus.ComBoxWithFocus st_table;
+        private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_stcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn st_pcbcode;
+        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;
+    }
+}

UAS-MES/FunctionCode/Make/Make_SMTStencil.cs

@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES;
+using UAS_MES.DataOperate;
+using UAS_MES.Entity;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Make
+{
+    public partial class Make_SMTStencil : Form
+    {
+
+        DataTable Dbfind;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataHelper dh = SystemInf.dh;
+
+        StringBuilder sql = new StringBuilder();
+
+        public Make_SMTStencil()
+        {
+            InitializeComponent();
+            SU_USEMAN.Enabled = false;
+            SU_DEVCODE.Enabled = false;
+            SU_RETURNMAN.Enabled = false;
+            st_combinenumber.Enabled = false;
+            SU_DEVCODE1.Enabled = false;
+            ST_ENSIONA.Enabled = false;
+            ST_ENSIONB.Enabled = false;
+            ST_ENSIONC.Enabled = false;
+            ST_ENSIOND.Enabled = false;
+            ST_ENSIONE.Enabled = false;
+            Return.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.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
+
+            li_code.TableName = "Line";
+            li_code.SelectField = "li_code # 线别编号,li_name # 线别名称";
+            li_code.FormName = Name;
+            li_code.SetValueField = new string[] { "li_code", "li_name" };
+            li_code.DbChange += Li_code_DbChange;
+        }
+
+        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);
+        }
+
+        private void Make_SMTStencil_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void Confirm_Click(object sender, EventArgs e)
+        {
+            sql.Clear();
+            sql.Append("select St_PCBCODE,su_stcode,su_table,su_usemacode,su_singlepringqty,su_stverison ");
+            sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "'");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            BaseUtil.FillDgvWithDataTable(ToolsBom, dt);
+        }
+
+        private void Receive_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Return_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        Make_StencilScrapReason form;
+        private void Scrap_Click(object sender, EventArgs e)
+        {
+            form = new Make_StencilScrapReason();
+            BaseUtil.SetFormCenter(form);
+            form.Controls["ConfirmScrap"].Click += Make_SMTStencil_Click;
+            form.ShowDialog();
+        }
+
+        private void Make_SMTStencil_Click(object sender, EventArgs e)
+        {
+            string Code = "";
+            string scrapreason = form.Controls["Reason"].Text;
+            LogicHandler.GetSerialNumByCaller("StencilScrap", out Code);
+            sql.Clear();
+            sql.Append("insert into StencilScrap(ss_id,ss_code,ss_stcode,ss_scrapreason,ss_inman,ss_indate,ss_status)");
+            sql.Append("values (StencilScrap_seq.nextval,'" + Code + "','" + SU_DEVCODE1.Text + "','" + scrapreason + "',");
+            sql.Append("'" + User.UserCode + "',sysdate,'ENTERING')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            form.Close();
+        }
+
+        private void Radio_CheckedChanged(object sender, EventArgs e)
+        {
+            switch ((sender as Control).Name)
+            {
+                case "RadioReceive":
+                    if ((sender as RadioButton).Checked)
+                    {
+                        SU_USEMAN.Enabled = true;
+                        SU_DEVCODE.Enabled = true;
+                        SU_RETURNMAN.Enabled = false;
+                        st_combinenumber.Enabled = false;
+                        SU_DEVCODE1.Enabled = false;
+                        ST_ENSIONA.Enabled = false;
+                        ST_ENSIONB.Enabled = false;
+                        ST_ENSIONC.Enabled = false;
+                        ST_ENSIOND.Enabled = false;
+                        ST_ENSIONE.Enabled = false;
+                        Return.Enabled = false;
+                        Scrap.Enabled = false;
+                    }
+                    break;
+                case "RadioReturn":
+                    if ((sender as RadioButton).Checked)
+                    {
+                        SU_RETURNMAN.Enabled = true;
+                        SU_DEVCODE1.Enabled = true;
+                        st_combinenumber.Enabled = true;
+                        ST_ENSIONA.Enabled = true;
+                        ST_ENSIONB.Enabled = true;
+                        ST_ENSIONC.Enabled = true;
+                        ST_ENSIOND.Enabled = true;
+                        ST_ENSIONE.Enabled = true;
+                        SU_USEMAN.Enabled = false;
+                        SU_DEVCODE.Enabled = false;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        //默认范围39-55，如不在范围内则可以报废
+        private void ST_ENSION_TextChanged(object sender, EventArgs e)
+        {
+            double Range = 0;
+            if (double.TryParse((sender as Control).Text, out Range))
+            {
+                if (Range >= 39 && Range <= 55)
+                {
+                    Return.Enabled = true;
+                    Scrap.Enabled = false;
+                }
+                else
+                {
+                    Return.Enabled = false;
+                    Scrap.Enabled = true;
+                }
+            }
+        }
+
+        private void SU_DEVCODE_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+
+            }
+        }
+
+        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 + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
+                }
+            }
+        }
+    }
+}

UAS-MES/FunctionCode/Make/Make_SMTStencil.resx

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

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

@@ -0,0 +1,87 @@
+namespace UAS_MES.Make
+{
+    partial class Make_StencilScrapReason
+    {
+        /// <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()
+        {
+            this.ConfirmScrap = new System.Windows.Forms.Button();
+            this.Reason = new System.Windows.Forms.RichTextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // ConfirmScrap
+            // 
+            this.ConfirmScrap.BackColor = System.Drawing.Color.Transparent;
+            this.ConfirmScrap.Location = new System.Drawing.Point(170, 138);
+            this.ConfirmScrap.Name = "ConfirmScrap";
+            this.ConfirmScrap.Size = new System.Drawing.Size(75, 28);
+            this.ConfirmScrap.TabIndex = 0;
+            this.ConfirmScrap.Text = "确认";
+            this.ConfirmScrap.UseVisualStyleBackColor = false;
+            // 
+            // Reason
+            // 
+            this.Reason.Location = new System.Drawing.Point(80, 19);
+            this.Reason.Name = "Reason";
+            this.Reason.Size = new System.Drawing.Size(325, 109);
+            this.Reason.TabIndex = 1;
+            this.Reason.Text = "";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(8, 22);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(65, 20);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "报废原因";
+            // 
+            // Make_StencilScrapReason
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(417, 172);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.Reason);
+            this.Controls.Add(this.ConfirmScrap);
+            this.Name = "Make_StencilScrapReason";
+            this.Tag = "ShowDialogWindow";
+            this.Text = "钢网报废";
+            this.Load += new System.EventHandler(this.Make_StencilScrapReason_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button ConfirmScrap;
+        private System.Windows.Forms.RichTextBox Reason;
+        private System.Windows.Forms.Label label1;
+    }
+}

UAS-MES/FunctionCode/Make/Make_StencilScrapReason.cs

@@ -0,0 +1,24 @@
+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;
+
+namespace UAS_MES.Make
+{
+    public partial class Make_StencilScrapReason : Form
+    {
+        public Make_StencilScrapReason()
+        {
+            InitializeComponent();
+        }
+
+        private void Make_StencilScrapReason_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

UAS-MES/FunctionCode/Make/Make_StencilScrapReason.resx

@@ -0,0 +1,120 @@
+<?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>
+</root>

UAS-出货标签管理/PublicMethod/HttpCommand.cs

@@ -321,7 +321,7 @@ namespace UAS_LabelMachine.PublicMethod
         /// <param name="esbSecret"></param>
         /// <param name="strUpnlist"></param>
         /// <returns></returns>
-        public String deleteUpnInfo(string esbUrl, string appId, string esbSecret, string strUpnlist)
+        public String deleteUpnInfo(string esbUrl, string appId, string esbSecret, string strUpnlist,int num)
         {
             //string uri = "/mes/basics/wms_battery_info_insert";
             string uri = "/mes/extranet/mes_vendor_upn_inspection_to_del_insert";
@@ -345,7 +345,7 @@ namespace UAS_LabelMachine.PublicMethod
 
             parameters.Add("app_id", appId);
             //parameters.Add("timestamp", ConvertTimeStamp(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));         
-            parameters.Add("upn_amount", "2");
+            parameters.Add("upn_amount", num.ToString());
             parameters.Add("upn_info", strUpnlist);    //inspection_info     test_info
             parameters.Add("timestamp", ConvertTimeStamp(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));
 

UAS-出货标签管理/UAS_出货标签管理.Designer.cs

@@ -180,6 +180,7 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
+            this.CancelOPPOPlate = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -1407,6 +1408,7 @@
             // 
             // SingleLabel
             // 
+            this.SingleLabel.Controls.Add(this.CancelOPPOPlate);
             this.SingleLabel.Controls.Add(this.OPPOPlate);
             this.SingleLabel.Controls.Add(this.ViVoPlate);
             this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
@@ -1427,12 +1429,12 @@
             // 
             this.OPPOPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.OPPOPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OPPOPlate.Location = new System.Drawing.Point(68, 132);
+            this.OPPOPlate.Location = new System.Drawing.Point(10, 138);
             this.OPPOPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OPPOPlate.Name = "OPPOPlate";
             this.OPPOPlate.Size = new System.Drawing.Size(80, 26);
             this.OPPOPlate.TabIndex = 42;
-            this.OPPOPlate.Text = "Oppo料盘";
+            this.OPPOPlate.Text = "上传Oppo";
             this.OPPOPlate.UseVisualStyleBackColor = true;
             this.OPPOPlate.Click += new System.EventHandler(this.OPPOPlate_Click);
             // 
@@ -1440,7 +1442,7 @@
             // 
             this.ViVoPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ViVoPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ViVoPlate.Location = new System.Drawing.Point(68, 164);
+            this.ViVoPlate.Location = new System.Drawing.Point(7, 202);
             this.ViVoPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ViVoPlate.Name = "ViVoPlate";
             this.ViVoPlate.Size = new System.Drawing.Size(68, 26);
@@ -1462,7 +1464,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(68, 199);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(80, 202);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1765,6 +1767,19 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
+            // CancelOPPOPlate
+            // 
+            this.CancelOPPOPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.CancelOPPOPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CancelOPPOPlate.Location = new System.Drawing.Point(10, 169);
+            this.CancelOPPOPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CancelOPPOPlate.Name = "CancelOPPOPlate";
+            this.CancelOPPOPlate.Size = new System.Drawing.Size(80, 26);
+            this.CancelOPPOPlate.TabIndex = 43;
+            this.CancelOPPOPlate.Text = "取消Oppo";
+            this.CancelOPPOPlate.UseVisualStyleBackColor = true;
+            this.CancelOPPOPlate.Click += new System.EventHandler(this.CancelOPPOPlate_Click);
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1992,5 +2007,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
         private CustomControl.SearchTextBox cu_code;
+        private System.Windows.Forms.Button CancelOPPOPlate;
     }
 }

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -232,9 +232,15 @@ namespace UAS_LabelMachine
                 pib_cusoutboxcode.Visible = false;
                 ViVoPlate.Visible = false;
                 OPPOPlate.Visible = false;
+                CancelOPPOPlate.Visible = false;
                 OutBoxLabelPackage.Visible = false;
                 //GetOutBoxCode.Visible = false;
             }
+            else
+            {
+                pib_barcode.HeaderText = "REEL ID";
+                pib_custbarcode.HeaderText = "UPN";
+            }
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
             //实例化打印进程
@@ -756,6 +762,18 @@ namespace UAS_LabelMachine
                             setdata.Remove("LOTNO");
                             length--;
                             break;
+                        case "REEL ID":
+                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_barcode"];
+                            Matchstr = MatchStr(data[j], "REEL ID");
+                            setdata.Remove("REEL ID");
+                            length--;
+                            break;
+                        case "UPN":
+                            cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_custbarcode"];
+                            Matchstr = MatchStr(data[j], "UPN");
+                            setdata.Remove("UPN");
+                            length--;
+                            break;
                         case "MPN":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_vendprodcode"];
                             Matchstr = MatchStr(data[j], "MPN");
@@ -1100,7 +1118,7 @@ namespace UAS_LabelMachine
             GetSingleBoxData();
             GetMidBoxData();
         }
-
+        bool InitGetLabel = true;
         /// <summary>
         /// 出入库单录入框的回车事件
         /// </summary>
@@ -1115,7 +1133,9 @@ namespace UAS_LabelMachine
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 {
+                    InitGetLabel = true;
                     cu_code.Text = dt.Rows[0]["pi_cardcode"].ToString();
+                    InitGetLabel = false;
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
                     if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
@@ -2015,7 +2035,7 @@ namespace UAS_LabelMachine
             bool mouseOver = e.CellBounds.Contains(this.PointToClient(Cursor.Position));
             if (e.ColumnIndex > 0)
             {
-                if (LabelInf.Columns[e.ColumnIndex].Name == "pib_madein" || LabelInf.Columns[e.ColumnIndex].Name == "pib_lotno" || LabelInf.Columns[e.ColumnIndex].Name == "pib_datecode" || LabelInf.Columns[e.ColumnIndex].Name == "pib_outboxcode1" || LabelInf.Columns[e.ColumnIndex].Name == "pib_outboxcode2" || LabelInf.Columns[e.ColumnIndex].Name == "pib_brand")
+                if (LabelInf.Columns[e.ColumnIndex].Name == "pib_custbarcode"|| LabelInf.Columns[e.ColumnIndex].Name == "pib_barcode"||LabelInf.Columns[e.ColumnIndex].Name == "pib_madein" || LabelInf.Columns[e.ColumnIndex].Name == "pib_lotno" || LabelInf.Columns[e.ColumnIndex].Name == "pib_datecode" || LabelInf.Columns[e.ColumnIndex].Name == "pib_outboxcode1" || LabelInf.Columns[e.ColumnIndex].Name == "pib_outboxcode2" || LabelInf.Columns[e.ColumnIndex].Name == "pib_brand")
                 {
                     SolidBrush solidBrush = new SolidBrush(Color.FromArgb(51, 153, 255));
                     e.Graphics.FillRectangle(mouseOver ? solidBrush : Brushes.LightSeaGreen, e.CellBounds);
@@ -2556,7 +2576,6 @@ namespace UAS_LabelMachine
         private void OPPOPlate_Click(object sender, EventArgs e)
         {
             StringBuilder strUpnList = new StringBuilder();
-            string date = System.DateTime.Now.ToString("yyMdd");
             for (int i = 0; i < LabelInf.Rows.Count; i++)
             {
                 if (i % PageCount == 0)
@@ -2567,23 +2586,23 @@ namespace UAS_LabelMachine
                 string vendprodcode = LabelInf.Rows[i].Cells["pr_vendprodcode"].Value.ToString();
                 string madein = LabelInf.Rows[i].Cells["pib_madein"].Value.ToString();
                 string dc = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
+                string wafer_factory = LabelInf.Rows[i].Cells["pib_barcode"].Value.ToString();
                 string ln = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
                 string qty = LabelInf.Rows[i].Cells["pib_qty"].Value.ToString();
                 string serial = BaseUtil.lpad(5, (i + 1).ToString());
-                string barcode = cuprodcode + "-" + "JW9591" + "-" + date + "-" + serial;
-                strUpnList.Append(@"{""upn_qr"":""@upn*@time*@MSD*@DC*@LN*@QC*@qty*@hd*@sw*@madein"",").Replace("@upn", cuprodcode + "-" + "JW9591" + "-" + date + "-" + serial)
+                string barcode = LabelInf.Rows[i].Cells["pib_custbarcode"].Value.ToString();
+                strUpnList.Append(@"{""upn_qr"":""@upn*@time*@MSD*@DC*@LN*@QC*@qty*@hd*@sw*@madein"",").Replace("@upn", barcode)
                     .Replace("@time", System.DateTime.Now.ToString("yyyyMMddhhmmssff")).Replace("@MSD", "").Replace("@DC", dc).Replace("@LN", ln)
                     .Replace("@QC", "").Replace("@qty", qty).Replace("@hd", "").Replace("@sw", "").Replace("@madein", madein);
                 strUpnList.Append(@"""upn"":""@upn"",").Replace("@upn", barcode);
                 strUpnList.Append(@"""vendor_code"":""JW9591"",");
                 strUpnList.Append(@"""mat_id"":""@mat_id"",").Replace("@mat_id", cuprodcode);
                 strUpnList.Append(@"""vendor_spec"":""@vendor_spec"",").Replace("@vendor_spec", vendprodcode);
-                strUpnList.Append(@"""wafer_factory"":""@wafer_factory"",").Replace("@wafer_factory", madein);
+                strUpnList.Append(@"""wafer_factory"":""@wafer_factory"",").Replace("@wafer_factory", wafer_factory);
                 strUpnList.Append(@"""pack_factory"":""@pack_factory"",").Replace("@pack_factory", madein);
                 strUpnList.Append(@"""dc"":""@dc"",").Replace("@dc", dc);
                 strUpnList.Append(@"""ln"":""@ln"",").Replace("@ln", ln);
                 strUpnList.Append(@"""qty"":@qty}").Replace("@qty", qty);
-                LabelInf.Rows[i].Cells["pib_custbarcode"].Value = barcode;
                 if (!((i != 0 && (i + 1) % PageCount == 0) || i == LabelInf.Rows.Count - 1))
                 {
                     strUpnList.Append(",");
@@ -2608,7 +2627,50 @@ namespace UAS_LabelMachine
 
         private void cu_code_UserControlTextChanged(object sender, EventArgs e)
         {
-            GetInOutInfAndLabelFile();
+            if (!InitGetLabel)
+                GetInOutInfAndLabelFile();
+        }
+
+        private void CancelOPPOPlate_Click(object sender, EventArgs e)
+        {
+            StringBuilder strUpnList = new StringBuilder();
+            for (int i = 0; i < LabelInf.Rows.Count; i++)
+            {
+                if (i % PageCount == 0)
+                {
+                    strUpnList.Append("[");
+                }
+                string cuprodcode = LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString();
+                string vendprodcode = LabelInf.Rows[i].Cells["pr_vendprodcode"].Value.ToString();
+                string madein = LabelInf.Rows[i].Cells["pib_madein"].Value.ToString();
+                string dc = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
+                string wafer_factory = LabelInf.Rows[i].Cells["pib_barcode"].Value.ToString();
+                string ln = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
+                string qty = LabelInf.Rows[i].Cells["pib_qty"].Value.ToString();
+                string serial = BaseUtil.lpad(5, (i + 1).ToString());
+                string barcode = LabelInf.Rows[i].Cells["pib_custbarcode"].Value.ToString();
+                strUpnList.Append(@"{""upn"":""@upn"",").Replace("@upn", barcode);
+                strUpnList.Append(@"""vendor_code"":""JW9591""}");
+                if (!((i != 0 && (i + 1) % PageCount == 0) || i == LabelInf.Rows.Count - 1))
+                {
+                    strUpnList.Append(",");
+                }
+                if ((i != 0 && (i + 1) % PageCount == 0) || i == LabelInf.Rows.Count - 1)
+                {
+                    strUpnList.Append("]");
+                    string strmsginsert = hc.deleteUpnInfo("https://api.myoas.com", AppId, Secret, strUpnList.ToString(), (i + 1) % PageCount == 0 ? PageCount : (i + 1) % PageCount);
+                    Dictionary<string, object> dic = BaseUtil.ToDictionary(strmsginsert);
+                    if (dic["code"].ToString().Replace("\"", "") != "200")
+                    {
+                        MessageLog.AppendText(dic["msg"] + "\n", Color.Red);
+                    }
+                    else
+                    {
+                        MessageLog.AppendText("取消成功", Color.Green);
+                    }
+                    strUpnList.Clear();
+                }
+            }
         }
     }
 }

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

@@ -35,6 +35,7 @@
             this.pr_kind_label = new System.Windows.Forms.Label();
             this.pr_kind = new System.Windows.Forms.ComboBox();
             this.MidCapacity_label = new System.Windows.Forms.Label();
+            this.ResetSerialNum = new UAS_LabelMachine.CustomControl.NormalButton();
             this.SetMidCapacity = new UAS_LabelMachine.CustomControl.NormalButton();
             this.MidCapacity = new UAS_LabelMachine.CustomControl.NumOnlyTextBox();
             this.ChooseAll = new UAS_LabelMachine.CustomControl.ChooseAllButton();
@@ -42,7 +43,6 @@
             this.Screen = new UAS_LabelMachine.CustomControl.NormalButton();
             this.ProdIoInfDGV = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
-            this.ResetSerialNum = new UAS_LabelMachine.CustomControl.NormalButton();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pd_orderdetno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -52,6 +52,7 @@
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_totalqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -125,6 +126,17 @@
             this.MidCapacity_label.TabIndex = 158;
             this.MidCapacity_label.Text = "中盘容量";
             // 
+            // ResetSerialNum
+            // 
+            this.ResetSerialNum.Image = ((System.Drawing.Image)(resources.GetObject("ResetSerialNum.Image")));
+            this.ResetSerialNum.Location = new System.Drawing.Point(529, 78);
+            this.ResetSerialNum.Name = "ResetSerialNum";
+            this.ResetSerialNum.Size = new System.Drawing.Size(64, 24);
+            this.ResetSerialNum.TabIndex = 161;
+            this.ResetSerialNum.Text = "流水重置";
+            this.ResetSerialNum.UseVisualStyleBackColor = true;
+            this.ResetSerialNum.Click += new System.EventHandler(this.ResetSerialNum_Click);
+            // 
             // SetMidCapacity
             // 
             this.SetMidCapacity.Image = ((System.Drawing.Image)(resources.GetObject("SetMidCapacity.Image")));
@@ -193,6 +205,7 @@
             this.pr_detail,
             this.pd_ordercode,
             this.pr_spec,
+            this.pr_madein,
             this.pr_brand,
             this.pr_unit,
             this.pd_totalqty,
@@ -223,17 +236,6 @@
             this.pi_inoutno.Tag = "cu_name";
             this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bi_inoutno_KeyDown);
             // 
-            // ResetSerialNum
-            // 
-            this.ResetSerialNum.Image = ((System.Drawing.Image)(resources.GetObject("ResetSerialNum.Image")));
-            this.ResetSerialNum.Location = new System.Drawing.Point(529, 78);
-            this.ResetSerialNum.Name = "ResetSerialNum";
-            this.ResetSerialNum.Size = new System.Drawing.Size(64, 24);
-            this.ResetSerialNum.TabIndex = 161;
-            this.ResetSerialNum.Text = "流水重置";
-            this.ResetSerialNum.UseVisualStyleBackColor = true;
-            this.ResetSerialNum.Click += new System.EventHandler(this.ResetSerialNum_Click);
-            // 
             // Choose
             // 
             this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -297,6 +299,12 @@
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
             // 
+            // pr_madein
+            // 
+            this.pr_madein.DataPropertyName = "pr_madein";
+            this.pr_madein.HeaderText = "产地";
+            this.pr_madein.Name = "pr_madein";
+            // 
             // pr_brand
             // 
             this.pr_brand.DataPropertyName = "pr_brand";
@@ -406,6 +414,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_ordercode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_madein;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_brand;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_totalqty;

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

@@ -189,6 +189,7 @@ namespace UAS_LabelMachine
                     string pd_pdno = ProdIoInfDGV.Rows[i].Cells["pd_pdno"].FormattedValue.ToString();
                     string pd_orderdetno = ProdIoInfDGV.Rows[i].Cells["pd_orderdetno"].FormattedValue.ToString();
                     string pr_brand = ProdIoInfDGV.Rows[i].Cells["pr_brand"].FormattedValue.ToString();
+                    string pr_madein = ProdIoInfDGV.Rows[i].Cells["pr_madein"].FormattedValue.ToString();
                     //总数
                     int pd_totalqty = int.Parse(ProdIoInfDGV.Rows[i].Cells["pd_totalqty"].FormattedValue.ToString());
                     //本次数量
@@ -248,9 +249,9 @@ namespace UAS_LabelMachine
                     {
                         //插入条码
                         sql.Clear();
-                        sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_CUSTBARCODE,PIB_PDNO,");
+                        sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_MADEIN,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_CUSTBARCODE,PIB_PDNO,");
                         sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,PIB_PRODID,PIB_OUTBOXCODE1,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,PIB_CUSTPO,pib_orderdetno)");
-                        sql.Append(" values (prodiobarcode_seq.nextval,'" + pd_prodcode + "',sysdate,'" + pi_inoutno.Text + "'," + pi_id + ",'" + pr_brand + "',:barcode,:custbarcode,'" + pd_pdno + "','" + pd_id + "',");
+                        sql.Append(" values (prodiobarcode_seq.nextval,'" + pd_prodcode + "',sysdate,'"+ pr_madein + "','" + pi_inoutno.Text + "'," + pi_id + ",'" + pr_brand + "',:barcode,:custbarcode,'" + pd_pdno + "','" + pd_id + "',");
                         sql.Append("'" + pi_class.Text + "',:pib_inqty,'" + pr_id + "',:midcode,0,0,'" + pd_ordercode + "','','" + pd_orderdetno + "')");
                         dh.BatchInsert(sql.ToString(), new string[] { "barcode", "custbarcode", "pib_inqty", "midcode" }, barcode.ToArray(), custbarcode.ToArray(), pib_inqty.ToArray(), midcode.ToArray());
                         //更新最大流水号
@@ -449,8 +450,8 @@ namespace UAS_LabelMachine
                 {
                     case "出货单":
                         sql.Clear();
-                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
-                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_ordercode,pd_orderdetno,pd_pdno,");
+                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
+                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_ordercode,pd_orderdetno,pd_pdno,");
                         sql.Append("pd_prodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id) pd_id,sum(pd_outqty)outqty,pd_ordercode,pd_orderdetno,pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail  group by pd_piid,pd_ordercode, pd_orderdetno,pd_pdno)T left join product ");
@@ -458,8 +459,8 @@ namespace UAS_LabelMachine
                         break;
                     case "完工入库单":
                         sql.Clear();
-                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
-                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty,pd_ordercode,pd_orderdetno,pd_pdno,");
+                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty pd_totalqty,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
+                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,inqty,pd_ordercode,pd_orderdetno,pd_pdno,");
                         sql.Append("pd_prodcode,pd_piclass,inqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id) pd_id,sum(pd_inqty)inqty,pd_ordercode,pd_orderdetno,pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail  group by pd_piid,pd_ordercode, pd_orderdetno,pd_pdno)T left join product ");

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

@@ -118,6 +118,18 @@
     <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="ResetSerialNum.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
+        877S3fT09DxZeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQAAAAAACwAAAAAUgAXAAAI/wAlCBxIsKDBgwgTKlzIsGCEhxAjSpxIsaLFixgzPhQY
+        AYHHjyBDihxJsqTJkygjcFTAsqXLlzBjypxJs6ZNlRIiHNjJs6fPn0CDCh1KtCjOCAuSKl3KtKnTp1Cj
+        Sp169IHVq1izat3KtavXr2Crgh1LtqzZrUcdqF3Ltq3bt3Djyp1L92iCu3jz6t3Lt6/fv4ADHxVAuLDh
+        w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
+        u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
+        48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
+</value>
+  </data>
   <data name="SetMidCapacity.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
@@ -181,6 +193,9 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pr_madein.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pr_brand.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -205,16 +220,4 @@
   <metadata name="mid_remain.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="ResetSerialNum.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
-        877S3fT09DxZeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQAAAAAACwAAAAAUgAXAAAI/wAlCBxIsKDBgwgTKlzIsGCEhxAjSpxIsaLFixgzPhQY
-        AYHHjyBDihxJsqTJkygjcFTAsqXLlzBjypxJs6ZNlRIiHNjJs6fPn0CDCh1KtCjOCAuSKl3KtKnTp1Cj
-        Sp169IHVq1izat3KtavXr2Crgh1LtqzZrUcdqF3Ltq3bt3Djyp1L92iCu3jz6t3Lt6/fv4ADHxVAuLDh
-        w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
-        u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
-        48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
-</value>
-  </data>
 </root>

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

@@ -18,6 +18,8 @@ namespace UAS_LabelMachine
 
         DataTable dt;
 
+        int ItemNum = 8;
+
         public 采集策略()
         {
             InitializeComponent();
@@ -26,6 +28,8 @@ namespace UAS_LabelMachine
             si_type4.CheckedChanged += CheckChanged;
             si_type2.CheckedChanged += CheckChanged;
             si_type5.CheckedChanged += CheckChanged;
+            si_type6.CheckedChanged += CheckChanged;
+            si_type7.CheckedChanged += CheckChanged;
         }
 
         public 采集策略(string SG_CODE)
@@ -37,6 +41,8 @@ namespace UAS_LabelMachine
             si_type4.CheckedChanged += CheckChanged;
             si_type2.CheckedChanged += CheckChanged;
             si_type5.CheckedChanged += CheckChanged;
+            si_type6.CheckedChanged += CheckChanged;
+            si_type7.CheckedChanged += CheckChanged;
         }
 
         private void 采集策略_Load(object sender, EventArgs e)
@@ -52,6 +58,8 @@ namespace UAS_LabelMachine
             si_kind3.Text = "全部";
             si_kind4.Text = "全部";
             si_kind5.Text = "全部";
+            si_kind6.Text = "全部";
+            si_kind7.Text = "全部";
             if (sg_code.Text != "")
             {
                 KeyEventArgs e2 = new KeyEventArgs(Keys.Enter);
@@ -78,23 +86,22 @@ namespace UAS_LabelMachine
                 sql.Append("update scangroup set sg_name='" + sg_name.Text + "',sg_code='" + sg_code.Text + "',sg_brand='" + pb_name.Text + "',");
                 sql.Append("sg_separator=:sg_separator where sg_id=" + sg_id.Text);
                 dh.ExecuteSql(sql.ToString(), "update", new string[] { sg_separator.Text });
-                for (int i = 1; i < 6; i++)
+                dh.ExecuteSql("delete from scanitem where si_sgid=" + sg_id.Text, "delete");
+                for (int i = 1; i < ItemNum; i++)
                 {
-                    //如果从表的ID不为空则表示此条记录已存在需要更新
-                    if (Controls["si_id" + i].Text != "")
+                    //保存四条记录，通过si_enable字段来判断是否启用
+                    int Enable = 0;
+                    if ((Controls["si_type" + i] as CheckBox).Checked)
                     {
-                        int Enable = 0;
-                        if ((Controls["si_type" + i] as CheckBox).Checked)
-                        {
-                            Enable = 1;
-                        }
-                        sql.Clear();
-                        sql.Append("update scanitem set si_innerdetno='" + Controls["si_innerdetno" + i].Text + "',si_item='" + Controls["si_item" + i].Text + "',si_detno='" + Controls["si_detno" + i].Text + "',");
-                        sql.Append("si_index='" + Controls["si_index" + i].Text + "',si_indexstring='" + Controls["si_indexstring" + i].Text + "',");
-                        sql.Append("si_kind='" + Controls["si_kind" + i].Text + "', si_length='" + Controls["si_length" + i].Text + "',si_expressionitem='" + Controls["si_expressionitem" + i].Text + "',");
-                        sql.Append("si_expression=:si_expression,si_enable=" + Enable + " where si_id=" + Controls["si_id" + i].Text);
-                        dh.ExecuteSql(sql.ToString(), "update", new string[] { Controls["si_expression" + i].Text });
+                        Enable = 1;
                     }
+                    string si_id = dh.GetSEQ("scanitem_seq");
+                    sql.Clear();
+                    sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable,si_innerdetno) values(" + si_id + "," + sg_id.Text);
+                    sql.Append(",'" + Controls["si_detno" + i].Text + "','" + Controls["si_item" + i].Text + "','" + Controls["si_kind" + i].Text + "',");
+                    sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ",'" + Controls["si_innerdetno" + i].Text + "')");
+                    dh.ExecuteSql(sql.ToString(), "insert", new string[] { Controls["si_expression" + i].Text });
+                    Controls["si_id" + i].Text = si_id;
                 }
                 MessageBox.Show("保存成功");
             }
@@ -110,7 +117,7 @@ namespace UAS_LabelMachine
                     sql.Append("'" + pb_name.Text + "',:sg_separator)");
                     dh.ExecuteSql(sql.ToString(), "insert", new string[] { sg_separator.Text });
                     //遍历需要采集的字段
-                    for (int i = 1; i < 6; i++)
+                    for (int i = 1; i < ItemNum; i++)
                     {
                         //保存四条记录，通过si_enable字段来判断是否启用
                         int Enable = 0;
@@ -174,6 +181,12 @@ namespace UAS_LabelMachine
                 case "品牌":
                     i = 5;
                     break;
+                case "UPN":
+                    i = 6;
+                    break;
+                case "REEL ID":
+                    i = 7;
+                    break;
                 default:
                     break;
             }
@@ -216,7 +229,7 @@ namespace UAS_LabelMachine
                     //通过匹配采集的字段名称给界面赋值
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
-                        for (int j = 1; j < 6; j++)
+                        for (int j = 1; j < ItemNum; j++)
                         {
                             //如果Item和CheckBox的文字相等
                             if (dt.Rows[i]["si_item"].ToString() == Controls["si_type" + j].Text)