样式

src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java

@@ -649,9 +649,7 @@ public class ExcelTemplateYB {
                     boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
                     boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
                     boolean declarationAfterPriceColumn = i >= declarationCenterStartCol;
-                    style.setVerticalAlignment(declarationAfterPriceColumn
-                            ? VerticalAlignment.CENTER
-                            : (declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER));
+                    style.setVerticalAlignment(VerticalAlignment.CENTER);
                     style.setAlignment(declarationAfterPriceColumn ? HorizontalAlignment.CENTER : HorizontalAlignment.LEFT);
                     style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);

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

@@ -3045,7 +3045,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 eorder.put("total_qty", ((BigDecimal)eorder.get("qty")).setScale(6, RoundingMode.HALF_UP));
                 // 合箱时：第一行显示数值，用于合并单元格居中显示
                 boolean isFirstRow = (i == 0);
-                eorder.put("noCartons",((BigDecimal)eorder.get("box_qty")).setScale(0, RoundingMode.HALF_UP));
+                eorder.put("noCartons",eorder.get("box_qty")!=null?((BigDecimal)eorder.get("box_qty")).setScale(0, RoundingMode.HALF_UP):"");
                 eorder.put("qty_percarton", eorder.get("rolls")!=null?((BigDecimal)eorder.get("rolls")).setScale(0, RoundingMode.HALF_UP):"");
                 // 托盘数：一个托盘对应多个箱，仅在该托盘第一条明细显示，其他行留空，后续按托盘合并
                 boolean showPalletQty = StringUtils.isNotEmpty(palletSeqNo) && !displayedPalletSeqSet.contains(palletSeqNo);
@@ -3312,7 +3312,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 eorder.put("total_qty", ((BigDecimal)eorder.get("qty")).setScale(6, RoundingMode.HALF_UP));
                 // 合箱时：第一行显示数值，用于合并单元格居中显示
                 boolean isFirstRow = (i == 0);
-                eorder.put("noCartons", ((BigDecimal)eorder.get("box_qty")).setScale(0, RoundingMode.HALF_UP));
+                eorder.put("noCartons", eorder.get("box_qty")!=null?((BigDecimal)eorder.get("box_qty")).setScale(0, RoundingMode.HALF_UP):"");
                 eorder.put("qty_percarton", eorder.get("rolls")!=null?((BigDecimal)eorder.get("rolls")).setScale(0, RoundingMode.HALF_UP):"");
                 // 托盘数：一个托盘对应多个箱，仅在该托盘第一条明细显示，其他行留空，后续按托盘合并
                 boolean showPalletQty = StringUtils.isNotEmpty(palletSeqNo) && !displayedPalletSeqSet.contains(palletSeqNo);
@@ -3561,7 +3561,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 .map(EcssCoDelPalletHeaderData::getPalletQty)
                 .filter(Objects::nonNull) // 防止空指针
                 .reduce(0, Integer::sum);
-        template.addVar("quantity", ecHeader!=null?(totalPlt==0?ecHeader.getBoxQty()+"CTN("+ecHeader.getBoxQty()+"CTN)":
+        template.addVar("quantity", ecHeader!=null?(totalPlt==0?ecHeader.getBoxQty()+"CTN":
                 totalPlt+"PLT("+ecHeader.getBoxQty()+"CTN)"):"");
 
         template.addVar("price", ttlAmount.setScale(2, RoundingMode.HALF_UP));