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

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -56,18 +56,6 @@
             this.BurnLotnoLab = new System.Windows.Forms.Label();
             this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             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_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.ic_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.inspect_res = 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();
@@ -84,6 +72,21 @@
             this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.RemarkVal = new System.Windows.Forms.TextBox();
+            this.RemarkLab = new System.Windows.Forms.Label();
+            this.burn_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            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.ic_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.inspect_res = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TopBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -105,7 +108,7 @@
             // 
             this.LineLab.AutoSize = true;
             this.LineLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LineLab.Location = new System.Drawing.Point(726, 140);
+            this.LineLab.Location = new System.Drawing.Point(381, 149);
             this.LineLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.LineLab.Name = "LineLab";
             this.LineLab.Size = new System.Drawing.Size(54, 28);
@@ -116,7 +119,7 @@
             // LineVal
             // 
             this.LineVal.FormattingEnabled = true;
-            this.LineVal.Location = new System.Drawing.Point(777, 139);
+            this.LineVal.Location = new System.Drawing.Point(432, 148);
             this.LineVal.Name = "LineVal";
             this.LineVal.Size = new System.Drawing.Size(243, 32);
             this.LineVal.TabIndex = 145;
@@ -128,7 +131,7 @@
             this.BurnSwVal.Multiline = true;
             this.BurnSwVal.Name = "BurnSwVal";
             this.BurnSwVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.BurnSwVal.Size = new System.Drawing.Size(276, 50);
+            this.BurnSwVal.Size = new System.Drawing.Size(245, 50);
             this.BurnSwVal.TabIndex = 146;
             this.BurnSwVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BurnSwVal_KeyDown);
             // 
@@ -147,7 +150,7 @@
             // 
             this.CheckCodeLab.AutoSize = true;
             this.CheckCodeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckCodeLab.Location = new System.Drawing.Point(395, 86);
+            this.CheckCodeLab.Location = new System.Drawing.Point(374, 86);
             this.CheckCodeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.CheckCodeLab.Name = "CheckCodeLab";
             this.CheckCodeLab.Size = new System.Drawing.Size(75, 28);
@@ -158,7 +161,7 @@
             // 
             this.DotLab.AutoSize = true;
             this.DotLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.DotLab.Location = new System.Drawing.Point(712, 86);
+            this.DotLab.Location = new System.Drawing.Point(692, 86);
             this.DotLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.DotLab.Name = "DotLab";
             this.DotLab.Size = new System.Drawing.Size(96, 28);
@@ -167,28 +170,28 @@
             // 
             // CheckCodeVal
             // 
-            this.CheckCodeVal.Location = new System.Drawing.Point(462, 75);
+            this.CheckCodeVal.Location = new System.Drawing.Point(431, 75);
             this.CheckCodeVal.Multiline = true;
             this.CheckCodeVal.Name = "CheckCodeVal";
             this.CheckCodeVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.CheckCodeVal.Size = new System.Drawing.Size(243, 50);
+            this.CheckCodeVal.Size = new System.Drawing.Size(245, 50);
             this.CheckCodeVal.TabIndex = 150;
             this.CheckCodeVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CheckCodeVal_KeyDown);
             // 
             // DotVal
             // 
-            this.DotVal.Location = new System.Drawing.Point(777, 75);
+            this.DotVal.Location = new System.Drawing.Point(757, 75);
             this.DotVal.Multiline = true;
             this.DotVal.Name = "DotVal";
             this.DotVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.DotVal.Size = new System.Drawing.Size(243, 50);
+            this.DotVal.Size = new System.Drawing.Size(245, 50);
             this.DotVal.TabIndex = 151;
             this.DotVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DotVal_KeyDown);
             // 
             // Confirm
             // 
             this.Confirm.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Confirm.Location = new System.Drawing.Point(1054, 141);
+            this.Confirm.Location = new System.Drawing.Point(695, 149);
             this.Confirm.Name = "Confirm";
             this.Confirm.Size = new System.Drawing.Size(81, 28);
             this.Confirm.TabIndex = 152;
@@ -199,6 +202,8 @@
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.RemarkVal);
+            this.TopBox.Controls.Add(this.RemarkLab);
             this.TopBox.Controls.Add(this.SaveCache);
             this.TopBox.Controls.Add(this.DeleteLog);
             this.TopBox.Controls.Add(this.IcDetailVal);
@@ -228,14 +233,14 @@
             this.TopBox.Dock = System.Windows.Forms.DockStyle.Top;
             this.TopBox.Location = new System.Drawing.Point(0, 0);
             this.TopBox.Name = "TopBox";
