Merge repos.ubtob.net:usoft/mes-client

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -857,8 +857,13 @@ namespace UAS_MES_NEW.Make
                             wo = dt.Rows[0]["ms_makecode"].ToString();
                             line = dt.Rows[0]["ms_linecode"].ToString();
                         }
+                        else
+                        {
+                            LogMessage($"NG,文件{PathName} 序列号{currItem[0]}无归属过站记录");
+                            continue;
+                        }
 
-                        if(string.IsNullOrEmpty(wo) && string.IsNullOrEmpty(line))
+                        if (string.IsNullOrEmpty(wo) && string.IsNullOrEmpty(line))
                         {
                             if (currItem.Length < 3)
                             {

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.Designer.cs

@@ -30,23 +30,6 @@
         {
             this.Container = new System.Windows.Forms.TableLayoutPanel();
             this.DataBox = new System.Windows.Forms.DataGridView();
-            this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.WORK_ORDER = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.IN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ESTIMATE_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BAKING_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.productName = new System.Windows.Forms.Label();
-            this.productCode = new System.Windows.Forms.Label();
-            this.workOrder = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.serialNumber = new System.Windows.Forms.Label();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.panel2 = new System.Windows.Forms.Panel();
             this.EmployeeVal1 = new System.Windows.Forms.TextBox();
@@ -55,9 +38,7 @@
             this.ReelNoVal1 = new System.Windows.Forms.TextBox();
             this.ReelNoLab1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.EmployeeVal = new System.Windows.Forms.TextBox();
             this.EmployeeLab = new System.Windows.Forms.Label();
             this.EstimateLab1 = new System.Windows.Forms.Label();
@@ -74,13 +55,33 @@
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.WORK_ORDER = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ESTIMATE_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BAKING_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = new System.Windows.Forms.Label();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.Container.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
-            this.SNDetails.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // Container
@@ -125,198 +126,6 @@
             this.DataBox.Size = new System.Drawing.Size(1274, 390);
             this.DataBox.TabIndex = 155;
             // 
-            // BOX_NO
-            // 
-            this.BOX_NO.DataPropertyName = "BOX_NO";
-            this.BOX_NO.HeaderText = "烘烤箱号";
-            this.BOX_NO.MinimumWidth = 8;
-            this.BOX_NO.Name = "BOX_NO";
-            this.BOX_NO.ReadOnly = true;
-            this.BOX_NO.Visible = false;
-            this.BOX_NO.Width = 150;
-            // 
-            // WORK_ORDER
-            // 
-            this.WORK_ORDER.DataPropertyName = "WORK_ORDER";
-            this.WORK_ORDER.HeaderText = "工单号";
-            this.WORK_ORDER.MinimumWidth = 8;
-            this.WORK_ORDER.Name = "WORK_ORDER";
-            this.WORK_ORDER.ReadOnly = true;
-            this.WORK_ORDER.Width = 130;
-            // 
-            // REEL_NO
-            // 
-            this.REEL_NO.DataPropertyName = "REEL_NO";
-            this.REEL_NO.HeaderText = "物料条码";
-            this.REEL_NO.MinimumWidth = 8;
-            this.REEL_NO.Name = "REEL_NO";
-            this.REEL_NO.ReadOnly = true;
-            this.REEL_NO.Width = 150;
-            // 
-            // IN_DATE
-            // 
-            this.IN_DATE.DataPropertyName = "IN_DATE";
-            this.IN_DATE.HeaderText = "入烘烤时间";
-            this.IN_DATE.MinimumWidth = 8;
-            this.IN_DATE.Name = "IN_DATE";
-            this.IN_DATE.ReadOnly = true;
-            this.IN_DATE.Width = 150;
-            // 
-            // ESTIMATE_TIME
-            // 
-            this.ESTIMATE_TIME.DataPropertyName = "ESTIMATE_TIME";
-            this.ESTIMATE_TIME.HeaderText = "预计烘烤时长";
-            this.ESTIMATE_TIME.MinimumWidth = 8;
-            this.ESTIMATE_TIME.Name = "ESTIMATE_TIME";
-            this.ESTIMATE_TIME.ReadOnly = true;
-            this.ESTIMATE_TIME.Width = 150;
-            // 
-            // IN_NAME
-            // 
-            this.IN_NAME.DataPropertyName = "IN_NAME";
-            this.IN_NAME.HeaderText = "入烘烤人员";
-            this.IN_NAME.MinimumWidth = 8;
-            this.IN_NAME.Name = "IN_NAME";
-            this.IN_NAME.ReadOnly = true;
-            this.IN_NAME.Width = 150;
-            // 
-            // BAKING_TIME
-            // 
-            this.BAKING_TIME.DataPropertyName = "BAKING_TIME";
-            this.BAKING_TIME.HeaderText = "当前烘烤时间";
-            this.BAKING_TIME.MinimumWidth = 8;
-            this.BAKING_TIME.Name = "BAKING_TIME";
-            this.BAKING_TIME.ReadOnly = true;
-            this.BAKING_TIME.Width = 150;
-            // 
-            // SNDetails
-            // 
-            this.SNDetails.BorderColor = System.Drawing.Color.Black;
-            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
-            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SNDetails.Location = new System.Drawing.Point(3, 4);
-            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.SNDetails.Name = "SNDetails";
-            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
-            this.SNDetails.TabIndex = 4;
-            this.SNDetails.TabStop = false;
-            this.SNDetails.Text = "条码信息";
-            this.SNDetails.TextColor = System.Drawing.Color.Black;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 8;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
-            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
-            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
-            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 1;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 64);
-            this.tableLayoutPanel1.TabIndex = 0;
-            // 
-            // productName
-            // 
-            this.productName.AutoSize = true;
-            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productName.Location = new System.Drawing.Point(876, 0);
-            this.productName.Name = "productName";
-            this.productName.Size = new System.Drawing.Size(389, 64);
-            this.productName.TabIndex = 7;
-            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // productCode
-            // 
-            this.productCode.AutoSize = true;
-            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productCode.Location = new System.Drawing.Point(628, 0);
-            this.productCode.Name = "productCode";
-            this.productCode.Size = new System.Drawing.Size(161, 64);
-            this.productCode.TabIndex = 6;
-            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // workOrder
-            // 
-            this.workOrder.AutoSize = true;
-            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.workOrder.Location = new System.Drawing.Point(394, 0);
-            this.workOrder.Name = "workOrder";
-            this.workOrder.Size = new System.Drawing.Size(147, 64);
-            this.workOrder.TabIndex = 5;
-            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(795, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(75, 64);
-            this.label4.TabIndex = 3;
-            this.label4.Text = "物料规格: ";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(3, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(75, 64);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "条码号: ";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(547, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(75, 64);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "物料编号: ";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(313, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(75, 64);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "物料名称: ";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // serialNumber
-            // 
-            this.serialNumber.AutoSize = true;
-            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.serialNumber.Location = new System.Drawing.Point(84, 0);
-            this.serialNumber.Name = "serialNumber";
-            this.serialNumber.Size = new System.Drawing.Size(223, 64);
-            this.serialNumber.TabIndex = 4;
-            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // tableLayoutPanel2
             // 
             this.tableLayoutPanel2.ColumnCount = 2;
@@ -363,6 +172,7 @@
             this.Choose1.TabIndex = 173;
             this.Choose1.Text = "出烘烤";
             this.Choose1.UseVisualStyleBackColor = true;
+            this.Choose1.Visible = false;
             this.Choose1.Click += new System.EventHandler(this.Choose1_Click);
             // 
             // EmployeeLab1
@@ -417,18 +227,6 @@
             this.panel1.Size = new System.Drawing.Size(631, 204);
             this.panel1.TabIndex = 136;
             // 
-            // LockMakeCode
-            // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(311, 19);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 181;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
             // ms_makecode_label
             // 
             this.ms_makecode_label.AutoSize = true;
@@ -440,25 +238,6 @@
             this.ms_makecode_label.TabIndex = 179;
             this.ms_makecode_label.Text = "归属工单:";
             // 
-            // 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(102, 19);
-            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(205, 32);
-            this.ma_code.TabIndex = 180;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            // 
             // EmployeeVal
             // 
             this.EmployeeVal.Location = new System.Drawing.Point(102, 60);
@@ -519,6 +298,7 @@
             this.Choose.TabIndex = 173;
             this.Choose.Text = "入烘烤";
             this.Choose.UseVisualStyleBackColor = true;
+            this.Choose.Visible = false;
             this.Choose.Click += new System.EventHandler(this.Choose_Click);
             // 
             // BackingVal
@@ -568,6 +348,7 @@
             this.dataGridViewTextBoxColumn1.HeaderText = "烘烤箱号";
             this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Visible = false;
             this.dataGridViewTextBoxColumn1.Width = 150;
             // 
             // dataGridViewTextBoxColumn2
@@ -610,6 +391,237 @@
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
             this.dataGridViewTextBoxColumn6.Width = 150;
             // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "BAKING_TIME";
+            this.dataGridViewTextBoxColumn7.HeaderText = "当前烘烤时间";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.Width = 150;
+            // 
+            // BOX_NO
+            // 
+            this.BOX_NO.DataPropertyName = "BOX_NO";
+            this.BOX_NO.HeaderText = "烘烤箱号";
+            this.BOX_NO.MinimumWidth = 8;
+            this.BOX_NO.Name = "BOX_NO";
+            this.BOX_NO.ReadOnly = true;
+            this.BOX_NO.Visible = false;
+            this.BOX_NO.Width = 150;
+            // 
+            // WORK_ORDER
+            // 
+            this.WORK_ORDER.DataPropertyName = "WORK_ORDER";
+            this.WORK_ORDER.HeaderText = "工单号";
+            this.WORK_ORDER.MinimumWidth = 8;
+            this.WORK_ORDER.Name = "WORK_ORDER";
+            this.WORK_ORDER.ReadOnly = true;
+            this.WORK_ORDER.Width = 130;
+            // 
+            // REEL_NO
+            // 
+            this.REEL_NO.DataPropertyName = "REEL_NO";
+            this.REEL_NO.HeaderText = "物料条码";
+            this.REEL_NO.MinimumWidth = 8;
+            this.REEL_NO.Name = "REEL_NO";
+            this.REEL_NO.ReadOnly = true;
+            this.REEL_NO.Width = 150;
+            // 
+            // IN_DATE
+            // 
+            this.IN_DATE.DataPropertyName = "IN_DATE";
+            this.IN_DATE.HeaderText = "入烘烤时间";
+            this.IN_DATE.MinimumWidth = 8;
+            this.IN_DATE.Name = "IN_DATE";
+            this.IN_DATE.ReadOnly = true;
+            this.IN_DATE.Width = 150;
+            // 
+            // ESTIMATE_TIME
+            // 
+            this.ESTIMATE_TIME.DataPropertyName = "ESTIMATE_TIME";
+            this.ESTIMATE_TIME.HeaderText = "预计烘烤时长";
+            this.ESTIMATE_TIME.MinimumWidth = 8;
+            this.ESTIMATE_TIME.Name = "ESTIMATE_TIME";
+            this.ESTIMATE_TIME.ReadOnly = true;
+            this.ESTIMATE_TIME.Width = 150;
+            // 
+            // IN_NAME
+            // 
+            this.IN_NAME.DataPropertyName = "IN_NAME";
+            this.IN_NAME.HeaderText = "入烘烤人员";
+            this.IN_NAME.MinimumWidth = 8;
+            this.IN_NAME.Name = "IN_NAME";
+            this.IN_NAME.ReadOnly = true;
+            this.IN_NAME.Width = 150;
+            // 
+            // BAKING_TIME
+            // 
+            this.BAKING_TIME.DataPropertyName = "BAKING_TIME";
+            this.BAKING_TIME.HeaderText = "当前烘烤时间";
+            this.BAKING_TIME.MinimumWidth = 8;
+            this.BAKING_TIME.Name = "BAKING_TIME";
+            this.BAKING_TIME.ReadOnly = true;
+            this.BAKING_TIME.Width = 150;
+            // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SNDetails.Location = new System.Drawing.Point(3, 4);
+            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
+            this.SNDetails.TabIndex = 4;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "条码信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 64);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // productName
+            // 
+            this.productName.AutoSize = true;
+            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productName.Location = new System.Drawing.Point(876, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(389, 64);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(628, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(161, 64);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(394, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(147, 64);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(795, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(75, 64);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "物料规格: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 64);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "条码号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(547, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 64);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "物料编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(313, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 64);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "物料名称: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(84, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(223, 64);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(311, 19);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 181;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // 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(102, 19);
+            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(205, 32);
+            this.ma_code.TabIndex = 180;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
             // Make_BakingManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -624,14 +636,14 @@
             this.Load += new System.EventHandler(this.Make_InBaking_Load);
             this.Container.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
-            this.SNDetails.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -684,5 +696,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ESTIMATE_TIME;
         private System.Windows.Forms.DataGridViewTextBoxColumn IN_NAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn BAKING_TIME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.cs

@@ -102,6 +102,7 @@ namespace UAS_MES_NEW.Make
                     return;
                 }
             }
+            Choose_Click(null, null);
         }
 
         private void ReelNoVal1_KeyDown(object sender, KeyEventArgs e)
@@ -122,6 +123,7 @@ namespace UAS_MES_NEW.Make
                     return;
                 }
             }
+            Choose1_Click(null, null);
         }
 
         private void ReelNoVal1_Leave(object sender, EventArgs e)

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.resx

@@ -138,4 +138,25 @@
   <metadata name="BAKING_TIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="BOX_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="WORK_ORDER.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="REEL_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IN_DATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ESTIMATE_TIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IN_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BAKING_TIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -39,7 +39,8 @@
             this.DotVal = new System.Windows.Forms.TextBox();
             this.Confirm = new System.Windows.Forms.Button();
             this.TopBox = new System.Windows.Forms.Panel();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.CurrQtyVal = new System.Windows.Forms.TextBox();
+            this.CurrQtyLab = new System.Windows.Forms.Label();
             this.EmployeeVal = new System.Windows.Forms.TextBox();
             this.EmployeeLab = new System.Windows.Forms.Label();
             this.ma_qty = new System.Windows.Forms.TextBox();
@@ -48,20 +49,10 @@
             this.PrdetailLab = new System.Windows.Forms.Label();
             this.BurnLotnoVal = new System.Windows.Forms.TextBox();
             this.BurnLotnoLab = new System.Windows.Forms.Label();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.DataBox = new System.Windows.Forms.DataGridView();
-            this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.RightBox = new System.Windows.Forms.Panel();
             this.ClearMsg = new System.Windows.Forms.Button();
-            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -70,6 +61,19 @@
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TopBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -185,6 +189,8 @@
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.CurrQtyVal);
+            this.TopBox.Controls.Add(this.CurrQtyLab);
             this.TopBox.Controls.Add(this.ma_code);
             this.TopBox.Controls.Add(this.EmployeeVal);
             this.TopBox.Controls.Add(this.EmployeeLab);
@@ -211,24 +217,24 @@
             this.TopBox.Size = new System.Drawing.Size(1280, 201);
             this.TopBox.TabIndex = 153;
             // 
-            // ma_code
+            // CurrQtyVal
             // 
-            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(91, 30);
-            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(205, 32);
-            this.ma_code.TabIndex = 143;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
+            this.CurrQtyVal.Enabled = false;
+            this.CurrQtyVal.Location = new System.Drawing.Point(1115, 31);
+            this.CurrQtyVal.Name = "CurrQtyVal";
+            this.CurrQtyVal.Size = new System.Drawing.Size(61, 31);
+            this.CurrQtyVal.TabIndex = 182;
+            // 
+            // CurrQtyLab
+            // 
+            this.CurrQtyLab.AutoSize = true;
+            this.CurrQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CurrQtyLab.Location = new System.Drawing.Point(1049, 32);
+            this.CurrQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.CurrQtyLab.Name = "CurrQtyLab";
+            this.CurrQtyLab.Size = new System.Drawing.Size(96, 28);
+            this.CurrQtyLab.TabIndex = 181;
+            this.CurrQtyLab.Text = "累计数量";
             // 
             // EmployeeVal
             // 
@@ -305,18 +311,6 @@
             this.BurnLotnoLab.TabIndex = 154;
             this.BurnLotnoLab.Text = "条码扫描";
             // 
-            // LockMakeCode
-            // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(310, 32);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 153;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
             // DataBox
             // 
             this.DataBox.AllowUserToAddRows = false;
@@ -325,6 +319,7 @@
             this.DataBox.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DataBox.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.work_order,
+            this.burn_qty,
             this.burn_lotno,
             this.line,
             this.burn_software,
@@ -342,79 +337,6 @@
             this.DataBox.Size = new System.Drawing.Size(890, 513);
             this.DataBox.TabIndex = 154;
             // 
-            // work_order
-            // 
-            this.work_order.DataPropertyName = "work_order";
-            this.work_order.HeaderText = "工单号";
-            this.work_order.MinimumWidth = 8;
-            this.work_order.Name = "work_order";
-            this.work_order.ReadOnly = true;
-            this.work_order.Width = 150;
-            // 
-            // burn_lotno
-            // 
-            this.burn_lotno.DataPropertyName = "burn_lotno";
-            this.burn_lotno.HeaderText = "烧录批号";
-            this.burn_lotno.MinimumWidth = 8;
-            this.burn_lotno.Name = "burn_lotno";
-            this.burn_lotno.ReadOnly = true;
-            this.burn_lotno.Width = 150;
-            // 
-            // line
-            // 
-            this.line.DataPropertyName = "line";
-            this.line.HeaderText = "线体";
-            this.line.MinimumWidth = 8;
-            this.line.Name = "line";
-            this.line.ReadOnly = true;
-            this.line.Visible = false;
-            this.line.Width = 150;
-            // 
-            // burn_software
-            // 
-            this.burn_software.DataPropertyName = "burn_software";
-            this.burn_software.HeaderText = "烧录软件";
-            this.burn_software.MinimumWidth = 8;
-            this.burn_software.Name = "burn_software";
-            this.burn_software.ReadOnly = true;
-            this.burn_software.Width = 150;
-            // 
-            // check_code
-            // 
-            this.check_code.DataPropertyName = "check_code";
-            this.check_code.HeaderText = "校验码";
-            this.check_code.MinimumWidth = 8;
-            this.check_code.Name = "check_code";
-            this.check_code.ReadOnly = true;
-            this.check_code.Width = 150;
-            // 
-            // dot_detail
-            // 
-            this.dot_detail.DataPropertyName = "dot_detail";
-            this.dot_detail.HeaderText = "打点信息";
-            this.dot_detail.MinimumWidth = 8;
-            this.dot_detail.Name = "dot_detail";
-            this.dot_detail.ReadOnly = true;
-            this.dot_detail.Width = 150;
-            // 
-            // update_time
-            // 
-            this.update_time.DataPropertyName = "update_time";
-            this.update_time.HeaderText = "操作时间";
-            this.update_time.MinimumWidth = 8;
-            this.update_time.Name = "update_time";
-            this.update_time.ReadOnly = true;
-            this.update_time.Width = 150;
-            // 
-            // update_name
-            // 
-            this.update_name.DataPropertyName = "update_name";
-            this.update_name.HeaderText = "操作人";
-            this.update_name.MinimumWidth = 8;
-            this.update_name.Name = "update_name";
-            this.update_name.ReadOnly = true;
-            this.update_name.Width = 150;
-            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 2;
@@ -427,7 +349,7 @@
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 1;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 528F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 519F));
             this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 519);
             this.tableLayoutPanel1.TabIndex = 156;
             // 
@@ -454,18 +376,6 @@
             this.ClearMsg.UseVisualStyleBackColor = true;
             this.ClearMsg.Click += new System.EventHandler(this.ClearMsg_Click);
             // 
-            // OperateResult
-            // 
-            this.OperateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(0, 0);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(378, 463);
-            this.OperateResult.TabIndex = 155;
-            this.OperateResult.Text = "";
-            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "work_order";
@@ -500,6 +410,7 @@
             this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Visible = false;
             this.dataGridViewTextBoxColumn4.Width = 150;
             // 
             // dataGridViewTextBoxColumn5
@@ -538,6 +449,139 @@
             this.dataGridViewTextBoxColumn8.ReadOnly = true;
             this.dataGridViewTextBoxColumn8.Width = 150;
             // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "update_name";
+            this.dataGridViewTextBoxColumn9.HeaderText = "操作人";
+            this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.Width = 150;
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(0, 0);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(378, 463);
+            this.OperateResult.TabIndex = 155;
+            this.OperateResult.Text = "";
+            // 
+            // 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(91, 30);
+            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(205, 32);
+            this.ma_code.TabIndex = 143;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(310, 32);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 153;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // work_order
+            // 
+            this.work_order.DataPropertyName = "work_order";
+            this.work_order.HeaderText = "工单号";
+            this.work_order.MinimumWidth = 8;
+            this.work_order.Name = "work_order";
+            this.work_order.ReadOnly = true;
+            this.work_order.Width = 150;
+            // 
+            // burn_qty
+            // 
+            this.burn_qty.DataPropertyName = "burn_qty";
+            this.burn_qty.HeaderText = "烧录数量";
+            this.burn_qty.MinimumWidth = 8;
+            this.burn_qty.Name = "burn_qty";
+            this.burn_qty.ReadOnly = true;
+            this.burn_qty.Width = 80;
+            // 
+            // burn_lotno
+            // 
+            this.burn_lotno.DataPropertyName = "burn_lotno";
+            this.burn_lotno.HeaderText = "烧录条码";
+            this.burn_lotno.MinimumWidth = 8;
+            this.burn_lotno.Name = "burn_lotno";
+            this.burn_lotno.ReadOnly = true;
+            this.burn_lotno.Width = 150;
+            // 
+            // line
+            // 
+            this.line.DataPropertyName = "line";
+            this.line.HeaderText = "线体";
+            this.line.MinimumWidth = 8;
+            this.line.Name = "line";
+            this.line.ReadOnly = true;
+            this.line.Visible = false;
+            this.line.Width = 150;
+            // 
+            // burn_software
+            // 
+            this.burn_software.DataPropertyName = "burn_software";
+            this.burn_software.HeaderText = "烧录软件";
+            this.burn_software.MinimumWidth = 8;
+            this.burn_software.Name = "burn_software";
+            this.burn_software.ReadOnly = true;
+            this.burn_software.Width = 150;
+            // 
+            // check_code
+            // 
+            this.check_code.DataPropertyName = "check_code";
+            this.check_code.HeaderText = "校验码";
+            this.check_code.MinimumWidth = 8;
+            this.check_code.Name = "check_code";
+            this.check_code.ReadOnly = true;
+            this.check_code.Width = 150;
+            // 
+            // dot_detail
+            // 
+            this.dot_detail.DataPropertyName = "dot_detail";
+            this.dot_detail.HeaderText = "打点信息";
+            this.dot_detail.MinimumWidth = 8;
+            this.dot_detail.Name = "dot_detail";
+            this.dot_detail.ReadOnly = true;
+            this.dot_detail.Width = 150;
+            // 
+            // update_time
+            // 
+            this.update_time.DataPropertyName = "update_time";
+            this.update_time.HeaderText = "操作时间";
+            this.update_time.MinimumWidth = 8;
+            this.update_time.Name = "update_time";
+            this.update_time.ReadOnly = true;
+            this.update_time.Width = 150;
+            // 
+            // update_name
+            // 
+            this.update_name.DataPropertyName = "update_name";
+            this.update_name.HeaderText = "操作人";
+            this.update_name.MinimumWidth = 8;
+            this.update_name.Name = "update_name";
+            this.update_name.ReadOnly = true;
+            this.update_name.Width = 150;
+            // 
             // Make_BurnInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -594,7 +638,12 @@
         private System.Windows.Forms.TextBox pr_spec;
         private System.Windows.Forms.TextBox ma_qty;
         private System.Windows.Forms.Label TargetQtyLab;
+        private System.Windows.Forms.TextBox EmployeeVal;
+        private System.Windows.Forms.Label EmployeeLab;
+        private System.Windows.Forms.TextBox CurrQtyVal;
+        private System.Windows.Forms.Label CurrQtyLab;
         private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
         private System.Windows.Forms.DataGridViewTextBoxColumn line;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_software;
@@ -602,7 +651,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dot_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_time;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_name;
-        private System.Windows.Forms.TextBox EmployeeVal;
-        private System.Windows.Forms.Label EmployeeLab;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -1,5 +1,4 @@
-using NPOI.SS.Formula;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -7,7 +6,6 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_NEW.CustomControl.ButtonUtil;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
@@ -25,6 +23,7 @@ namespace UAS_MES_NEW.Make
         DataTable Dbfind;
         DataHelper dh;
         DataTable dt;
+        string remainQty;
 
         private void Make_BurnInfo_Load(object sender, EventArgs e)
         {
@@ -66,10 +65,15 @@ namespace UAS_MES_NEW.Make
                 BaseUtil.SetFormValue(this.Controls, dt);
             }
 
-            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME FROM burn_info WHERE work_order = '{ma_code.Text}'", "select");
+            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY FROM burn_info WHERE work_order = '{ma_code.Text}'", "select");
             if (dt.Rows.Count > 0)
             {
                 DataBox.DataSource = dt;
+                dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    CurrQtyVal.Text = dt.Rows[0]["allqty"].ToString();
+                }
             }
 
             ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
