迭代优化

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -41,6 +41,7 @@
             this.TopBox = new System.Windows.Forms.Panel();
             this.CurrQtyVal = new System.Windows.Forms.TextBox();
             this.CurrQtyLab = 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.ma_qty = new System.Windows.Forms.TextBox();
@@ -49,10 +50,22 @@
             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_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.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();
+            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();
@@ -62,18 +75,8 @@
             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.IcDetailVal = new System.Windows.Forms.TextBox();
+            this.IcDetailLab = new System.Windows.Forms.Label();
             this.TopBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -95,7 +98,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, 75);
+            this.LineLab.Location = new System.Drawing.Point(726, 140);
             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);
@@ -106,7 +109,7 @@
             // LineVal
             // 
             this.LineVal.FormattingEnabled = true;
-            this.LineVal.Location = new System.Drawing.Point(777, 74);
+            this.LineVal.Location = new System.Drawing.Point(777, 139);
             this.LineVal.Name = "LineVal";
             this.LineVal.Size = new System.Drawing.Size(243, 32);
             this.LineVal.TabIndex = 145;
@@ -114,7 +117,7 @@
             // 
             // BurnSwVal
             // 
-            this.BurnSwVal.Location = new System.Drawing.Point(91, 122);
+            this.BurnSwVal.Location = new System.Drawing.Point(91, 75);
             this.BurnSwVal.Multiline = true;
             this.BurnSwVal.Name = "BurnSwVal";
             this.BurnSwVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -126,7 +129,7 @@
             // 
             this.BurnSwLab.AutoSize = true;
             this.BurnSwLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BurnSwLab.Location = new System.Drawing.Point(26, 133);
+            this.BurnSwLab.Location = new System.Drawing.Point(26, 86);
             this.BurnSwLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.BurnSwLab.Name = "BurnSwLab";
             this.BurnSwLab.Size = new System.Drawing.Size(96, 28);
@@ -137,7 +140,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, 133);
+            this.CheckCodeLab.Location = new System.Drawing.Point(395, 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);
@@ -148,7 +151,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, 133);
+            this.DotLab.Location = new System.Drawing.Point(712, 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);
@@ -157,7 +160,7 @@
             // 
             // CheckCodeVal
             // 
-            this.CheckCodeVal.Location = new System.Drawing.Point(462, 122);
+            this.CheckCodeVal.Location = new System.Drawing.Point(462, 75);
             this.CheckCodeVal.Multiline = true;
             this.CheckCodeVal.Name = "CheckCodeVal";
             this.CheckCodeVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -167,7 +170,7 @@
             // 
             // DotVal
             // 
-            this.DotVal.Location = new System.Drawing.Point(777, 122);
+            this.DotVal.Location = new System.Drawing.Point(777, 75);
             this.DotVal.Multiline = true;
             this.DotVal.Name = "DotVal";
             this.DotVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -189,6 +192,8 @@
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.IcDetailVal);
+            this.TopBox.Controls.Add(this.IcDetailLab);
             this.TopBox.Controls.Add(this.CurrQtyVal);
             this.TopBox.Controls.Add(this.CurrQtyLab);
             this.TopBox.Controls.Add(this.ma_code);
@@ -236,9 +241,28 @@
             this.CurrQtyLab.TabIndex = 181;
             this.CurrQtyLab.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;
+            // 
             // EmployeeVal
             // 
-            this.EmployeeVal.Location = new System.Drawing.Point(463, 75);
+            this.EmployeeVal.Location = new System.Drawing.Point(463, 140);
             this.EmployeeVal.Name = "EmployeeVal";
             this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
             this.EmployeeVal.TabIndex = 180;
@@ -247,7 +271,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, 75);
+            this.EmployeeLab.Location = new System.Drawing.Point(395, 140);
             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);
@@ -294,7 +318,7 @@
             // 
             // BurnLotnoVal
             // 
-            this.BurnLotnoVal.Location = new System.Drawing.Point(91, 75);
+            this.BurnLotnoVal.Location = new System.Drawing.Point(91, 140);
             this.BurnLotnoVal.Name = "BurnLotnoVal";
             this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
             this.BurnLotnoVal.TabIndex = 155;
@@ -304,13 +328,25 @@
             // 
             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, 75);
+            this.BurnLotnoLab.Location = new System.Drawing.Point(26, 140);
             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 = 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;
@@ -326,7 +362,8 @@
             this.check_code,
             this.dot_detail,
             this.update_time,
