From 7b957b929b89019c30ad5e346c6795192d649ce1 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 26 May 2025 16:48:26 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=9D=BF=E6=9D=90?= =?UTF-8?q?=E5=BA=93=E9=95=BF=E5=AE=BD=E5=8F=AF=E7=A9=BA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/WebCadOrderImportAsyncFactory.java | 14 ++++++++++++-- .../factory/WebCadOrderImportFactory.java | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index db70ec32a..c5eed5057 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -446,8 +446,8 @@ public class WebCadOrderImportAsyncFactory { .texture(materialReqVO.getTexture()) .color(materialReqVO.getColor()) .colorBlack(EMPTY_STRING) - .width(BigDecimal.valueOf(materialReqVO.getWidth())) - .height(BigDecimal.valueOf(materialReqVO.getHeight())) + .width(BigDecimal.valueOf(getZeroDouble(materialReqVO.getWidth()))) + .height(BigDecimal.valueOf(getZeroDouble(materialReqVO.getHeight()))) .thickness(BigDecimal.valueOf(materialReqVO.getThickness())) .spec(materialReqVO.getSpec()) .brand(materialReqVO.getBrand()) @@ -1689,6 +1689,16 @@ public class WebCadOrderImportAsyncFactory { return StringUtils.defaultIfEmpty(value, EMPTY_STRING); } + /** + * value为空返回0.0 + * + * @param value + * @return + */ + private double getZeroDouble(Double value) { + return ObjectUtil.defaultIfNull(value, 0.0); + } + /** * value为空返回false * diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 446402b51..95b46e5f4 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -382,8 +382,8 @@ public class WebCadOrderImportFactory { .texture(materialReqVO.getTexture()) .color(materialReqVO.getColor()) .colorBlack(EMPTY_STRING) - .width(BigDecimal.valueOf(materialReqVO.getWidth())) - .height(BigDecimal.valueOf(materialReqVO.getHeight())) + .width(BigDecimal.valueOf(getZeroDouble(materialReqVO.getWidth()))) + .height(BigDecimal.valueOf(getZeroDouble(materialReqVO.getHeight()))) .thickness(BigDecimal.valueOf(materialReqVO.getThickness())) .spec(materialReqVO.getSpec()) .brand(materialReqVO.getBrand())