-            this.TopBox.Size = new System.Drawing.Size(1280, 201);
+            this.TopBox.Size = new System.Drawing.Size(1280, 259);
             this.TopBox.TabIndex = 153;
             // 
             // SaveCache
             // 
             this.SaveCache.Cursor = System.Windows.Forms.Cursors.Hand;
             this.SaveCache.Enabled = false;
-            this.SaveCache.Location = new System.Drawing.Point(588, 138);
+            this.SaveCache.Location = new System.Drawing.Point(566, 204);
             this.SaveCache.Name = "SaveCache";
             this.SaveCache.Size = new System.Drawing.Size(95, 28);
             this.SaveCache.TabIndex = 186;
@@ -247,7 +252,7 @@
             // 
             this.DeleteLog.Cursor = System.Windows.Forms.Cursors.Hand;
             this.DeleteLog.Enabled = false;
-            this.DeleteLog.Location = new System.Drawing.Point(691, 138);
+            this.DeleteLog.Location = new System.Drawing.Point(669, 204);
             this.DeleteLog.Name = "DeleteLog";
             this.DeleteLog.Size = new System.Drawing.Size(95, 28);
             this.DeleteLog.TabIndex = 185;
@@ -257,18 +262,18 @@
             // 
             // IcDetailVal
             // 
-            this.IcDetailVal.Location = new System.Drawing.Point(1100, 75);
+            this.IcDetailVal.Location = new System.Drawing.Point(1083, 75);
             this.IcDetailVal.Multiline = true;
             this.IcDetailVal.Name = "IcDetailVal";
             this.IcDetailVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.IcDetailVal.Size = new System.Drawing.Size(243, 50);
+            this.IcDetailVal.Size = new System.Drawing.Size(245, 50);
             this.IcDetailVal.TabIndex = 184;
             // 
             // IcDetailLab
             // 
             this.IcDetailLab.AutoSize = true;
             this.IcDetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.IcDetailLab.Location = new System.Drawing.Point(1035, 86);
+            this.IcDetailLab.Location = new System.Drawing.Point(1018, 86);
             this.IcDetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.IcDetailLab.Name = "IcDetailLab";
             this.IcDetailLab.Size = new System.Drawing.Size(96, 28);
@@ -278,7 +283,7 @@
             // CurrQtyVal
             // 
             this.CurrQtyVal.Enabled = false;
-            this.CurrQtyVal.Location = new System.Drawing.Point(1115, 31);
+            this.CurrQtyVal.Location = new System.Drawing.Point(1086, 31);
             this.CurrQtyVal.Name = "CurrQtyVal";
             this.CurrQtyVal.Size = new System.Drawing.Size(61, 31);
             this.CurrQtyVal.TabIndex = 182;
@@ -287,7 +292,7 @@
             // 
             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.Location = new System.Drawing.Point(1020, 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);
@@ -315,7 +320,7 @@
             // 
             // EmployeeVal
             // 
-            this.EmployeeVal.Location = new System.Drawing.Point(463, 140);
+            this.EmployeeVal.Location = new System.Drawing.Point(434, 206);
             this.EmployeeVal.Name = "EmployeeVal";
             this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
             this.EmployeeVal.TabIndex = 180;
@@ -324,7 +329,7 @@
             // 
             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(395, 140);
+            this.EmployeeLab.Location = new System.Drawing.Point(366, 206);
             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);
@@ -334,7 +339,7 @@
             // ma_qty
             // 
             this.ma_qty.Enabled = false;
-            this.ma_qty.Location = new System.Drawing.Point(463, 30);
+            this.ma_qty.Location = new System.Drawing.Point(434, 30);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(61, 31);
             this.ma_qty.TabIndex = 159;
@@ -343,7 +348,7 @@
             // 
             this.TargetQtyLab.AutoSize = true;
             this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.TargetQtyLab.Location = new System.Drawing.Point(395, 30);
+            this.TargetQtyLab.Location = new System.Drawing.Point(366, 30);
             this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.TargetQtyLab.Name = "TargetQtyLab";
             this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
@@ -353,7 +358,7 @@
             // pr_spec
             // 
             this.pr_spec.Enabled = false;
-            this.pr_spec.Location = new System.Drawing.Point(610, 30);
+            this.pr_spec.Location = new System.Drawing.Point(581, 30);
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.Size = new System.Drawing.Size(429, 31);
             this.pr_spec.TabIndex = 157;
@@ -362,7 +367,7 @@
             // 
             this.PrdetailLab.AutoSize = true;
             this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrdetailLab.Location = new System.Drawing.Point(541, 30);
+            this.PrdetailLab.Location = new System.Drawing.Point(512, 30);
             this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrdetailLab.Name = "PrdetailLab";
             this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
@@ -371,7 +376,7 @@
             // 
             // BurnLotnoVal
             // 