-            this.update_name});
+            this.update_name,
+            this.inspect_res});
             this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
             this.DataBox.Location = new System.Drawing.Point(3, 3);
@@ -337,6 +374,97 @@
             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_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;
+            // 
+            // 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;
@@ -376,6 +504,18 @@
             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";
@@ -457,130 +597,25 @@
             this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
             this.dataGridViewTextBoxColumn9.Width = 150;
             // 
-            // OperateResult
+            // IcDetailVal
             // 
-            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 = "";
+            this.IcDetailVal.Location = new System.Drawing.Point(1100, 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.TabIndex = 184;
             // 
-            // ma_code
+            // IcDetailLab
             // 
-            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;
+            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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.IcDetailLab.Name = "IcDetailLab";
+            this.IcDetailLab.Size = new System.Drawing.Size(96, 28);
+            this.IcDetailLab.TabIndex = 183;
+            this.IcDetailLab.Text = "打点信息";
             // 
             // Make_BurnInfo
             // 
@@ -642,6 +677,7 @@
         private System.Windows.Forms.Label EmployeeLab;
         private System.Windows.Forms.TextBox CurrQtyVal;
         private System.Windows.Forms.Label CurrQtyLab;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
@@ -651,6 +687,8 @@
         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.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_res;
+        private System.Windows.Forms.TextBox IcDetailVal;
+        private System.Windows.Forms.Label IcDetailLab;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -65,15 +65,12 @@ 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,BURN_QTY 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,inspect_res 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)
             {
-                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();
-                }
+                CurrQtyVal.Text = dt.Rows[0]["allqty"].ToString();
             }
 
             ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
@@ -124,11 +121,8 @@ 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 FROM burn_info WHERE work_order = '{ma_code.Text}'", "select");
-            if (dt.Rows.Count > 0)
-            {
-                DataBox.DataSource = dt;
-            }
+            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res 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)
             {
@@ -211,9 +205,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) VALUES (BURN_INFO_SEQ.nextval,'{BurnLotnoVal.Text.Trim()}','{BurnSwVal.Text.Trim()}',
+                update_name,update_time,work_order,ic_detail) 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()}')", "insert");
+                '{EmployeeVal.Text}',sysdate,'{ma_code.Text.Trim()}','{IcDetailVal.Text.Trim()}')", "insert");
 
             BurnLotnoVal.Focus();
             BurnLotnoVal.SelectAll();
@@ -225,11 +219,8 @@ 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 FROM burn_info WHERE work_order = '{ma_code.Text}'", "select");
-            if (dt.Rows.Count > 0)
-            {
-                DataBox.DataSource = dt;
-            }
+            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res 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,4 +144,7 @@
   <metadata name="update_name.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>
 </root>

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.Designer.cs

@@ -30,24 +30,37 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_BurnInspection));
             this.panel1 = new System.Windows.Forms.Panel();
+            this.DateTimeCheck = new System.Windows.Forms.CheckBox();
+            this.DateTime = new System.Windows.Forms.Label();
+            this.EndDateTime = new System.Windows.Forms.DateTimePicker();
+            this.StartDateTime = new System.Windows.Forms.DateTimePicker();
+            this.CurrQtyVal = new System.Windows.Forms.TextBox();
             this.ma_qty = new System.Windows.Forms.TextBox();
+            this.CurrQtyLab = new System.Windows.Forms.Label();
             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.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.panel3 = new System.Windows.Forms.Panel();
             this.DataBox = new System.Windows.Forms.DataGridView();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.InspectNumVal = new System.Windows.Forms.TextBox();
+            this.InspectNumLab = 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.BurnLotnoVal = new System.Windows.Forms.TextBox();
             this.BurnLotnoLab = new System.Windows.Forms.Label();
+            this.OK = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.NG = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -58,21 +71,19 @@
             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.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BURN_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.inspect_res = 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.inspect_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.inspect_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            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();
@@ -83,7 +94,13 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.DateTimeCheck);
+            this.panel1.Controls.Add(this.DateTime);
+            this.panel1.Controls.Add(this.EndDateTime);
+            this.panel1.Controls.Add(this.StartDateTime);
+            this.panel1.Controls.Add(this.CurrQtyVal);
             this.panel1.Controls.Add(this.ma_qty);
+            this.panel1.Controls.Add(this.CurrQtyLab);
             this.panel1.Controls.Add(this.TargetQtyLab);
             this.panel1.Controls.Add(this.pr_spec);
             this.panel1.Controls.Add(this.EmployeeVal);
