导出首页型号BUG调整

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

@@ -70,6 +70,8 @@
             // CH_BLUEFILM
             // 
             this.CH_BLUEFILM.AutoSize = true;
+            this.CH_BLUEFILM.Checked = true;
+            this.CH_BLUEFILM.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_BLUEFILM.Font = new System.Drawing.Font("宋体", 10F);
             this.CH_BLUEFILM.Location = new System.Drawing.Point(130, 58);
             this.CH_BLUEFILM.Margin = new System.Windows.Forms.Padding(2);
@@ -82,6 +84,8 @@
             // CH_SPLITBATCH
             // 
             this.CH_SPLITBATCH.AutoSize = true;
+            this.CH_SPLITBATCH.Checked = true;
+            this.CH_SPLITBATCH.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_SPLITBATCH.Font = new System.Drawing.Font("宋体", 10F);
             this.CH_SPLITBATCH.Location = new System.Drawing.Point(350, 58);
             this.CH_SPLITBATCH.Margin = new System.Windows.Forms.Padding(2);
@@ -94,6 +98,8 @@
             // CH_PBCODE
             // 
             this.CH_PBCODE.AutoSize = true;
+            this.CH_PBCODE.Checked = true;
+            this.CH_PBCODE.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_PBCODE.Font = new System.Drawing.Font("宋体", 10F);
             this.CH_PBCODE.Location = new System.Drawing.Point(130, 94);
             this.CH_PBCODE.Margin = new System.Windows.Forms.Padding(2);
@@ -106,6 +112,8 @@
             // CH_REMARK
             // 
             this.CH_REMARK.AutoSize = true;
+            this.CH_REMARK.Checked = true;
+            this.CH_REMARK.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_REMARK.Font = new System.Drawing.Font("宋体", 10F);
             this.CH_REMARK.Location = new System.Drawing.Point(244, 94);
             this.CH_REMARK.Margin = new System.Windows.Forms.Padding(2);
@@ -132,6 +140,8 @@
             // CH_WATERID
             // 
             this.CH_WATERID.AutoSize = true;
+            this.CH_WATERID.Checked = true;
+            this.CH_WATERID.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_WATERID.Font = new System.Drawing.Font("宋体", 10F);
             this.CH_WATERID.Location = new System.Drawing.Point(452, 58);
             this.CH_WATERID.Margin = new System.Windows.Forms.Padding(2);

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

@@ -92,7 +92,7 @@ namespace UAS_LabelMachine
                         dt.Columns[i].Caption = SQL1_.Rows[i]["es_caption"].ToString();
                     }
                 }
-
+         
                 //获取首页需要展示的字段
                 DataTable SQL_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='First' and es_enable=-1 and es_custcode='" + custcode + "' order by es_detno", "select");
                 if (SQL_.Rows.Count == 0)

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

@@ -416,9 +416,9 @@ namespace UAS_LabelMachine
                             First_OrderCode += DataTable.Rows[i]["pd_ordercode"].ToString() + " ";
                         }
                         //不包含的物料型号
-                        if (DataTable.Columns.Contains("pr_spec") && !First_Prspec.Contains(DataTable.Rows[i]["pr_spec"].ToString()))
+                        if (DataTable.Columns.Contains("pr_spec1") && !First_Prspec.Contains(DataTable.Rows[i]["pr_spec1"].ToString()))
                         {
-                            First_Prspec += DataTable.Rows[i]["pr_spec"].ToString() + " ";
+                            First_Prspec += DataTable.Rows[i]["pr_spec1"].ToString() + " ";
                         }
                         //不包含扩撒批号
                         if (DataTable.Columns.Contains("ch_splitbatch") && !First_Batch.Contains(DataTable.Rows[i]["ch_splitbatch"].ToString()))
@@ -439,7 +439,7 @@ namespace UAS_LabelMachine
                             dr["pi_title"] = DataTable.Rows[i]["pi_title"].ToString();
                             dr["pi_date"] = DataTable.Rows[i]["pi_date"].ToString();
                             dr["pd_ordercode"] = First_OrderCode;
-                            dr["pr_spec"] = First_Prspec;
+                            dr["pr_spec1"] = First_Prspec;
                             dr["ch_splitbatch"] = First_Batch;
                             dr["ch_waterid"] = BaseUtil.GetArrStr(First_WID, " ");
                             dr["num"] = PageSize;
@@ -1096,7 +1096,6 @@ namespace UAS_LabelMachine
                 }
             }
             columnNum = FirstDT.Columns.Count;
-
             for (int i = 0; i < rowNum; i++)
             {
                 IRow row1 = sheet2.CreateRow(PaintIndex);