修改贴片机导出数据

UAS_MES_LGDZ/DataOperate/ExcelHandler.cs

@@ -101,7 +101,7 @@ namespace UAS_MES_NEW.DataOperate
                     row1.Cells[4].CellStyle = style; row1.Cells[5].CellStyle = style;
                     row1.CreateCell(6); row1.CreateCell(7); row1.Cells[6].CellStyle = style;
                     row1.Cells[6].CellStyle = style; row1.Cells[7].CellStyle = style;
-                    row1.Cells[6].SetCellValue("点数:" + (int.Parse(sumqty) - 1));
+                    row1.Cells[6].SetCellValue("点数:" + sumqty);
                     //标题
                     CellRangeAddress cellRangeAddress_first = new CellRangeAddress(0, 0, 0, 5);
                     sheet1.AddMergedRegion(cellRangeAddress_first);
@@ -252,11 +252,16 @@ namespace UAS_MES_NEW.DataOperate
                         row.CreateCell(6);
                         row.CreateCell(7);
                         //位置编号
-                        CellRangeAddress cellRangeAddress = new CellRangeAddress(DataRowCount, DataRowCount + 1, 0, 0);
-                        sheet.AddMergedRegion(cellRangeAddress);
-                        //飞达规格
-                        CellRangeAddress cellRangeAddress1 = new CellRangeAddress(DataRowCount, DataRowCount + 1, 1, 1);
-                        sheet.AddMergedRegion(cellRangeAddress1);
+                        if (i + 1 < DataTable.Rows.Count && DataTable.Rows[i + 1]["STF_MODEL"].ToString() == "" &&
+                            DataTable.Rows[i + 1]["STF_FEEDER"].ToString() == "" &&
+                            DataTable.Rows[i + 1]["STF_FEEDERNO"].ToString() != "")
+                        {
+                            CellRangeAddress cellRangeAddress = new CellRangeAddress(DataRowCount, DataRowCount + 1, 0, 0);
+                            sheet.AddMergedRegion(cellRangeAddress);
+                            //飞达规格
+                            CellRangeAddress cellRangeAddress1 = new CellRangeAddress(DataRowCount, DataRowCount + 1, 1, 1);
+                            sheet.AddMergedRegion(cellRangeAddress1);
+                        }
                         row.Cells[0].SetCellValue(DataTable.Rows[i]["STF_MODEL"].ToString());
                         row.Cells[0].CellStyle = style;