@@ -105,9 +109,9 @@ namespace UAS_MES_NEW.Make
             }
 
             dh.ExecuteSql($@"insert INTO burn_info (burn_id,burn_lotno,burn_software,
-                check_code,dot_detail,line,
+                check_code,dot_detail,line,burn_qty,
                 update_name,update_time,work_order) VALUES (BURN_INFO_SEQ.nextval,'{BurnLotnoVal.Text.Trim()}','{BurnSwVal.Text.Trim()}',
-                '{CheckCodeVal.Text.Trim()}','{DotVal.Text.Trim()}','{LineVal.Text.Trim()}',
+                '{CheckCodeVal.Text.Trim()}','{DotVal.Text.Trim()}','{LineVal.Text.Trim()}','{remainQty}',
                 '{User.UserName}',sysdate,'{ma_code.Text.Trim()}')", "insert");
 
 
@@ -125,6 +129,11 @@ namespace UAS_MES_NEW.Make
             {
                 DataBox.DataSource = dt;
             }
+            dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                CurrQtyVal.Text = dt.Rows[0]["allqty"].ToString();
+            }
         }
 
         private void ShowMsg(int type, string msg)
@@ -154,6 +163,7 @@ namespace UAS_MES_NEW.Make
                     BurnLotnoVal.Text = "";
                     return;
                 }
