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 e2ae283f..7cd8278b 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 @@ -2571,8 +2571,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { // 根据发货通知单明细查找装箱明细,获取重量和净重,保留2位小数 } } - // 发票明细至少保留4行,明细不足时补空行 - int minInvoiceDetailRows = 4; + // 发票明细至少保留6行,明细不足时补空行 + int minInvoiceDetailRows = 6; for (int i = ndList.size(); i < minInvoiceDetailRows; i++) { Map emptyRow = new HashMap(); emptyRow.put("row_num", ""); @@ -2852,8 +2852,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { totalVolume = notifyHeader.getTotalVolume() != null ? notifyHeader.getTotalVolume().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO; } template.addVar("Measurement", totalVolume); - // 箱单明细至少保留4行,明细不足时补空行 - int minPackingListRows = 4; + // 箱单明细至少保留6行,明细不足时补空行 + int minPackingListRows = 6; for (int i = exportList.size(); i < minPackingListRows; i++) { Map emptyRow = new HashMap(); emptyRow.put("row_num", ""); @@ -3123,8 +3123,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { totalVolume = notifyHeader.getTotalVolume() != null ? notifyHeader.getTotalVolume().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO; } template.addVar("Measurement", totalVolume); - // 箱单明细至少保留4行,明细不足时补空行 - int minPackingListRows = 4; + // 箱单明细至少保留6行,明细不足时补空行 + int minPackingListRows = 6; for (int i = exportList.size(); i < minPackingListRows; i++) { Map emptyRow = new HashMap(); emptyRow.put("row_num", ""); @@ -3392,8 +3392,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { totalVolume = notifyHeader.getTotalVolume() != null ? notifyHeader.getTotalVolume().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO; } template.addVar("Measurement", totalVolume); - // 箱单明细至少保留4行,明细不足时补空行 - int minPackingListRows = 4; + // 箱单明细至少保留6行,明细不足时补空行 + int minPackingListRows = 6; for (int i = exportList.size(); i < minPackingListRows; i++) { Map emptyRow = new HashMap(); emptyRow.put("row_num", ""); 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 988cfd72..6245b5e7 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 19e73b38..dd9dd0c6 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 28525a92..663585d3 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 546f2d08..568895cb 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 b87fc548..27f7872e 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 732351d3..6603337e 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 a439bb9e..f019e4aa 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 55d39d97..9d3833a5 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 6a8135bf..33b504b6 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 76dbab3a..f73dc789 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 64b1fb6c..0aa3c0b6 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