From 709b1286b5988a502564f3a66a9c99637344ea61 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Mon, 5 Jan 2026 10:26:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86rolls=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ecss/service/impl/CoDelServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 149b8e55..89a5c968 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/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())); }