-            this.BurnLotnoVal.Location = new System.Drawing.Point(91, 140);
+            this.BurnLotnoVal.Location = new System.Drawing.Point(91, 206);
             this.BurnLotnoVal.Name = "BurnLotnoVal";
             this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
             this.BurnLotnoVal.TabIndex = 155;
@@ -381,7 +386,7 @@
             // 
             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(26, 140);
+            this.BurnLotnoLab.Location = new System.Drawing.Point(26, 206);
             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);
@@ -393,7 +398,7 @@
             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.Location = new System.Drawing.Point(295, 32);
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
             this.LockMakeCode.TabIndex = 153;
@@ -416,6 +421,7 @@
             this.check_code,
             this.dot_detail,
             this.ic_detail,
+            this.remark,
             this.update_time,
             this.update_name,
             this.inspect_res});
@@ -428,120 +434,10 @@
             this.DataBox.RowHeadersWidth = 62;
             this.DataBox.RowTemplate.Height = 30;
             this.DataBox.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.DataBox.Size = new System.Drawing.Size(890, 513);
+            this.DataBox.Size = new System.Drawing.Size(890, 455);
             this.DataBox.TabIndex = 154;
             this.DataBox.SelectionChanged += new System.EventHandler(this.DataBox_SelectionChanged);
             // 
-            // burn_id
-            // 
-            this.burn_id.DataPropertyName = "burn_id";
-            this.burn_id.HeaderText = "burn_id";
-            this.burn_id.MinimumWidth = 8;
-            this.burn_id.Name = "burn_id";
-            this.burn_id.ReadOnly = true;
-            this.burn_id.Visible = false;
-            this.burn_id.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 = 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;
-            // 
-            // ic_detail
-            // 
-            this.ic_detail.DataPropertyName = "ic_detail";
-            this.ic_detail.HeaderText = "芯片信息";
-            this.ic_detail.MinimumWidth = 8;
-            this.ic_detail.Name = "ic_detail";
-            this.ic_detail.ReadOnly = true;
-            this.ic_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;
-            // 
-            // inspect_res
-            // 
-            this.inspect_res.DataPropertyName = "inspect_res";
-            this.inspect_res.HeaderText = "抽检结果";
-            this.inspect_res.MinimumWidth = 8;
-            this.inspect_res.Name = "inspect_res";
-            this.inspect_res.ReadOnly = true;
-            this.inspect_res.Width = 80;
-            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 2;
@@ -550,12 +446,12 @@
             this.tableLayoutPanel1.Controls.Add(this.DataBox, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.RightBox, 1, 0);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 201);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 259);
             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, 519F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 519);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 461);
             this.tableLayoutPanel1.TabIndex = 156;
             // 
             // RightBox
@@ -565,7 +461,7 @@
             this.RightBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RightBox.Location = new System.Drawing.Point(899, 3);
             this.RightBox.Name = "RightBox";
-            this.RightBox.Size = new System.Drawing.Size(378, 513);
+            this.RightBox.Size = new System.Drawing.Size(378, 455);
             this.RightBox.TabIndex = 156;
             // 
             // ClearMsg
@@ -703,6 +599,145 @@
             this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
             this.dataGridViewTextBoxColumn12.Width = 80;
             // 
+            // RemarkVal
+            // 
+            this.RemarkVal.Location = new System.Drawing.Point(91, 141);
+            this.RemarkVal.Multiline = true;
+            this.RemarkVal.Name = "RemarkVal";
+            this.RemarkVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.RemarkVal.Size = new System.Drawing.Size(243, 50);
+            this.RemarkVal.TabIndex = 188;
+            // 
+            // RemarkLab
+            // 
+            this.RemarkLab.AutoSize = true;
+            this.RemarkLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.RemarkLab.Location = new System.Drawing.Point(38, 152);
+            this.RemarkLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.RemarkLab.Name = "RemarkLab";
+            this.RemarkLab.Size = new System.Drawing.Size(54, 28);
+            this.RemarkLab.TabIndex = 187;
+            this.RemarkLab.Text = "备注";
+            // 
+            // burn_id
+            // 
+            this.burn_id.DataPropertyName = "burn_id";
+            this.burn_id.HeaderText = "burn_id";
+            this.burn_id.MinimumWidth = 8;
+            this.burn_id.Name = "burn_id";
+            this.burn_id.ReadOnly = true;
+            this.burn_id.Visible = false;
+            this.burn_id.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 = 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;
+            // 
+            // ic_detail
+            // 
+            this.ic_detail.DataPropertyName = "ic_detail";
+            this.ic_detail.HeaderText = "芯片信息";
+            this.ic_detail.MinimumWidth = 8;
+            this.ic_detail.Name = "ic_detail";
+            this.ic_detail.ReadOnly = true;
+            this.ic_detail.Width = 150;
+            // 
+            // remark
+            // 
+            this.remark.DataPropertyName = "remark";
+            this.remark.HeaderText = "备注";
+            this.remark.MinimumWidth = 8;
+            this.remark.Name = "remark";
+            this.remark.ReadOnly = true;
+            this.remark.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;
+            // 
+            // inspect_res
+            // 
+            this.inspect_res.DataPropertyName = "inspect_res";
+            this.inspect_res.HeaderText = "抽检结果";
+            this.inspect_res.MinimumWidth = 8;
+            this.inspect_res.Name = "inspect_res";
+            this.inspect_res.ReadOnly = true;
+            this.inspect_res.Width = 80;
+            // 
             // Make_BurnInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -769,6 +804,10 @@
         private System.Windows.Forms.Button DeleteLog;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.Button SaveCache;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private System.Windows.Forms.TextBox RemarkVal;
