Merge remote-tracking branch 'origin/master'

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

@@ -2992,7 +2992,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 // 合箱时：第一行显示数值，用于合并单元格居中显示
                 boolean isFirstRow = (i == 0);
                 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));
+                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);
                 if (showPalletQty) {
@@ -3258,7 +3258,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 // 合箱时：第一行显示数值，用于合并单元格居中显示
                 boolean isFirstRow = (i == 0);
                 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));
+                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);
                 if (showPalletQty) {