@@ -99,19 +116,76 @@
             this.panel1.Size = new System.Drawing.Size(1280, 112);
             this.panel1.TabIndex = 132;
             // 
+            // DateTimeCheck
+            // 
+            this.DateTimeCheck.AutoSize = true;
+            this.DateTimeCheck.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.DateTimeCheck.Location = new System.Drawing.Point(831, 25);
+            this.DateTimeCheck.Name = "DateTimeCheck";
+            this.DateTimeCheck.Size = new System.Drawing.Size(22, 21);
+            this.DateTimeCheck.TabIndex = 188;
+            this.DateTimeCheck.UseVisualStyleBackColor = true;
+            this.DateTimeCheck.Click += new System.EventHandler(this.DateTimeCheck_Click);
+            // 
+            // DateTime
+            // 
+            this.DateTime.AutoSize = true;
+            this.DateTime.Location = new System.Drawing.Point(597, 24);
+            this.DateTime.Name = "DateTime";
+            this.DateTime.Size = new System.Drawing.Size(18, 24);
+            this.DateTime.TabIndex = 187;
+            this.DateTime.Text = "-";
+            // 
+            // EndDateTime
+            // 
+            this.EndDateTime.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.EndDateTime.Location = new System.Drawing.Point(618, 21);
+            this.EndDateTime.Name = "EndDateTime";
+            this.EndDateTime.Size = new System.Drawing.Size(200, 31);
+            this.EndDateTime.TabIndex = 186;
+            this.EndDateTime.ValueChanged += new System.EventHandler(this.EndDateTime_ValueChanged);
+            // 
+            // StartDateTime
+            // 
+            this.StartDateTime.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.StartDateTime.Location = new System.Drawing.Point(391, 21);
+            this.StartDateTime.Name = "StartDateTime";
+            this.StartDateTime.Size = new System.Drawing.Size(200, 31);
+            this.StartDateTime.TabIndex = 185;
+            this.StartDateTime.ValueChanged += new System.EventHandler(this.StartDateTime_ValueChanged);
+            // 
+            // CurrQtyVal
+            // 
+            this.CurrQtyVal.Enabled = false;
+            this.CurrQtyVal.Location = new System.Drawing.Point(1017, 65);
+            this.CurrQtyVal.Name = "CurrQtyVal";
+            this.CurrQtyVal.Size = new System.Drawing.Size(61, 31);
+            this.CurrQtyVal.TabIndex = 184;
+            // 
             // ma_qty
             // 
             this.ma_qty.Enabled = false;
-            this.ma_qty.Location = new System.Drawing.Point(444, 21);
+            this.ma_qty.Location = new System.Drawing.Point(317, 65);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(61, 31);
             this.ma_qty.TabIndex = 164;
             // 
+            // 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(947, 66);
+            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 = 183;
+            this.CurrQtyLab.Text = "累计数量";
+            // 
             // TargetQtyLab
             // 
             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(376, 21);
+            this.TargetQtyLab.Location = new System.Drawing.Point(238, 66);
             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);
@@ -121,14 +195,14 @@
             // pr_spec
             // 
             this.pr_spec.Enabled = false;
-            this.pr_spec.Location = new System.Drawing.Point(590, 21);
+            this.pr_spec.Location = new System.Drawing.Point(465, 65);
             this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(429, 31);
+            this.pr_spec.Size = new System.Drawing.Size(475, 31);
             this.pr_spec.TabIndex = 162;
             // 
             // EmployeeVal
             // 
-            this.EmployeeVal.Location = new System.Drawing.Point(87, 59);
+            this.EmployeeVal.Location = new System.Drawing.Point(87, 65);
             this.EmployeeVal.Name = "EmployeeVal";
             this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
             this.EmployeeVal.TabIndex = 182;
@@ -137,7 +211,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(36, 62);
+            this.EmployeeLab.Location = new System.Drawing.Point(36, 66);
             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);
@@ -148,13 +222,25 @@
             // 
             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(522, 21);
+            this.PrdetailLab.Location = new System.Drawing.Point(397, 66);
             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);
             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(298, 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;
@@ -166,6 +252,25 @@
             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;
+            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 2;
@@ -204,6 +309,19 @@
             this.ClearMsg.UseVisualStyleBackColor = true;
             this.ClearMsg.Click += new System.EventHandler(this.ClearMsg_Click);
             // 
+            // 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 = "";
+            // 
             // panel3
             // 
             this.panel3.Controls.Add(this.DataBox);
@@ -224,11 +342,13 @@
             this.BURN_ID,
             this.work_order,
             this.burn_lotno,
+            this.burn_qty,
             this.line,
             this.burn_software,
             this.inspect_res,
             this.check_code,
             this.dot_detail,
+            this.ic_detail,
             this.inspect_time,
             this.inspect_name});
             this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -243,6 +363,8 @@
             // 
             // panel4
             // 
