diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java index dce42b70..b47c23a3 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java @@ -2700,6 +2700,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { template.addVar("cDeliverAdd", stringInput(notifyHeader.getOverseasAddress())); template.addVar("dateStr", DateUtils.format(notifyHeader.getReadyDate(), "yyyy-MM-dd")); template.addVar("cmc_invoice", notifyHeader.getCmcInvoice()); + template.addVar("shippingMode", stringInput(notifyHeader.getShippingMode())); Map poNoMap = new HashMap<>(); // 装箱数据 List palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeader); @@ -2954,7 +2955,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { template.addVar("cDeliverAdd", stringInput(notifyHeader.getOverseasAddress())); template.addVar("dateStr", DateUtils.format(notifyHeader.getReadyDate(), "yyyy-MM-dd")); template.addVar("cmc_invoice", notifyHeader.getCmcInvoice()); - + template.addVar("shippingMode", stringInput(notifyHeader.getShippingMode())); Map poNoMap = new HashMap<>(); Map orderNoMap = new HashMap<>(); List palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeader); diff --git a/src/main/resources/templates/declaration-all-showWeight-template-pdf.xlsx b/src/main/resources/templates/declaration-all-showWeight-template-pdf.xlsx index 644bec5f..a04a3e9f 100644 Binary files a/src/main/resources/templates/declaration-all-showWeight-template-pdf.xlsx and b/src/main/resources/templates/declaration-all-showWeight-template-pdf.xlsx differ diff --git a/src/main/resources/templates/declaration-all-showWeight-template-upc-pdf.xlsx b/src/main/resources/templates/declaration-all-showWeight-template-upc-pdf.xlsx index ef7f3b4b..c37ff071 100644 Binary files a/src/main/resources/templates/declaration-all-showWeight-template-upc-pdf.xlsx and b/src/main/resources/templates/declaration-all-showWeight-template-upc-pdf.xlsx differ diff --git a/src/main/resources/templates/declaration-all-showWeight-template-upc.xlsx b/src/main/resources/templates/declaration-all-showWeight-template-upc.xlsx index 59c3c579..1801ec4d 100644 Binary files a/src/main/resources/templates/declaration-all-showWeight-template-upc.xlsx and b/src/main/resources/templates/declaration-all-showWeight-template-upc.xlsx differ diff --git a/src/main/resources/templates/declaration-all-showWeight-template.xlsx b/src/main/resources/templates/declaration-all-showWeight-template.xlsx index fe91e594..ebf9f829 100644 Binary files a/src/main/resources/templates/declaration-all-showWeight-template.xlsx and b/src/main/resources/templates/declaration-all-showWeight-template.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-WOERMA-pdf.xlsx b/src/main/resources/templates/declaration-all-template-WOERMA-pdf.xlsx index 0e0cd555..157f8369 100644 Binary files a/src/main/resources/templates/declaration-all-template-WOERMA-pdf.xlsx and b/src/main/resources/templates/declaration-all-template-WOERMA-pdf.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-WOERMA-upc-pdf.xlsx b/src/main/resources/templates/declaration-all-template-WOERMA-upc-pdf.xlsx index de2b16af..f2423f56 100644 Binary files a/src/main/resources/templates/declaration-all-template-WOERMA-upc-pdf.xlsx and b/src/main/resources/templates/declaration-all-template-WOERMA-upc-pdf.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-WOERMA-upc.xlsx b/src/main/resources/templates/declaration-all-template-WOERMA-upc.xlsx index 98b2267a..1e31cb64 100644 Binary files a/src/main/resources/templates/declaration-all-template-WOERMA-upc.xlsx and b/src/main/resources/templates/declaration-all-template-WOERMA-upc.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-WOERMA.xlsx b/src/main/resources/templates/declaration-all-template-WOERMA.xlsx index 7e78681e..597c0b9e 100644 Binary files a/src/main/resources/templates/declaration-all-template-WOERMA.xlsx and b/src/main/resources/templates/declaration-all-template-WOERMA.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-pdf.xlsx b/src/main/resources/templates/declaration-all-template-pdf.xlsx index ca920afb..926bd165 100644 Binary files a/src/main/resources/templates/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-upc-pdf.xlsx b/src/main/resources/templates/declaration-all-template-upc-pdf.xlsx index 941ea802..d2390254 100644 Binary files a/src/main/resources/templates/declaration-all-template-upc-pdf.xlsx and b/src/main/resources/templates/declaration-all-template-upc-pdf.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template-upc.xlsx b/src/main/resources/templates/declaration-all-template-upc.xlsx index dfa7fcb4..1070a6b9 100644 Binary files a/src/main/resources/templates/declaration-all-template-upc.xlsx and b/src/main/resources/templates/declaration-all-template-upc.xlsx differ diff --git a/src/main/resources/templates/declaration-all-template.xlsx b/src/main/resources/templates/declaration-all-template.xlsx index 2ec5b2e0..7365be9e 100644 Binary files a/src/main/resources/templates/declaration-all-template.xlsx and b/src/main/resources/templates/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/declaration-all2-template.xlsx b/src/main/resources/templates/declaration-all2-template.xlsx index 7177077c..3c0557ab 100644 Binary files a/src/main/resources/templates/declaration-all2-template.xlsx and b/src/main/resources/templates/declaration-all2-template.xlsx differ diff --git a/src/main/resources/templates/declaration-packingList-template-WOERMA.xlsx b/src/main/resources/templates/declaration-packingList-template-WOERMA.xlsx index 3649a77c..eaf9946d 100644 Binary files a/src/main/resources/templates/declaration-packingList-template-WOERMA.xlsx and b/src/main/resources/templates/declaration-packingList-template-WOERMA.xlsx differ diff --git a/src/main/resources/templates/declaration-packingList-template.xlsx b/src/main/resources/templates/declaration-packingList-template.xlsx index 0692a19b..26b26989 100644 Binary files a/src/main/resources/templates/declaration-packingList-template.xlsx and b/src/main/resources/templates/declaration-packingList-template.xlsx differ diff --git a/src/main/resources/templates/declaration-packingList2-template.xlsx b/src/main/resources/templates/declaration-packingList2-template.xlsx index 07e16303..a3c8b1b4 100644 Binary files a/src/main/resources/templates/declaration-packingList2-template.xlsx and b/src/main/resources/templates/declaration-packingList2-template.xlsx differ