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 d09952e1..7e352deb 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 @@ -2166,7 +2166,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { + "PO#" + eorder.get("customerPO")+ (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?" HS CODE#" + eorder.get("hsCode"):""); if ("02-Hardtag".equalsIgnoreCase(notifyHeader.getBuNo()) || "05-Alpha".equalsIgnoreCase(notifyHeader.getBuNo())){ designationContent = eorder.get("part_description") + "\n" - + "PO:" + eorder.get("customerPO")+ (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?" HS CODE:" + eorder.get("hsCode"):""); + + " PO:" + eorder.get("customerPO")+ (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?" HS CODE:" + eorder.get("hsCode"):""); } if (notifyHeader.getBuNo().equals("04-MHM")) { designationContent = designationContent + "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N") diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx index 6a19818d..c33f6367 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/ALPHA/export-goods-template.xlsx b/src/main/resources/templates/ALPHA/export-goods-template.xlsx index f59869c7..59a78532 100644 Binary files a/src/main/resources/templates/ALPHA/export-goods-template.xlsx and b/src/main/resources/templates/ALPHA/export-goods-template.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template.xlsx b/src/main/resources/templates/TX/declaration-all-template.xlsx index 42ab69f5..2fdc8471 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/TX/export-goods-template.xlsx b/src/main/resources/templates/TX/export-goods-template.xlsx index c39f1233..a21bdf7c 100644 Binary files a/src/main/resources/templates/TX/export-goods-template.xlsx and b/src/main/resources/templates/TX/export-goods-template.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 53614bf9..78497983 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.xlsx b/src/main/resources/templates/YB/declaration-all-template.xlsx index de399403..6ae7cea3 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/export-goods-template.xlsx b/src/main/resources/templates/YB/export-goods-template.xlsx index fb8f08f9..15b67110 100644 Binary files a/src/main/resources/templates/YB/export-goods-template.xlsx and b/src/main/resources/templates/YB/export-goods-template.xlsx differ