修改条码打印

UAS_MES_LGDZ/DataOperate/ExcelHandler.cs

@@ -13,6 +13,7 @@ using Seagull.BarTender.Print;
 using DevExpress.XtraPrinting.Native.LayoutAdjustment;
 using DevExpress.XtraExport.Implementation;
 using NPOI.HSSF.Record.CF;
+using UAS_MES_NEW.Entity;
 
 namespace UAS_MES_NEW.DataOperate
 {
@@ -90,17 +91,23 @@ namespace UAS_MES_NEW.DataOperate
                     ISheet sheet1 = book.CreateSheet(DataTable.Rows[i]["STF_MACHINE"].ToString() + "-" + DataTable.Rows[i + 1]["STF_MACHINE"].ToString().Substring(0, 1));
                     SheetName = DataTable.Rows[i]["STF_MACHINE"].ToString() + "-" + DataTable.Rows[i + 1]["STF_MACHINE"].ToString().Substring(0, 1);
                     IRow row1 = sheet1.CreateRow(0);
-                    row1.CreateCell(0); row1.CreateCell(1); row1.Cells[0].SetCellValue("       SMT程式料表     ");
+                    row1.CreateCell(0); row1.CreateCell(1); row1.Cells[0].SetCellValue("                                       SMT程式料表     ");
                     row1.Cells[0].CellStyle = style; row1.Cells[1].CellStyle = style;
                     row1.CreateCell(2); row1.CreateCell(3);
 
                     row1.Cells[2].CellStyle = style;
                     row1.Cells[2].CellStyle = style; row1.Cells[3].CellStyle = style;
-                    row1.CreateCell(4); row1.CreateCell(5); row1.Cells[4].SetCellValue("点数:" + sumqty); row1.Cells[4].CellStyle = style;
+                    row1.CreateCell(4); row1.CreateCell(5); row1.Cells[4].CellStyle = style;
                     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));
+                    //标题
+                    CellRangeAddress cellRangeAddress_first = new CellRangeAddress(0, 0, 0, 5);
+                    sheet1.AddMergedRegion(cellRangeAddress_first);
+                    //点数
+                    CellRangeAddress cellRangeAddress_points = new CellRangeAddress(0, 0, 6, 7);
+                    sheet1.AddMergedRegion(cellRangeAddress_points);
                     //客户抬头
                     IRow row2 = sheet1.CreateRow(1);
                     CellRangeAddress cellRangeAddress = new CellRangeAddress(1, 1, 0, 1);
@@ -182,7 +189,7 @@ namespace UAS_MES_NEW.DataOperate
                     sheet1.AddMergedRegion(cellRangeAddress19);
                     row6.CreateCell(0); row6.CreateCell(1); row6.Cells[0].SetCellValue("制作:");
                     row6.Cells[0].CellStyle = style; row6.Cells[1].CellStyle = style;
-                    row6.CreateCell(2); row6.CreateCell(3); row6.Cells[2].SetCellValue("贺瑞华");
+                    row6.CreateCell(2); row6.CreateCell(3); row6.Cells[2].SetCellValue(User.CurrentStepName);
                     row6.Cells[2].CellStyle = style; row6.Cells[3].CellStyle = style;
                     row6.CreateCell(4); row6.CreateCell(5); row6.Cells[4].SetCellValue("QA审核:");
                     row6.Cells[4].CellStyle = style; row6.Cells[5].CellStyle = style;