最新模版

src/main/java/com/xujie/sys/common/utils/ExcelTemplate.java

@@ -409,16 +409,29 @@ public class ExcelTemplate {
         }
         if (delRight) {
             for (Integer dtlRow : dtlRows) {
-                for (int i = 6; i < 12; i++) {
+                for (int i = 0; i < 17; i++) {
+                    XSSFRow row = sheet.getRow(dtlRow);
+                    if (row == null) {
+                        continue;
+                    }
+                    XSSFCell c7 = row.getCell(i);
+                    if (c7 == null) {
+                        continue;
+                    }
+                    // 创建样式
+                    XSSFCellStyle style = workbook.createCellStyle();
+                    style.setBorderRight(i==16?BorderStyle.THIN:BorderStyle.NONE);
+                    style.setBorderLeft(i==0?BorderStyle.THIN:BorderStyle.NONE);
+                    style.setBorderBottom(BorderStyle.THIN);
+                    style.setBorderTop(BorderStyle.NONE);
+                    Font font = workbook.createFont();
+                    font.setFontName("Arial");
+                    font.setFontHeightInPoints((short) 10);
+                    style.setFont(font);
+                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    style.setAlignment(HorizontalAlignment.LEFT);
+                    c7.setCellStyle(style);
                     if (i==6 || i==11) {
-                        XSSFRow row = sheet.getRow(dtlRow);
-                        if (row == null) {
-                            continue;
-                        }
-                        XSSFCell c7 = row.getCell(i);
-                        if (c7 == null) {
-                            continue;
-                        }
                         // 尝试把字符串转成数值
                         if (c7.getCellType() == CellType.STRING) {
                             String strVal = c7.getStringCellValue();
@@ -436,7 +449,7 @@ public class ExcelTemplate {
                         XSSFCellStyle style7 = workbook.createCellStyle();
                         style7.setBorderRight(BorderStyle.NONE);
                         style7.setBorderLeft(BorderStyle.NONE);
-                        style7.setBorderBottom(BorderStyle.NONE);
+                        style7.setBorderBottom(BorderStyle.THIN);
                         style7.setBorderTop(BorderStyle.NONE);
                         Font font7 = workbook.createFont();
                         font7.setFontName("Arial");

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -1692,9 +1692,7 @@ public class CoDelServiceImpl implements CoDelService {
             // 硬标天线需要po(declaration-invoice2-template.xlsx)，且要长，
             // RFID和RF不需要po,合同带印章（declaration-invoice-seal-template.xlsx），发票号不带章declaration-invoice-template.xlsx
             String xlsx = notifyHeader.getBuNo().equals("04-MHM") || notifyHeader.getBuNo().equals("02-Hardtag")?
-                    "templates/declaration-invoice2-template.xlsx":
-                    data.getContractFlag()!=null && data.getContractFlag()? "templates/declaration-invoice-seal-template.xlsx"
-            :"templates/declaration-invoice-template.xlsx";
+                    "templates/declaration-invoice2-template.xlsx":"templates/declaration-invoice-template.xlsx";
             ExcelTemplate template = ExcelTemplate.load(new ClassPathResource(xlsx).getInputStream());
             extractedInvoice(data, template, notifyHeader);
             try (XSSFWorkbook workbook = template.render(0)) {
@@ -1848,9 +1846,6 @@ public class CoDelServiceImpl implements CoDelService {
         String xlsx;
         if (notifyHeader.getBuNo().equals("03-RFID") || notifyHeader.getBuNo().equals("01-Label")) {
             xlsx = "templates/declaration-all-template.xlsx";
-            if (data.getContractFlag()!=null && data.getContractFlag()) {
-                xlsx = "templates/declaration-all-seal-template.xlsx";
-            }
         } else {
             // 硬标天线需要po(declaration-all2-template.xlsx)，且多一个合同sheet
             xlsx = "templates/declaration-all2-template.xlsx";
@@ -1921,9 +1916,6 @@ public class CoDelServiceImpl implements CoDelService {
         String xlsx;
         if (notifyHeader.getBuNo().equals("03-RFID") || notifyHeader.getBuNo().equals("01-Label")) {
             xlsx = "templates/declaration-all-template-pdf.xlsx";
-            if (data.getContractFlag()!=null && data.getContractFlag()) {
-                xlsx = "templates/declaration-all-seal-template-pdf.xlsx";
-            }
         } else {
             // 硬标天线需要po(declaration-all2-template.xlsx)，且多一个合同sheet
             xlsx = "templates/declaration-all2-template.xlsx";
@@ -2008,7 +2000,7 @@ public class CoDelServiceImpl implements CoDelService {
             // 设置纸张大小（A4）
             pageSetup.setPaperSize(PaperSizeType.PAPER_A_4);
             // 设置缩放比例
-            pageSetup.setZoom(80);
+            pageSetup.setZoom(65);
             // 设置边距
             pageSetup.setLeftMargin(0.5);
             pageSetup.setRightMargin(0.5);