+            this.panel4.Controls.Add(this.InspectNumVal);
+            this.panel4.Controls.Add(this.InspectNumLab);
             this.panel4.Controls.Add(this.OkBox);
             this.panel4.Controls.Add(this.TestLab);
             this.panel4.Controls.Add(this.NgBox);
@@ -256,6 +378,24 @@
             this.panel4.Size = new System.Drawing.Size(890, 140);
             this.panel4.TabIndex = 156;
             // 
+            // InspectNumVal
+            // 
+            this.InspectNumVal.Location = new System.Drawing.Point(402, 64);
+            this.InspectNumVal.Name = "InspectNumVal";
+            this.InspectNumVal.Size = new System.Drawing.Size(113, 31);
+            this.InspectNumVal.TabIndex = 187;
+            // 
+            // InspectNumLab
+            // 
+            this.InspectNumLab.AutoSize = true;
+            this.InspectNumLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.InspectNumLab.Location = new System.Drawing.Point(351, 65);
+            this.InspectNumLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.InspectNumLab.Name = "InspectNumLab";
+            this.InspectNumLab.Size = new System.Drawing.Size(75, 28);
+            this.InspectNumLab.TabIndex = 186;
+            this.InspectNumLab.Text = "抽检数";
+            // 
             // OkBox
             // 
             this.OkBox.AutoSize = true;
@@ -312,6 +452,56 @@
             this.BurnLotnoLab.TabIndex = 161;
             this.BurnLotnoLab.Text = "烧录批次";
             // 
+            // 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);
+            // 
+            // 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);
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
@@ -331,7 +521,7 @@
             this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.Width = 120;
+            this.dataGridViewTextBoxColumn2.Width = 150;
             // 
             // dataGridViewTextBoxColumn3
             // 
@@ -351,7 +541,7 @@
             this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            this.dataGridViewTextBoxColumn4.Width = 70;
+            this.dataGridViewTextBoxColumn4.Width = 150;
             // 
             // dataGridViewTextBoxColumn5
             // 
@@ -407,18 +597,14 @@
             this.dataGridViewTextBoxColumn10.ReadOnly = true;
             this.dataGridViewTextBoxColumn10.Width = 80;
             // 
-            // OperatResult
+            // dataGridViewTextBoxColumn11
             // 
-            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 = "";
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "inspect_name";
+            this.dataGridViewTextBoxColumn11.HeaderText = "抽检人员";
+            this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            this.dataGridViewTextBoxColumn11.Width = 80;
             // 
             // BURN_ID
             // 
@@ -448,6 +634,15 @@
             this.burn_lotno.ReadOnly = true;
             this.burn_lotno.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;
+            // 
             // line
             // 
             this.line.DataPropertyName = "line";
@@ -455,6 +650,7 @@
             this.line.MinimumWidth = 8;
             this.line.Name = "line";
             this.line.ReadOnly = true;
+            this.line.Visible = false;
             this.line.Width = 70;
             // 
             // burn_software
@@ -493,6 +689,15 @@
             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;
+            // 
             // inspect_time
             // 
             this.inspect_time.DataPropertyName = "inspect_time";
@@ -511,87 +716,6 @@
             this.inspect_name.ReadOnly = true;
             this.inspect_name.Width = 80;
             // 
-            // 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);
-            // 
-            // 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);
-            // 
-            // 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;
-            // 
-            // 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;
-            // 
             // Make_BurnInspection
             // 
             this.AllowDrop = true;
@@ -639,16 +763,6 @@
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private System.Windows.Forms.DataGridView DataBox;
         private System.Windows.Forms.Panel panel4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn BURN_ID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
-        private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn line;
-        private System.Windows.Forms.DataGridViewTextBoxColumn burn_software;
-        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_res;
-        private System.Windows.Forms.DataGridViewTextBoxColumn check_code;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dot_detail;
-        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_time;
-        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_name;
         private System.Windows.Forms.TextBox ma_qty;
         private System.Windows.Forms.Label TargetQtyLab;
         private System.Windows.Forms.TextBox pr_spec;
