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 9bec8d44..683c0480 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 @@ -3052,7 +3052,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", isFirstRow ? ((BigDecimal)eorder.get("box_qty")).setScale(0, RoundingMode.HALF_UP) : ""); + eorder.put("noCartons", ((BigDecimal)eorder.get("box_qty")).setScale(0, RoundingMode.HALF_UP)); eorder.put("qty_percarton", ((BigDecimal)eorder.get("rolls")).setScale(0, RoundingMode.HALF_UP)); // 托盘数:一个托盘对应多个箱,仅在该托盘第一条明细显示,其他行留空,后续按托盘合并 boolean showPalletQty = StringUtils.isNotEmpty(palletSeqNo) && !displayedPalletSeqSet.contains(palletSeqNo); @@ -3086,7 +3086,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { if (boxEndIndex >= boxStartIndex) { // 箱级字段按箱明细范围合并(一个箱可能有多条箱明细) // 箱数列(第5列,索引4)按箱明细范围合并 - template.addMergeRegion(boxStartIndex, boxEndIndex, 4); + //template.addMergeRegion(boxStartIndex, boxEndIndex, 4); // 净重列(第7列,索引6)按箱明细范围合并 template.addMergeRegion(boxStartIndex, boxEndIndex, 6); // 毛重列(第8列,索引7)按箱明细范围合并