+                remainQty = dt.Rows[0]["BAR_REMAIN"].ToString();
             }
 
             if (string.IsNullOrEmpty(ma_code.Text))
@@ -163,6 +173,13 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
+            if(Convert.ToInt32(CurrQtyVal.Text) > Convert.ToInt32(ma_qty.Text))
+            {
+                ShowMsg(0, "烧录数量已达标,超过工单批量");
+                ma_code.Focus();
+                return;
+            }
+
             if (string.IsNullOrEmpty(EmployeeVal.Text))
             {
                 ShowMsg(0, "请输入操作人员");
@@ -193,9 +210,9 @@ namespace UAS_MES_NEW.Make
             }
 
             dh.ExecuteSql($@"insert INTO burn_info (burn_id,burn_lotno,burn_software,
-                check_code,dot_detail,line,
+                check_code,dot_detail,line,burn_qty,
                 update_name,update_time,work_order) VALUES (BURN_INFO_SEQ.nextval,'{BurnLotnoVal.Text.Trim()}','{BurnSwVal.Text.Trim()}',
-                '{CheckCodeVal.Text.Trim()}','{DotVal.Text.Trim()}','{LineVal.Text.Trim()}',
+                '{CheckCodeVal.Text.Trim()}','{DotVal.Text.Trim()}','{LineVal.Text.Trim()}','{remainQty}',
                 '{EmployeeVal.Text}',sysdate,'{ma_code.Text.Trim()}')", "insert");
 
             BurnLotnoVal.Focus();
