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 a84ad612..5651b08e 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 @@ -1171,7 +1171,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { workbook.write(response.getOutputStream()); } } else if ("02-Hardtag".equalsIgnoreCase(buNo)) { - ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource("templates/TX/declaration-template.xlsx").getInputStream()); + ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource("templates/YB/declaration-template.xlsx").getInputStream()); extractedDeclaration(data, new Yb2ExcelTemplateAdapter(template)); try (XSSFWorkbook workbook = template.render(0)) { workbook.write(response.getOutputStream()); 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 7d38116c..191e50ef 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 03f86cc8..6b5d3d58 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 f941c1fe..65316034 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 9196f1e2..3b69a494 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 82403e7e..f0402a05 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 diff --git a/src/main/resources/templates/YB/declaration-template.xlsx b/src/main/resources/templates/YB/declaration-template.xlsx new file mode 100644 index 00000000..5c1b90e3 Binary files /dev/null and b/src/main/resources/templates/YB/declaration-template.xlsx differ