优化烧录芯片信息

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -39,6 +39,8 @@
             this.DotVal = new System.Windows.Forms.TextBox();
             this.Confirm = new System.Windows.Forms.Button();
             this.TopBox = new System.Windows.Forms.Panel();
+            this.IcDetailVal = new System.Windows.Forms.TextBox();
+            this.IcDetailLab = new System.Windows.Forms.Label();
             this.CurrQtyVal = new System.Windows.Forms.TextBox();
             this.CurrQtyLab = new System.Windows.Forms.Label();
             this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
@@ -52,16 +54,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.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();
@@ -75,8 +67,17 @@
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.IcDetailVal = new System.Windows.Forms.TextBox();
-            this.IcDetailLab = new System.Windows.Forms.Label();
+            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.TopBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -222,6 +223,26 @@
             this.TopBox.Size = new System.Drawing.Size(1280, 201);
             this.TopBox.TabIndex = 153;
             // 
+            // IcDetailVal
+            // 
+            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;
+            // 
+            // 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.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 = "芯片信息";
+            // 
             // CurrQtyVal
             // 
             this.CurrQtyVal.Enabled = false;
@@ -361,6 +382,7 @@
             this.burn_software,
             this.check_code,
             this.dot_detail,
+            this.ic_detail,
             this.update_time,
             this.update_name,
             this.inspect_res});
@@ -374,97 +396,6 @@
             this.DataBox.Size = new System.Drawing.Size(890, 513);
             this.DataBox.TabIndex = 154;
             // 
-            // work_order
-            // 
-            this.work_order.DataPropertyName = "work_order";
-            this.work_order.HeaderText = "工单号";
-            this.work_order.MinimumWidth = 8;
-            this.work_order.Name = "work_order";
-            this.work_order.ReadOnly = true;
-            this.work_order.Width = 150;
-            // 
-            // burn_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;
@@ -597,25 +528,105 @@
             this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
             this.dataGridViewTextBoxColumn9.Width = 150;
             // 
-            // IcDetailVal
+            // work_order
             // 
-            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;
+            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;
             // 
-            // IcDetailLab
+            // burn_qty
             // 
-            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 = "打点信息";
+            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;
             // 
             // Make_BurnInfo
             // 
@@ -678,6 +689,8 @@
         private System.Windows.Forms.TextBox CurrQtyVal;
         private System.Windows.Forms.Label CurrQtyLab;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.TextBox IcDetailVal;
+        private System.Windows.Forms.Label IcDetailLab;
         private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
@@ -685,10 +698,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_software;
         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 update_time;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_name;
         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,7 +65,7 @@ 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,inspect_res 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 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)
@@ -121,7 +121,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 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 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)
@@ -219,7 +219,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 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 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

@@ -138,6 +138,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="update_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>