@@ -213,6 +230,11 @@ namespace UAS_MES_NEW.Make
             {
                 DataBox.DataSource = dt;
             }
+            dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                CurrQtyVal.Text = dt.Rows[0]["allqty"].ToString();
+            }
         }
 
         private void BurnSwVal_KeyDown(object sender, KeyEventArgs e)

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

@@ -120,6 +120,9 @@
   <metadata name="work_order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="burn_qty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="burn_lotno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.Designer.cs

@@ -33,23 +33,32 @@
             this.ma_qty = new System.Windows.Forms.TextBox();
             this.TargetQtyLab = new System.Windows.Forms.Label();
             this.pr_spec = new System.Windows.Forms.TextBox();
+            this.EmployeeVal = new System.Windows.Forms.TextBox();
+            this.EmployeeLab = new System.Windows.Forms.Label();
             this.PrdetailLab = new System.Windows.Forms.Label();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.ClearMsg = new System.Windows.Forms.Button();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.DataBox = new System.Windows.Forms.DataGridView();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.OkBox = new System.Windows.Forms.CheckBox();
+            this.TestLab = new System.Windows.Forms.Label();
+            this.NgBox = new System.Windows.Forms.CheckBox();
+            this.BurnLotnoVal = new System.Windows.Forms.TextBox();
+            this.BurnLotnoLab = new System.Windows.Forms.Label();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.NG = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.OK = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.ClearMsg = new System.Windows.Forms.Button();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.DataBox = new System.Windows.Forms.DataGridView();
             this.BURN_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -60,14 +69,10 @@
             this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.inspect_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.inspect_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.panel4 = new System.Windows.Forms.Panel();
