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 0875df44..61e6b3ce 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 @@ -2544,12 +2544,11 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { /** * PO号自动分行显示,避免导出后超出单元格范围。 */ - private String formatPoNoForDisplay(Collection poNoCollection) { + private String formatPoNoForDisplay(Collection poNoCollection,int maxCharsPerLine) { if (poNoCollection == null || poNoCollection.isEmpty()) { return ""; } - final int maxCharsPerLine = 100; StringBuilder result = new StringBuilder(); int currentLineLength = 0; @@ -2669,7 +2668,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { poNoSet.add(customerPO); } } - template.addVar("poNo", formatPoNoForDisplay(poNoSet)); + template.addVar("poNo", formatPoNoForDisplay(poNoSet,100)); BigDecimal allPrice = BigDecimal.valueOf(0.0); List ndList = sqlSession.selectList("ecssMapper.searchEcssCoDelNotifyDetailList", notifyHeader); if (ndList == null) { @@ -2795,7 +2794,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { .map(eorder -> Objects.toString(eorder.get("customerPO"), "").trim()) .filter(StringUtils::isNotBlank) .collect(Collectors.toCollection(LinkedHashSet::new)); - template.addVar("poNo", formatPoNoForDisplay(poNoSet)); + template.addVar("poNo", formatPoNoForDisplay(poNoSet,160)); List list = coDelMapper.selectBoxListTX(notifyHeader); // DB中item_no可能是字符串区间(如"127~127"、"2~26"),直接查询顺序可能不稳定,导出前做自然排序 sortBoxListBySeqAndItemNo(list); @@ -3061,7 +3060,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { .map(eorder -> Objects.toString(eorder.get("customerPO"), "").trim()) .filter(StringUtils::isNotBlank) .collect(Collectors.toCollection(LinkedHashSet::new)); - template.addVar("poNo", formatPoNoForDisplay(poNoSet)); + template.addVar("poNo", formatPoNoForDisplay(poNoSet,160)); List list = coDelMapper.selectBoxListTX(notifyHeader); // DB中item_no可能是字符串区间(如"127~127"、"2~26"),直接查询顺序可能不稳定,导出前做自然排序 sortBoxListBySeqAndItemNo(list); @@ -3330,7 +3329,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { .map(eorder -> Objects.toString(eorder.get("customerPO"), "").trim()) .filter(StringUtils::isNotBlank) .collect(Collectors.toCollection(LinkedHashSet::new)); - template.addVar("poNo", formatPoNoForDisplay(poNoSet)); + template.addVar("poNo", formatPoNoForDisplay(poNoSet,160)); List list = coDelMapper.selectBoxListTX(notifyHeader); // DB中item_no可能是字符串区间(如"127~127"、"2~26"),直接查询顺序可能不稳定,导出前做自然排序 sortBoxListBySeqAndItemNo(list); @@ -3599,7 +3598,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { } boolean showOrderNoFlag = data != null && Boolean.TRUE.equals(data.getShowOrderNoFlag()); boolean showInvoiceFlag = data != null && Boolean.TRUE.equals(data.getShowInvoiceFlag()); - String poNoDisplayText = formatPoNoForDisplay(poNoSet); + String poNoDisplayText = formatPoNoForDisplay(poNoSet,100); if (isShowOrderNoBu(buNo)) { poNoDisplayText = showOrderNoFlag ? "PO#"+formatPoNoForHwDesc(poNoSet) : ""; } 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 0eea876c..33db799f 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 26085257..4c59d256 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 71db76da..c44f5373 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 4ee82a91..2607d10b 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-packingList-template.xlsx b/src/main/resources/templates/TX/declaration-packingList-template.xlsx index f019e4aa..989c5791 100644 Binary files a/src/main/resources/templates/TX/declaration-packingList-template.xlsx and b/src/main/resources/templates/TX/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 debb5281..7d38116c 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 b53095d9..03f86cc8 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 7d20f117..f941c1fe 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 3d07c18d..9196f1e2 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 8090444d..82403e7e 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