Browse Source

yb0托不显示

master
han\hanst 1 week ago
parent
commit
2c5a5c0315
  1. 2
      src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java
  2. 8
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
  3. BIN
      src/main/resources/templates/TX/declaration-all-template.xlsx
  4. BIN
      src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx
  5. BIN
      src/main/resources/templates/YB/declaration-all-template-invoice.xlsx
  6. BIN
      src/main/resources/templates/YB/declaration-all-template-pdf.xlsx
  7. BIN
      src/main/resources/templates/YB/declaration-all-template.xlsx
  8. BIN
      src/main/resources/templates/YB/declaration-packingList-template.xlsx

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

8
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()) {

BIN
src/main/resources/templates/TX/declaration-all-template.xlsx

BIN
src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx

BIN
src/main/resources/templates/YB/declaration-all-template-invoice.xlsx

BIN
src/main/resources/templates/YB/declaration-all-template-pdf.xlsx

BIN
src/main/resources/templates/YB/declaration-all-template.xlsx

BIN
src/main/resources/templates/YB/declaration-packingList-template.xlsx

Loading…
Cancel
Save