-            this.BurnLotnoVal = new System.Windows.Forms.TextBox();
-            this.BurnLotnoLab = new System.Windows.Forms.Label();
-            this.EmployeeVal = new System.Windows.Forms.TextBox();
-            this.EmployeeLab = new System.Windows.Forms.Label();
-            this.OkBox = new System.Windows.Forms.CheckBox();
-            this.TestLab = new System.Windows.Forms.Label();
-            this.NgBox = new System.Windows.Forms.CheckBox();
+            this.OK = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.NG = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -121,6 +126,24 @@
             this.pr_spec.Size = new System.Drawing.Size(429, 31);
             this.pr_spec.TabIndex = 162;
             // 
+            // EmployeeVal
+            // 
+            this.EmployeeVal.Location = new System.Drawing.Point(87, 59);
+            this.EmployeeVal.Name = "EmployeeVal";
+            this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
+            this.EmployeeVal.TabIndex = 182;
+            // 
+            // EmployeeLab
+            // 
+            this.EmployeeLab.AutoSize = true;
+            this.EmployeeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EmployeeLab.Location = new System.Drawing.Point(36, 62);
+            this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EmployeeLab.Name = "EmployeeLab";
+            this.EmployeeLab.Size = new System.Drawing.Size(75, 28);
+            this.EmployeeLab.TabIndex = 181;
+            this.EmployeeLab.Text = "抽检员";
+            // 
             // PrdetailLab
             // 
             this.PrdetailLab.AutoSize = true;
