shippingMode

3 weeks ago · 9645740fef
17 changed files with 2 additions and 1 deletions
--- 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<EcssCoDelPalletHeaderData> 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<EcssCoDelPalletHeaderData> palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeader);
--- a/src/main/resources/templates/declaration-all-showWeight-template-pdf.xlsx
+++ b/src/main/resources/templates/declaration-all-showWeight-template-pdf.xlsx
--- a/src/main/resources/templates/declaration-all-showWeight-template-upc-pdf.xlsx
+++ b/src/main/resources/templates/declaration-all-showWeight-template-upc-pdf.xlsx
--- a/src/main/resources/templates/declaration-all-showWeight-template-upc.xlsx
+++ b/src/main/resources/templates/declaration-all-showWeight-template-upc.xlsx
--- a/src/main/resources/templates/declaration-all-showWeight-template.xlsx
+++ b/src/main/resources/templates/declaration-all-showWeight-template.xlsx
--- a/src/main/resources/templates/declaration-all-template-WOERMA-pdf.xlsx
+++ b/src/main/resources/templates/declaration-all-template-WOERMA-pdf.xlsx
--- a/src/main/resources/templates/declaration-all-template-WOERMA-upc-pdf.xlsx
+++ b/src/main/resources/templates/declaration-all-template-WOERMA-upc-pdf.xlsx
--- a/src/main/resources/templates/declaration-all-template-WOERMA-upc.xlsx
+++ b/src/main/resources/templates/declaration-all-template-WOERMA-upc.xlsx
--- a/src/main/resources/templates/declaration-all-template-WOERMA.xlsx
+++ b/src/main/resources/templates/declaration-all-template-WOERMA.xlsx
--- a/src/main/resources/templates/declaration-all-template-pdf.xlsx
+++ b/src/main/resources/templates/declaration-all-template-pdf.xlsx
--- a/src/main/resources/templates/declaration-all-template-upc-pdf.xlsx
+++ b/src/main/resources/templates/declaration-all-template-upc-pdf.xlsx
--- a/src/main/resources/templates/declaration-all-template-upc.xlsx
+++ b/src/main/resources/templates/declaration-all-template-upc.xlsx
--- a/src/main/resources/templates/declaration-all-template.xlsx
+++ b/src/main/resources/templates/declaration-all-template.xlsx
--- a/src/main/resources/templates/declaration-all2-template.xlsx
+++ b/src/main/resources/templates/declaration-all2-template.xlsx
--- a/src/main/resources/templates/declaration-packingList-template-WOERMA.xlsx
+++ b/src/main/resources/templates/declaration-packingList-template-WOERMA.xlsx
--- a/src/main/resources/templates/declaration-packingList-template.xlsx
+++ b/src/main/resources/templates/declaration-packingList-template.xlsx
--- a/src/main/resources/templates/declaration-packingList2-template.xlsx
+++ b/src/main/resources/templates/declaration-packingList2-template.xlsx