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 2ffe7995..bfe796be 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
@@ -1208,9 +1208,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
      */
     private String resolveDeclarationPackageUnit(EcssDeclarationHeaderData data, EcssCoDelNotifyHeaderData notifyHeader) {
         String packageUnit = data == null ? "" : stringInput(data.getPackageUnit()).trim();
-        if (StringUtils.isNotBlank(packageUnit)) {
+        /*if (StringUtils.isNotBlank(packageUnit)) {
             return packageUnit;
-        }
+        }*/
         String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo())
                 ? notifyHeader.getBuNo() : (data == null ? "" : data.getBuNo());
         if (!isUsaCanadaPackageUnitBu(buNo)) {
diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx
index c841827d..6036a408 100644
Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ
diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx
index a4985053..46efc0f4 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/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx
index 5a6696dc..e3184cee 100644
Binary files a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/TX/declaration-all-template-pdf.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 aba677df..2460ff8e 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/declaration-template.xlsx b/src/main/resources/templates/TX/declaration-template.xlsx
index cf580ae4..49300e4c 100644
Binary files a/src/main/resources/templates/TX/declaration-template.xlsx and b/src/main/resources/templates/TX/declaration-template.xlsx differ
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 31c3d406..55d39d97 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 a24f9b0d..6a8135bf 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 249b96c7..76dbab3a 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 77f11f47..64b1fb6c 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