@@ -663,5 +777,26 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.TextBox CurrQtyVal;
+        private System.Windows.Forms.Label CurrQtyLab;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DateTimePicker EndDateTime;
+        private System.Windows.Forms.Label DateTime;
+        private System.Windows.Forms.CheckBox DateTimeCheck;
+        private System.Windows.Forms.DateTimePicker StartDateTime;
+        private System.Windows.Forms.TextBox InspectNumVal;
+        private System.Windows.Forms.Label InspectNumLab;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BURN_ID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_qty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn line;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_software;
+        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_res;
+        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 inspect_time;
+        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_name;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.cs

@@ -1,5 +1,4 @@
-using DevExpress.Printing.Core.PdfExport.Metafile;
-using NPOI.SS.Formula.Eval;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -11,6 +10,7 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
 using UAS_MES_NEW.DataOperate;
@@ -52,6 +52,8 @@ namespace UAS_MES_NEW.Make
             ma_code.DbChange += Ma_code_DbChange;
 
             dh = SystemInf.dh;
+
+            StartDateTime.Value = EndDateTime.Value.AddDays(-1);
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)
@@ -68,24 +70,39 @@ namespace UAS_MES_NEW.Make
             {
                 BaseUtil.SetFormValue(this.Controls, 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();
+            }
 
             SQL.Clear();
             if (!string.IsNullOrEmpty(ma_code.Text))
             {
                 SQL.Append($"AND a.work_order = '{ma_code.Text}'");
             }
-
-            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.burnid
-                WHERE 1 = 1 {SQL.ToString()}", "select");
-            if (dt.Rows.Count > 0)
+            if (DateTimeCheck.Checked)
             {
-                DataBox.DataSource = dt;
+                string startTime = StartDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                string endTime = EndDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                if (!string.IsNullOrEmpty(startTime) && !string.IsNullOrEmpty(endTime))
+                {
+                    SQL.Append($"AND a.update_time between to_date('{startTime}','YYYY-MM-DD HH24:MI:SS') AND to_date('{endTime}','YYYY-MM-DD HH24:MI:SS')");
+                }
             }
+            //if(DataBox.Rows.Count > 0)
+            //{
+            //    DataTable DgvDs = (DataTable)DataBox.DataSource;
+            //    DgvDs.Clear();
+            //}
+            dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM (SELECT a.burn_id,a.burn_lotno,a.work_order,
+                a.line,a.burn_software,a.check_code,a.dot_detail,a.burn_qty,a.ic_detail,
+                b.inspect_time,b.inspect_name,b.inspect_res
+                FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burnid
+                WHERE 1 = 1 {SQL.ToString()}) WHERE inspect_res IS NULL", "select");
+            DataBox.DataSource = dt;
 
-            ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
+            ShowMsg(1, $"工单: {ma_code.Text} 需抽检烧录 {dt.Rows.Count} 条");
         }
 
         private void ClearMsg_Click(object sender, EventArgs e)
@@ -114,6 +131,13 @@ namespace UAS_MES_NEW.Make
                 ShowMsg(0, $"请填写抽检人员");
                 return;
             }
+            if (!Regex.IsMatch(EmployeeVal.Text, @"^[\u4e00-\u9fa5][\u4e00-\u9fa5\s·]{0,13}[\u4e00-\u9fa5]$"))
+            {
+                EmployeeVal.Focus();
+                EmployeeVal.SelectAll();
+                ShowMsg(0, $"请填写中文抽检人员");
+                return;
+            }
 
             if (DataBox.Rows.Count == 0)
             {
@@ -150,12 +174,25 @@ namespace UAS_MES_NEW.Make
 
             SQL.Clear();
             SQL.Append($@"INSERT INTO burn_inspect (burn_inspect_id,BURNLOTNO,BURNID,
-                inspect_res,inspect_time,inspect_name) VALUES (burn_inspect_seq.NEXTVAL, '{BurnLotnoVal.Text}',{burnId},
-                '{testResult}',sysdate,'{User.UserName}')");
+                inspect_res,inspect_time,inspect_name,inspect_num) VALUES (burn_inspect_seq.NEXTVAL, '{BurnLotnoVal.Text}',{burnId},
+                '{testResult}',sysdate,'{User.UserName}','{InspectNumVal.Text.Trim()}')");
             dh.ExecuteSql(SQL.ToString(), "insert");
 
             ShowMsg(1, $"{BurnLotnoVal.Text} 记录抽检结果{testResult} 成功");
 
