明细rolls允许空

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

@@ -300,10 +300,10 @@ public class CoDelServiceImpl implements CoDelService {
         if (checkHeader.isEmpty()) {
             throw new RuntimeException("不存在该发货通知单，请刷新界面");
         }
-        
+
         // 调用Mapper方法执行批量更新
         int updatedRows = coDelMapper.fixTtlAmount(data);
-        
+
         if (updatedRows == 0) {
             throw new RuntimeException("没有需要修正的明细数据");
         }
@@ -4206,7 +4206,9 @@ public class CoDelServiceImpl implements CoDelService {
                         }
 
                         Object detailRollsObj = detail.get("detailRolls");
-                        if (detailRollsObj instanceof BigDecimal) {
+                        if (detailRollsObj == null || "".equals(detailRollsObj)) {
+                            palletDetailData.setRolls(BigDecimal.valueOf(0));
+                        } else if (detailRollsObj instanceof BigDecimal) {
                             palletDetailData.setRolls((BigDecimal) detailRollsObj);
                         } else if (detailRollsObj instanceof Integer) {
                             palletDetailData.setRolls(BigDecimal.valueOf((Integer) detailRollsObj));
@@ -4214,7 +4216,7 @@ public class CoDelServiceImpl implements CoDelService {
                             palletDetailData.setRolls(BigDecimal.valueOf((Double) detailRollsObj));
                         } else if (detailRollsObj instanceof String) {
                             palletDetailData.setRolls(new BigDecimal((String) detailRollsObj));
-                        } else if (detailRollsObj != null) {
+                        } else {
                             palletDetailData.setRolls(BigDecimal.valueOf(((Number) detailRollsObj).doubleValue()));
                         }