6

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java

@@ -2571,8 +2571,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 // 根据发货通知单明细查找装箱明细，获取重量和净重，保留2位小数
             }
         }
-        // 发票明细至少保留4行，明细不足时补空行
-        int minInvoiceDetailRows = 4;
+        // 发票明细至少保留6行，明细不足时补空行
+        int minInvoiceDetailRows = 6;
         for (int i = ndList.size(); i < minInvoiceDetailRows; i++) {
             Map emptyRow = new HashMap();
             emptyRow.put("row_num", "");
@@ -2852,8 +2852,8 @@ 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;
+        // 箱单明细至少保留6行，明细不足时补空行
+        int minPackingListRows = 6;
         for (int i = exportList.size(); i < minPackingListRows; i++) {
             Map emptyRow = new HashMap();
             emptyRow.put("row_num", "");
@@ -3123,8 +3123,8 @@ 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;
+        // 箱单明细至少保留6行，明细不足时补空行
+        int minPackingListRows = 6;
         for (int i = exportList.size(); i < minPackingListRows; i++) {
             Map emptyRow = new HashMap();
             emptyRow.put("row_num", "");
@@ -3392,8 +3392,8 @@ 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;
+        // 箱单明细至少保留6行，明细不足时补空行
+        int minPackingListRows = 6;
         for (int i = exportList.size(); i < minPackingListRows; i++) {
             Map emptyRow = new HashMap();
             emptyRow.put("row_num", "");