+        private System.Windows.Forms.Label RemarkLab;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_qty;
@@ -778,10 +817,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn check_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn dot_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn ic_detail;
+        private System.Windows.Forms.DataGridViewTextBoxColumn remark;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_time;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn inspect_res;
-        private System.Windows.Forms.Button SaveCache;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -69,7 +69,7 @@ namespace UAS_MES_NEW.Make
             if ((DateTime.Now - callTime).TotalSeconds > 10)
             {
                 callTime = DateTime.Now;
-                dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid 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,inspect_res,IC_DETAIL,burn_id,remark FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
                 DataBox.DataSource = dt;
                 ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
                 dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
@@ -136,7 +136,7 @@ namespace UAS_MES_NEW.Make
 
             ShowMsg(1, "添加烧录信息成功");
 
-            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid 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,inspect_res,IC_DETAIL,burn_id,remark FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
             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)
@@ -220,9 +220,9 @@ namespace UAS_MES_NEW.Make
 
             dh.ExecuteSql($@"insert INTO burn_info (burn_id,burn_lotno,burn_software,
                 check_code,dot_detail,line,burn_qty,
-                update_name,update_time,work_order,ic_detail) VALUES (BURN_INFO_SEQ.nextval,'{BurnLotnoVal.Text.Trim()}','{BurnSwVal.Text.Trim()}',
+                update_name,update_time,work_order,ic_detail,remark) VALUES (BURN_INFO_SEQ.nextval,'{BurnLotnoVal.Text.Trim()}','{BurnSwVal.Text.Trim()}',
                 '{CheckCodeVal.Text.Trim()}','{DotVal.Text.Trim()}','{LineVal.Text.Trim()}','{remainQty}',
-                '{EmployeeVal.Text}',sysdate,'{ma_code.Text.Trim()}','{IcDetailVal.Text.Trim()}')", "insert");
+                '{EmployeeVal.Text}',sysdate,'{ma_code.Text.Trim()}','{IcDetailVal.Text.Trim()}','{RemarkVal.Text.Trim()}')", "insert");
 
             BurnLotnoVal.Focus();
             BurnLotnoVal.SelectAll();
@@ -234,7 +234,7 @@ namespace UAS_MES_NEW.Make
 
             ShowMsg(1, $"批号:{BurnLotnoVal.Text} 添加烧录信息成功");
 
-            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid 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,inspect_res,IC_DETAIL,burn_id,remark FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
             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)

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

@@ -144,6 +144,9 @@
   <metadata name="ic_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="update_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS_MES_WEIP/FunctionCode/Make/Make_PcbClean.cs

@@ -1,5 +1,4 @@
-using NPOI.SS.Formula;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -152,10 +151,10 @@ namespace UAS_MES_NEW.Make
                 {
                     singleSn = item["sb_barcode"].ToString();
 
-                    dt = (DataTable)dh.ExecuteSql($@"select * from sn_clean where SN = '{singleSn}'", "select");
+                    dt = (DataTable)dh.ExecuteSql($@"select * from sn_clean where SN = '{singleSn}' and side = '{SideVal.Text}'", "select");
                     if (dt.Rows.Count > 0)
                     {
-                        ShowMsg(0, $"序列号:{singleSn} 已记录清洗");
+                        ShowMsg(0, $"序列号:{singleSn} 面别:{SideVal.Text} 已记录清洗");
                         SnVal.Focus();
                         SnVal.SelectAll();
                         continue;

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -107,7 +107,7 @@ namespace UAS_MES_NEW.Make
                 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");
+                AND su_usemacode = '{ma_code.Text}' AND su_linecode = '{li_code.Text}' AND su_stcode = st_code AND st_kind = '刮刀'", "select");
             if(dt1.Rows.Count > 0)
             {
                 string suid = dt1.Rows[0]["SU_ID"].ToString();