良率配置可导出，利普芯备注导出

UAS-出货标签管理(贸易版)/ExportExcel.Designer.cs

@@ -66,6 +66,7 @@
             this.Chinese = new System.Windows.Forms.RadioButton();
             this.English = new System.Windows.Forms.RadioButton();
             this.RowNum = new UAS_LabelMachine.CustomControl.NumOnlyTextBox();
+            this.CH_YIELD = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
@@ -437,26 +438,26 @@
             // Rate
             // 
             this.Rate.AutoSize = true;
+            this.Rate.Checked = true;
             this.Rate.Font = new System.Drawing.Font("宋体", 10F);
             this.Rate.Location = new System.Drawing.Point(23, 26);
             this.Rate.Margin = new System.Windows.Forms.Padding(4);
             this.Rate.Name = "Rate";
             this.Rate.Size = new System.Drawing.Size(124, 31);
             this.Rate.TabIndex = 40;
+            this.Rate.TabStop = true;
             this.Rate.Text = "百分比";
             this.Rate.UseVisualStyleBackColor = true;
             // 
             // Mount
             // 
             this.Mount.AutoSize = true;
-            this.Mount.Checked = true;
             this.Mount.Font = new System.Drawing.Font("宋体", 10F);
             this.Mount.Location = new System.Drawing.Point(166, 28);
             this.Mount.Margin = new System.Windows.Forms.Padding(4);
             this.Mount.Name = "Mount";
             this.Mount.Size = new System.Drawing.Size(97, 31);
             this.Mount.TabIndex = 41;
-            this.Mount.TabStop = true;
             this.Mount.Text = "数量";
             this.Mount.UseVisualStyleBackColor = true;
             // 
@@ -517,11 +518,24 @@
             this.RowNum.TabIndex = 30;
             this.RowNum.Text = "10";
             // 
+            // CH_YIELD
+            // 
+            this.CH_YIELD.AutoSize = true;
+            this.CH_YIELD.Font = new System.Drawing.Font("宋体", 10F);
+            this.CH_YIELD.Location = new System.Drawing.Point(700, 188);
+            this.CH_YIELD.Margin = new System.Windows.Forms.Padding(4);
+            this.CH_YIELD.Name = "CH_YIELD";
+            this.CH_YIELD.Size = new System.Drawing.Size(98, 31);
+            this.CH_YIELD.TabIndex = 44;
+            this.CH_YIELD.Text = "良率";
+            this.CH_YIELD.UseVisualStyleBackColor = true;
+            // 
             // ExportExcel
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1144, 704);
+            this.Controls.Add(this.CH_YIELD);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.label8);
@@ -608,5 +622,6 @@
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.RadioButton Chinese;
         private System.Windows.Forms.RadioButton English;
+        private System.Windows.Forms.CheckBox CH_YIELD;
     }
 }

UAS-出货标签管理(贸易版)/ExportExcel.cs

@@ -64,6 +64,7 @@ namespace UAS_LabelMachine
                 conditionbox.Add(CH_SPLITBATCH);
                 conditionbox.Add(CH_WATERID);
                 conditionbox.Add(ch_code);
+                conditionbox.Add(CH_YIELD);
                 conditionbox.Add(M_Param1);
                 conditionbox.Add(H_Param1);
                 conditionbox.Add(H_Param2);

UAS-出货标签管理(贸易版)/PublicMethod/ExcelHandler.cs

@@ -2872,7 +2872,7 @@ namespace UAS_LabelMachine
                                 {
                                     row1.Cells[j].SetCellValue(sumCount);
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -2896,7 +2896,7 @@ namespace UAS_LabelMachine
                                 {
                                     row1.Cells[j].SetCellValue(sumCount);
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3000,7 +3000,7 @@ namespace UAS_LabelMachine
                                         row1.Cells[j - 4].CellStyle = ColumnTitleStyle;
                                         row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     }
-                                    if (DataTable.Columns[j].ColumnName.ToString() == "ch_pbcode")
+                                    if (DataTable.Columns[j].ColumnName.ToLower().ToString() == "ch_pbcode")
                                     {
                                         ShowBoxIndex = j;
                                     }
@@ -3077,7 +3077,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[ShowPieceIndex].SetCellValue((rowNum % PageSize == 0 ? PageSize : (rowNum % PageSize)) + 片);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3103,7 +3103,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[ShowPieceIndex].SetCellValue(rowNum % PageSize + 片);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3186,7 +3186,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(sumCount);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3216,7 +3216,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(sumCount);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3324,7 +3324,7 @@ namespace UAS_LabelMachine
                                         row1.Cells[j - 4].CellStyle = ColumnTitleStyle;
                                         row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     }
-                                    if (DataTable.Columns[j].ColumnName.ToString() == "ch_pbcode")
+                                    if (DataTable.Columns[j].ColumnName.ToLower().ToString() == "ch_pbcode")
                                     {
                                         ShowBoxIndex = j;
                                     }
@@ -3498,7 +3498,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(sumCount);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3528,7 +3528,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(sumCount);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;
@@ -3635,7 +3635,7 @@ namespace UAS_LabelMachine
                                         row1.Cells[j - 4].CellStyle = ColumnTitleStyle;
                                         row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     }
-                                    if (DataTable.Columns[j].ColumnName.ToString() == "ch_pbcode")
+                                    if (DataTable.Columns[j].ColumnName.ToLower().ToString() == "ch_pbcode")
                                     {
                                         ShowBoxIndex = j;
                                     }
@@ -3706,7 +3706,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(sumCount);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
 
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
@@ -3737,7 +3737,7 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(sumCount);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
-                                else if (j == ShowBoxIndex)
+                                else if (j == ShowBoxIndex-4)
                                 {
                                     row1.Cells[j].SetCellValue(DataTable.Rows[i]["ch_pbcode"].ToString());
                                     row1.Cells[j].CellStyle = styleborder;