+            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();
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM (SELECT a.burn_id,a.burn_lotno,a.work_order,
+                a.line,a.burn_software,a.check_code,a.dot_detail,a.burn_qty,a.ic_detail,
+                b.inspect_time,b.inspect_name,b.inspect_res
+                FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burnid
+                WHERE 1 = 1 {SQL.ToString()}) WHERE inspect_res IS NULL", "select");
+            DataBox.DataSource = dt;
+
             BurnLotnoVal.Focus();
             BurnLotnoVal.SelectAll();
         }
@@ -184,9 +221,84 @@ namespace UAS_MES_NEW.Make
             OkBox.Checked = false;
         }
 
+        private void StartDateTime_ValueChanged(object sender, EventArgs e)
+        {
+            if (StartDateTime.Value > EndDateTime.Value)
+            {
+                StartDateTime.Value = EndDateTime.Value.AddDays(-1);
+                ShowMsg(0, $"不得大于最早时间");
+                return;
+            }
+            StringBuilder searchSql = new StringBuilder();
+            if (!string.IsNullOrEmpty(ma_code.Text))
+            {
+                searchSql.Append($"AND a.work_order = '{ma_code.Text}'");
+            }
+            if (DateTimeCheck.Checked)
+            {
+                string startTime = StartDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                string endTime = EndDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                if (!string.IsNullOrEmpty(startTime) && !string.IsNullOrEmpty(endTime))
+                {
+                    searchSql.Append($"AND a.update_time between to_date('{startTime}','YYYY-MM-DD HH24:MI:SS') AND to_date('{endTime}','YYYY-MM-DD HH24:MI:SS')");
+                }
+            }
+            if (!string.IsNullOrEmpty(ma_code.Text) || DateTimeCheck.Checked)
+            {
+                dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM (SELECT a.burn_id,a.burn_lotno,a.work_order,
+                    a.line,a.burn_software,a.check_code,a.dot_detail,a.burn_qty,a.ic_detail,
+                    b.inspect_time,b.inspect_name,b.inspect_res
+                    FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burnid
+                    WHERE 1 = 1 {searchSql.ToString()}) WHERE inspect_res IS NULL", "select");
+                DataBox.DataSource = dt;
+
+                ShowMsg(1, $"工单: {ma_code.Text} 需抽检烧录 {dt.Rows.Count} 条");
+            }
+        }
+
+        private void EndDateTime_ValueChanged(object sender, EventArgs e)
+        {
+            if (StartDateTime.Value > EndDateTime.Value)
+            {
+                StartDateTime.Value = EndDateTime.Value.AddDays(-1);
+                ShowMsg(0, $"不得小于最晚时间");
+                return;
+            }
+            StringBuilder searchSql = new StringBuilder();
+            if (!string.IsNullOrEmpty(ma_code.Text))
+            {
+                searchSql.Append($"AND a.work_order = '{ma_code.Text}'");
+            }
+            if (DateTimeCheck.Checked)
+            {
+                string startTime = StartDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                string endTime = EndDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                if (!string.IsNullOrEmpty(startTime) && !string.IsNullOrEmpty(endTime))
+                {
+                    searchSql.Append($"AND a.update_time between to_date('{startTime}','YYYY-MM-DD HH24:MI:SS') AND to_date('{endTime}','YYYY-MM-DD HH24:MI:SS')");
+                }
+            }
+            if (!string.IsNullOrEmpty(ma_code.Text) || DateTimeCheck.Checked)
+            {
+                dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM (SELECT a.burn_id,a.burn_lotno,a.work_order,
+                    a.line,a.burn_software,a.check_code,a.dot_detail,a.burn_qty,a.ic_detail,
+                    b.inspect_time,b.inspect_name,b.inspect_res
+                    FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burnid
+                    WHERE 1 = 1 {searchSql.ToString()}) WHERE inspect_res IS NULL", "select");
+                DataBox.DataSource = dt;
+
+                ShowMsg(1, $"工单: {ma_code.Text} 需抽检烧录 {dt.Rows.Count} 条");
+            }
+        }
+
+        private void DateTimeCheck_Click(object sender, EventArgs e)
+        {
+            EndDateTime_ValueChanged(null, null);
+        }
+
         private void ShowMsg(int type, string msg)
         {
-            string fullDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string fullDateTime = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             if (type == 0)
             {
                 OperatResult.AppendText($"{fullDateTime}: {msg}\n", Color.Red);

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.resx

@@ -126,6 +126,9 @@
   <metadata name="burn_lotno.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="line.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -141,6 +144,9 @@
   <metadata name="dot_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ic_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>