@@ -132,18 +155,6 @@
             this.PrdetailLab.TabIndex = 161;
             this.PrdetailLab.Text = "机型信息 ";
             // 
-            // LockMakeCode
-            // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(306, 23);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 160;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
             // ms_makecode_label
             // 
             this.ms_makecode_label.AutoSize = true;
@@ -155,127 +166,6 @@
             this.ms_makecode_label.TabIndex = 156;
             this.ms_makecode_label.Text = "归属工单";
             // 
-            // 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(87, 21);
-            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(205, 32);
-            this.ma_code.TabIndex = 157;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn1.HeaderText = "MAC";
-            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
-            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
-            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
-            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.HeaderText = "是否检测";
-            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.Width = 150;
-            // 
-            // OperatResult
-            // 
-            this.OperatResult.AcceptsTab = true;
-            this.OperatResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(0, 0);
-            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(378, 492);
-            this.OperatResult.TabIndex = 133;
-            this.OperatResult.Text = "";
-            // 
-            // NG
-            // 
-            this.NG.AllPower = null;
-            this.NG.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.NG.BackColor = System.Drawing.Color.Transparent;
-            this.NG.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.NG.DownImage = ((System.Drawing.Image)(resources.GetObject("NG.DownImage")));
-            this.NG.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NG.ForeColor = System.Drawing.Color.Red;
-            this.NG.Image = null;
-            this.NG.IsShowBorder = true;
-            this.NG.Location = new System.Drawing.Point(681, 52);
-            this.NG.Margin = new System.Windows.Forms.Padding(5);
-            this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
-            this.NG.Name = "NG";
-            this.NG.NormalImage = ((System.Drawing.Image)(resources.GetObject("NG.NormalImage")));
-            this.NG.Power = null;
-            this.NG.Size = new System.Drawing.Size(147, 54);
-            this.NG.TabIndex = 136;
-            this.NG.Tag = "IfRead";
-            this.NG.Text = "NG";
-            this.NG.UseVisualStyleBackColor = true;
-            this.NG.Visible = false;
-            this.NG.Click += new System.EventHandler(this.NG_Click);
-            // 
-            // OK
-            // 
-            this.OK.AllPower = null;
-            this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.OK.BackColor = System.Drawing.Color.Transparent;
-            this.OK.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.OK.DownImage = ((System.Drawing.Image)(resources.GetObject("OK.DownImage")));
-            this.OK.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OK.ForeColor = System.Drawing.Color.Green;
-            this.OK.Image = null;
-            this.OK.IsShowBorder = true;
-            this.OK.Location = new System.Drawing.Point(524, 52);
-            this.OK.Margin = new System.Windows.Forms.Padding(5);
-            this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
-            this.OK.Name = "OK";
-            this.OK.NormalImage = ((System.Drawing.Image)(resources.GetObject("OK.NormalImage")));
-            this.OK.Power = null;
-            this.OK.Size = new System.Drawing.Size(147, 54);
-            this.OK.TabIndex = 134;
-            this.OK.Tag = "IfRead";
-            this.OK.Text = "OK";
-            this.OK.UseVisualStyleBackColor = false;
-            this.OK.Visible = false;
-            this.OK.Click += new System.EventHandler(this.OK_Click);
-            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 2;
@@ -351,6 +241,185 @@
             this.DataBox.Size = new System.Drawing.Size(890, 462);
             this.DataBox.TabIndex = 155;
             // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.OkBox);
