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())