样式

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);
                     }

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<EcssCoDelPalletHeaderData> palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeader);
         // 总托数
         Integer totalPlt = palletHeaderDataList.stream()