+            this.panel4.Controls.Add(this.TestLab);
+            this.panel4.Controls.Add(this.NgBox);
+            this.panel4.Controls.Add(this.BurnLotnoVal);
+            this.panel4.Controls.Add(this.BurnLotnoLab);
+            this.panel4.Controls.Add(this.OK);
+            this.panel4.Controls.Add(this.NG);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel4.Location = new System.Drawing.Point(0, 462);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(890, 140);
+            this.panel4.TabIndex = 156;
+            // 
+            // OkBox
+            // 
+            this.OkBox.AutoSize = true;
+            this.OkBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.OkBox.Location = new System.Drawing.Point(120, 31);
+            this.OkBox.Name = "OkBox";
+            this.OkBox.Size = new System.Drawing.Size(62, 28);
+            this.OkBox.TabIndex = 183;
+            this.OkBox.Text = "OK";
+            this.OkBox.UseVisualStyleBackColor = true;
+            this.OkBox.Click += new System.EventHandler(this.OkBox_Click);
+            // 
+            // TestLab
+            // 
+            this.TestLab.AutoSize = true;
+            this.TestLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TestLab.Location = new System.Drawing.Point(7, 29);
+            this.TestLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TestLab.Name = "TestLab";
+            this.TestLab.Size = new System.Drawing.Size(96, 28);
+            this.TestLab.TabIndex = 185;
+            this.TestLab.Text = "判定结果";
+            // 
+            // NgBox
+            // 
+            this.NgBox.AutoSize = true;
+            this.NgBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NgBox.Location = new System.Drawing.Point(225, 31);
+            this.NgBox.Name = "NgBox";
+            this.NgBox.Size = new System.Drawing.Size(64, 28);
+            this.NgBox.TabIndex = 184;
+            this.NgBox.Text = "NG";
+            this.NgBox.UseVisualStyleBackColor = true;
+            this.NgBox.Click += new System.EventHandler(this.NgBox_Click);
+            // 
+            // BurnLotnoVal
+            // 
+            this.BurnLotnoVal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.BurnLotnoVal.Location = new System.Drawing.Point(84, 65);
+            this.BurnLotnoVal.Name = "BurnLotnoVal";
+            this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
+            this.BurnLotnoVal.TabIndex = 162;
+            this.BurnLotnoVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BurnLotnoVal_KeyDown);
+            // 
+            // BurnLotnoLab
+            // 
+            this.BurnLotnoLab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.BurnLotnoLab.AutoSize = true;
+            this.BurnLotnoLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BurnLotnoLab.Location = new System.Drawing.Point(7, 65);
+            this.BurnLotnoLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BurnLotnoLab.Name = "BurnLotnoLab";
+            this.BurnLotnoLab.Size = new System.Drawing.Size(96, 28);
+            this.BurnLotnoLab.TabIndex = 161;
+            this.BurnLotnoLab.Text = "烧录批次";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "BURN_ID";
+            this.dataGridViewTextBoxColumn1.HeaderText = "MAC";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            this.dataGridViewTextBoxColumn1.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "work_order";
+            this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 120;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "burn_lotno";
+            this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "line";
+            this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Width = 70;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "burn_software";
+            this.dataGridViewTextBoxColumn5.HeaderText = "是否检测";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "inspect_res";
+            this.dataGridViewTextBoxColumn6.HeaderText = "抽检结果";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "check_code";
+            this.dataGridViewTextBoxColumn7.HeaderText = "校验码";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "dot_detail";
+            this.dataGridViewTextBoxColumn8.HeaderText = "打点信息";
+            this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "inspect_time";
+            this.dataGridViewTextBoxColumn9.HeaderText = "抽检时间";
+            this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            this.dataGridViewTextBoxColumn9.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "inspect_name";
+            this.dataGridViewTextBoxColumn10.HeaderText = "抽检人员";
+            this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            this.dataGridViewTextBoxColumn10.Width = 80;
+            // 
+            // OperatResult
+            // 
+            this.OperatResult.AcceptsTab = true;
+            this.OperatResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperatResult.Location = new System.Drawing.Point(0, 0);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperatResult.Name = "OperatResult";
+            this.OperatResult.Size = new System.Drawing.Size(378, 492);
+            this.OperatResult.TabIndex = 133;
+            this.OperatResult.Text = "";
+            // 
             // BURN_ID
             // 
             this.BURN_ID.DataPropertyName = "BURN_ID";
@@ -442,94 +511,86 @@
             this.inspect_name.ReadOnly = true;
             this.inspect_name.Width = 80;
             // 
-            // panel4
-            // 
-            this.panel4.Controls.Add(this.OkBox);
-            this.panel4.Controls.Add(this.TestLab);
-            this.panel4.Controls.Add(this.NgBox);
-            this.panel4.Controls.Add(this.BurnLotnoVal);
-            this.panel4.Controls.Add(this.BurnLotnoLab);
-            this.panel4.Controls.Add(this.OK);
-            this.panel4.Controls.Add(this.NG);
-            this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel4.Location = new System.Drawing.Point(0, 462);
-            this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(890, 140);
-            this.panel4.TabIndex = 156;
-            // 
-            // BurnLotnoVal
-            // 
-            this.BurnLotnoVal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.BurnLotnoVal.Location = new System.Drawing.Point(84, 65);
-            this.BurnLotnoVal.Name = "BurnLotnoVal";
-            this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
-            this.BurnLotnoVal.TabIndex = 162;
-            this.BurnLotnoVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BurnLotnoVal_KeyDown);
-            // 
-            // BurnLotnoLab
-            // 
-            this.BurnLotnoLab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.BurnLotnoLab.AutoSize = true;
-            this.BurnLotnoLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BurnLotnoLab.Location = new System.Drawing.Point(7, 65);
-            this.BurnLotnoLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.BurnLotnoLab.Name = "BurnLotnoLab";
-            this.BurnLotnoLab.Size = new System.Drawing.Size(96, 28);
-            this.BurnLotnoLab.TabIndex = 161;
-            this.BurnLotnoLab.Text = "烧录批次";
-            // 
-            // EmployeeVal
-            // 
-            this.EmployeeVal.Location = new System.Drawing.Point(87, 59);
-            this.EmployeeVal.Name = "EmployeeVal";
-            this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
-            this.EmployeeVal.TabIndex = 182;
-            // 
-            // EmployeeLab
+            // OK
             // 
-            this.EmployeeLab.AutoSize = true;
-            this.EmployeeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.EmployeeLab.Location = new System.Drawing.Point(42, 62);
-            this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.EmployeeLab.Name = "EmployeeLab";
-            this.EmployeeLab.Size = new System.Drawing.Size(75, 28);
-            this.EmployeeLab.TabIndex = 181;
-            this.EmployeeLab.Text = "抽检员";
+            this.OK.AllPower = null;
+            this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.OK.BackColor = System.Drawing.Color.Transparent;
+            this.OK.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.OK.DownImage = ((System.Drawing.Image)(resources.GetObject("OK.DownImage")));
+            this.OK.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OK.ForeColor = System.Drawing.Color.Green;
+            this.OK.Image = null;
+            this.OK.IsShowBorder = true;
+            this.OK.Location = new System.Drawing.Point(524, 52);
+            this.OK.Margin = new System.Windows.Forms.Padding(5);
+            this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
+            this.OK.Name = "OK";
+            this.OK.NormalImage = ((System.Drawing.Image)(resources.GetObject("OK.NormalImage")));
+            this.OK.Power = null;
+            this.OK.Size = new System.Drawing.Size(147, 54);
+            this.OK.TabIndex = 134;
+            this.OK.Tag = "IfRead";
+            this.OK.Text = "OK";
+            this.OK.UseVisualStyleBackColor = false;
+            this.OK.Visible = false;
+            this.OK.Click += new System.EventHandler(this.OK_Click);
             // 
-            // OkBox
+            // NG
             // 
