diff --git a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java index e5beafc8..13d36c59 100644 --- a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java +++ b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java @@ -642,7 +642,7 @@ public class ExcelTemplateALPHA { style.setFont(font); boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i); boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText(); - style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); style.setAlignment(HorizontalAlignment.LEFT); style.setWrapText(keepWrapText || declarationHsCodeDescColumn); c7.setCellStyle(style); 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 16e20460..2ffe7995 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 @@ -1145,7 +1145,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { } /** - * Alpha/硬标场景按客户名称、客户地址、收货地址是否包含 Spain/España 决定是否显示 Loading No. + * Alpha/硬标场景按目的地是否包含 Spain/España 决定是否显示 Loading No. */ private String resolveLoadingNoTemplateValue(EcssDeclarationHeaderData data, EcssCoDelNotifyHeaderData notifyHeader) { String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo()) @@ -2987,7 +2987,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { } Integer palletQty = palletQtyMap.get(palletSeqNo); // 第一列展示托号(pallet_no),按托盘首行显示,后续行留空再做按托合并 - eorder.put("seq_no", !hasPalletData?(showPalletQty ? palletNo : ""):boxNo); + eorder.put("seq_no", hasPalletData?(showPalletQty ? palletNo : ""):boxNo); eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : "") : ""); eorder.put("volume", isFirstRow ? volume : ""); eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : ""); 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 d7605ea3..9fa6e8b6 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 372231d8..f2097714 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 88aabf6a..28525a92 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