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 cc639cf5..9bec8d44 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,7 +2003,7 @@ 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; + boolean isPackingListSheet = i == 1||i==0; // 设置页面方向(纵向) pageSetup.setOrientation(i==2? PageOrientationType.LANDSCAPE:PageOrientationType.PORTRAIT); 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 08f8897a..ee9393f9 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/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx index ebd76a0a..97300986 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 9f12f58e..5c2a6ec8 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 1a8eabb9..0775db8e 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 4167298e..323cbd1c 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 5dff9c3b..566f9d13 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-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx index 85b47517..8c0ea232 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