-            this.OkBox.AutoSize = true;
-            this.OkBox.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.OkBox.Location = new System.Drawing.Point(120, 31);
-            this.OkBox.Name = "OkBox";
-            this.OkBox.Size = new System.Drawing.Size(62, 28);
-            this.OkBox.TabIndex = 183;
-            this.OkBox.Text = "OK";
-            this.OkBox.UseVisualStyleBackColor = true;
-            this.OkBox.Click += new System.EventHandler(this.OkBox_Click);
+            this.NG.AllPower = null;
+            this.NG.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.NG.BackColor = System.Drawing.Color.Transparent;
+            this.NG.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NG.DownImage = ((System.Drawing.Image)(resources.GetObject("NG.DownImage")));
+            this.NG.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.NG.ForeColor = System.Drawing.Color.Red;
+            this.NG.Image = null;
+            this.NG.IsShowBorder = true;
+            this.NG.Location = new System.Drawing.Point(681, 52);
+            this.NG.Margin = new System.Windows.Forms.Padding(5);
+            this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
+            this.NG.Name = "NG";
+            this.NG.NormalImage = ((System.Drawing.Image)(resources.GetObject("NG.NormalImage")));
+            this.NG.Power = null;
+            this.NG.Size = new System.Drawing.Size(147, 54);
+            this.NG.TabIndex = 136;
+            this.NG.Tag = "IfRead";
+            this.NG.Text = "NG";
+            this.NG.UseVisualStyleBackColor = true;
+            this.NG.Visible = false;
+            this.NG.Click += new System.EventHandler(this.NG_Click);
             // 
-            // TestLab
+            // LockMakeCode
             // 
-            this.TestLab.AutoSize = true;
-            this.TestLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.TestLab.Location = new System.Drawing.Point(7, 29);
-            this.TestLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.TestLab.Name = "TestLab";
-            this.TestLab.Size = new System.Drawing.Size(96, 28);
-            this.TestLab.TabIndex = 185;
-            this.TestLab.Text = "判定结果";
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(306, 23);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 160;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
             // 
-            // NgBox
+            // ma_code
             // 
-            this.NgBox.AutoSize = true;
-            this.NgBox.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.NgBox.Location = new System.Drawing.Point(225, 31);
-            this.NgBox.Name = "NgBox";
-            this.NgBox.Size = new System.Drawing.Size(64, 28);
-            this.NgBox.TabIndex = 184;
-            this.NgBox.Text = "NG";
-            this.NgBox.UseVisualStyleBackColor = true;
-            this.NgBox.Click += new System.EventHandler(this.NgBox_Click);
+            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(87, 21);
+            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(205, 32);
+            this.ma_code.TabIndex = 157;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
             // 
             // Make_BurnInspection
             // 
@@ -597,5 +658,10 @@
         private System.Windows.Forms.CheckBox OkBox;
         private System.Windows.Forms.Label TestLab;
         private System.Windows.Forms.CheckBox NgBox;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.cs

@@ -78,7 +78,7 @@ namespace UAS_MES_NEW.Make
             dt = (DataTable)dh.ExecuteSql($@"SELECT a.burn_id,a.burn_lotno,a.work_order,
                 a.line,a.burn_software,a.check_code,
                 a.dot_detail,b.inspect_time,b.inspect_name,b.inspect_res
-                FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burn_id
+                FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burnid
                 WHERE 1 = 1 {SQL.ToString()}", "select");
             if (dt.Rows.Count > 0)
             {
@@ -141,7 +141,7 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            dt = (DataTable)dh.ExecuteSql($@"select * from burn_inspect where burn_lotno = '{BurnLotnoVal.Text}'", "select");
+            dt = (DataTable)dh.ExecuteSql($@"select * from burn_inspect where burnlotno = '{BurnLotnoVal.Text}'", "select");
             if (dt.Rows.Count > 0)
             {
                 ShowMsg(0, $"批号 {BurnLotnoVal.Text}已抽检");

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.resx

@@ -117,8 +117,38 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="BURN_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="work_order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="burn_lotno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="line.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="burn_software.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="inspect_res.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="check_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dot_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="inspect_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="inspect_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="NG.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="OK.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -130,7 +160,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="NG.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="OK.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -143,7 +173,7 @@
         gg==
 </value>
   </data>
-  <data name="NG.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="OK.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -156,7 +186,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="OK.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NG.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -168,7 +198,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="OK.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NG.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -181,7 +211,7 @@
         gg==
 </value>
   </data>
-  <data name="OK.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NG.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -194,64 +224,4 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="BURN_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="work_order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="burn_lotno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="line.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="burn_software.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="inspect_res.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="check_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dot_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="inspect_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="inspect_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="BURN_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="work_order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="burn_lotno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="line.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="burn_software.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="inspect_res.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="check_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dot_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="inspect_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="inspect_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -106,6 +106,30 @@ namespace UAS_MES_NEW.Make
                 MessageBox.Show("工单号不能为空");
                 return;
             }
+            DataTable dt1 = (DataTable)dh.ExecuteSql($@"SELECT * FROM stenciluse, stencil WHERE su_status = '上线' 
+                AND su_usemacode = '{ma_code.Text}' AND su_stcode = st_code AND st_kind = '刮刀'", "select");
+            if(dt1.Rows.Count > 0)
+            {
+                string suid = dt1.Rows[0]["SU_ID"].ToString();
+                string stcode = dt1.Rows[0]["SU_STCODE"].ToString();
+
+                dt1 = (DataTable)dh.ExecuteSql($"select max(su_id) SU_ID from stenciluse where su_stcode = '{stcode}' and su_status = '下线'", "select");
+                if (dt1.Rows.Count > 0)
+                {
+                    string currSuid = dt1.Rows[0]["SU_ID"].ToString();
+                    if (Convert.ToInt32(currSuid) < Convert.ToInt32(suid))
+                    {
+                        MessageBox.Show($"工单:{ma_code.Text} 已有上线刮刀:{stcode},请下线后再上线");
+                        return;
+                    }
+                }
+                else
+                {
+                    MessageBox.Show($"工单:{ma_code.Text} 已有上线刮刀:{stcode},请下线后再上线");
+                    return;
+                }
+            }
+
             int WaringCount =int.Parse(dh.GetConfig("WaringCount", "Stencil").ToString());
             DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,st_version,nvl(st_maxusecount,0)st_maxusecount,nvl(st_usecount,0)st_usecount from Stencil where st_code='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
             string status = "";

UAS_MES_WEIP/UAS_MES_WEIP.csproj

@@ -1377,6 +1377,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_BakingManage.resx">
       <DependentUpon>Make_BakingManage.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_NewDev.resx">
       <DependentUpon>Make_NewDev.cs</DependentUpon>