diff --git a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java index e4052b1b..72c4617c 100644 --- a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java +++ b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java @@ -530,7 +530,7 @@ public class ExcelTemplateTX { } else { numFmt = "#,##0.00"; } - style7.setDataFormat(dataFormat.getFormat(numFmt)); + style7.setDataFormat(dataFormat.getFormat(i==8||i==7?"#,##0.00":numFmt)); 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 2a709995..c4d4b3f9 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 @@ -3216,7 +3216,13 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { } else { totalPlt = totalCartons.setScale(0, RoundingMode.HALF_UP).intValue(); } - template.addVar("total_plt", totalPlt+plt); + if (totalPlt>0) { + template.addVar("total_plt", totalPlt+"PLT"); + template.addVar("plt(", "(="); + template.addVar("plt)", ")"); + template.addVar("InclPalletWeight", "(Incl.Pallet Weight)"); + } + //template.addVar("total_plt", totalPlt+plt); template.addVar("total_pallet", totalPlt); // 孟加拉需要的 if (data.getMaterial()!=null && data.getMaterial()) { diff --git a/src/main/resources/templates/TX/declaration-all-template.xlsx b/src/main/resources/templates/TX/declaration-all-template.xlsx index 958bfe3b..5b5aa5d5 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/YB/declaration-all-template-invoice-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx index 2009cc59..779a802e 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 94ec105b..3c8db972 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 7019ee12..4b1fff76 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 f2887e3b..3a97d1c9 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 e806df6b..a2987762 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