diff --git a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java index 25350be0..3b7d95a1 100644 --- a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java +++ b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java @@ -583,7 +583,8 @@ public class ExcelTemplateYB { } else { numFmt2 = "#,##0"; } - style7.setDataFormat(dataFormat.getFormat(numFmt2)); + // 硬标:箱单的毛净重以及报关单的总金额都请修改为保留小数点后两位显示,整数也一样 + style7.setDataFormat(i==6||i==7?dataFormat.getFormat("#,##0.00"):dataFormat.getFormat(numFmt2)); } c7.setCellStyle(style7); } diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index 30147387..cc639cf5 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -2003,13 +2003,22 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { for (int i = 0; i < asposeWorkbook.getWorksheets().getCount(); i++) { com.aspose.cells.Worksheet worksheet = asposeWorkbook.getWorksheets().get(i); PageSetup pageSetup = worksheet.getPageSetup(); + boolean isPackingListSheet = i == 1||i==2; // 设置页面方向(纵向) pageSetup.setOrientation(i==2? PageOrientationType.LANDSCAPE:PageOrientationType.PORTRAIT); // 设置纸张大小(A4) pageSetup.setPaperSize(PaperSizeType.PAPER_A_4); - // 设置缩放比例 - pageSetup.setZoom(i==4?60:85); + if (isPackingListSheet) { + // 箱单数据较多时,强制缩放到单页(宽1页*高1页) + pageSetup.setFitToPagesWide(1); + pageSetup.setFitToPagesTall(1); + } else { + // 其他sheet保持原有缩放策略 + pageSetup.setFitToPagesWide(0); + pageSetup.setFitToPagesTall(0); + pageSetup.setZoom(i == 4 ? 60 : 85); + } // 设置边距 pageSetup.setLeftMargin(0.5); pageSetup.setRightMargin(0.5); @@ -2068,7 +2077,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { template.addVar("documents", stringInput(ecHeader.getDocuments())); template.addVar("packageType", stringInput(ecHeader.getPackageType())); EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo()); - template.setFixedDeclarationPriceScale(notifyHeader != null && isAntennaBu(notifyHeader.getBuNo())); + template.setFixedDeclarationPriceScale(true); List palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeader); // 总托数 Integer totalPlt = palletHeaderDataList.stream() diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx index a5c93068..08f8897a 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx index f91eed38..6625bc64 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx b/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx index fd1d614d..03179a2d 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx index 4bac666c..ebd76a0a 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template.xlsx b/src/main/resources/templates/TX/declaration-all-template.xlsx index a037bd11..9f12f58e 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template.xlsx and b/src/main/resources/templates/TX/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-invoice2-template.xlsx b/src/main/resources/templates/TX/declaration-invoice2-template.xlsx index 91334fb0..1a8eabb9 100644 Binary files a/src/main/resources/templates/TX/declaration-invoice2-template.xlsx and b/src/main/resources/templates/TX/declaration-invoice2-template.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-packingList-template.xlsx b/src/main/resources/templates/TX/declaration-packingList-template.xlsx index 3b7300c1..4167298e 100644 Binary files a/src/main/resources/templates/TX/declaration-packingList-template.xlsx and b/src/main/resources/templates/TX/declaration-packingList-template.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx index 9f7da258..5dff9c3b 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx b/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx index f86b52dc..aad9d6d1 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx and b/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx index 5ebd4601..85b47517 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template.xlsx b/src/main/resources/templates/YB/declaration-all-template.xlsx index e0ea2e91..914b3878 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template.xlsx and b/src/main/resources/templates/YB/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-packingList-template.xlsx b/src/main/resources/templates/YB/declaration-packingList-template.xlsx index dd930b76..04a1d11d 100644 Binary files a/src/main/resources/templates/YB/declaration-packingList-template.xlsx and b/src/main/resources/templates/YB/declaration-packingList-template.xlsx differ