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 839c2afd..3fecdacf 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
@@ -2216,6 +2216,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 (notifyHeader.getBuNo().equals("04-MHM")?data.getVoyage():""));
 
         List<Map> detailList = coDelMapper.exportDeclarationDetailTX(data);
+        if (detailList == null) {
+            detailList = new ArrayList<>();
+        }
         for (int i = 0; i < detailList.size(); i++) {
             Map eorder = detailList.get(i);
             eorder.put("row_num", i + 1);
@@ -2240,6 +2243,13 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             }
             eorder.put("hs_code_desc", eorder.get("hs_code_desc"));
         }
+        // 报关单明细至少保留6行，明细不足时补空行
+        int minDeclarationDetailRows = 6;
+        for (int i = detailList.size(); i < minDeclarationDetailRows; i++) {
+            Map emptyRow = new HashMap();
+            emptyRow.put("row_num", "");
+            detailList.add(emptyRow);
+        }
         template.addListVarAll(detailList);
     }
 
@@ -2486,6 +2496,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
         template.addVar("poNo", formatPoNoForDisplay(poNoSet));
         BigDecimal allPrice = BigDecimal.valueOf(0.0);
         List<Map> ndList = sqlSession.selectList("ecssMapper.searchEcssCoDelNotifyDetailList", notifyHeader);
+        if (ndList == null) {
+            ndList = new ArrayList<>();
+        }
         for (int i = 0; i < ndList.size(); i++) {
             Map eorder = ndList.get(i);
             eorder.put("row_num", i + 1);
@@ -2515,6 +2528,13 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 // 根据发货通知单明细查找装箱明细，获取重量和净重，保留2位小数
             }
         }
+        // 发票明细至少保留4行，明细不足时补空行
+        int minInvoiceDetailRows = 4;
+        for (int i = ndList.size(); i < minInvoiceDetailRows; i++) {
+            Map emptyRow = new HashMap();
+            emptyRow.put("row_num", "");
+            ndList.add(emptyRow);
+        }
         // RFID需要的
         if (notifyHeader.getBuNo().equals("01-Label") || notifyHeader.getBuNo().equals("03-RFID")) {
             template.addVar("madein", stringInput(data.getOrigin()));
@@ -2789,6 +2809,13 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             totalVolume = notifyHeader.getTotalVolume() != null ? notifyHeader.getTotalVolume().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
         }
         template.addVar("Measurement", totalVolume);
+        // 箱单明细至少保留4行，明细不足时补空行
+        int minPackingListRows = 4;
+        for (int i = exportList.size(); i < minPackingListRows; i++) {
+            Map emptyRow = new HashMap();
+            emptyRow.put("row_num", "");
+            exportList.add(emptyRow);
+        }
         template.addListVarAll(exportList);
     }
 
@@ -3035,6 +3062,13 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             totalVolume = notifyHeader.getTotalVolume() != null ? notifyHeader.getTotalVolume().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
         }
         template.addVar("Measurement", totalVolume);
+        // 箱单明细至少保留4行，明细不足时补空行
+        int minPackingListRows = 4;
+        for (int i = exportList.size(); i < minPackingListRows; i++) {
+            Map emptyRow = new HashMap();
+            emptyRow.put("row_num", "");
+            exportList.add(emptyRow);
+        }
         template.addListVarAll(exportList);
     }
 
@@ -3297,6 +3331,13 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             totalVolume = notifyHeader.getTotalVolume() != null ? notifyHeader.getTotalVolume().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
         }
         template.addVar("Measurement", totalVolume);
+        // 箱单明细至少保留4行，明细不足时补空行
+        int minPackingListRows = 4;
+        for (int i = exportList.size(); i < minPackingListRows; i++) {
+            Map emptyRow = new HashMap();
+            emptyRow.put("row_num", "");
+            exportList.add(emptyRow);
+        }
         template.addListVarAll(exportList);
     }
 
diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx
index 5072079c..415af505 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/declaration-packingList-template.xlsx b/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx
index 95cf89a3..e18b090c 100644
Binary files a/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-packingList-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 fc5b3148..31c3d406 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 8d98d41a..a24f9b0d 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 8b078ba8..249b96c7 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 497ef28d..77f11f47 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 e6851684..86e87acc 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