From 5ea85530ea9c89bbfafa5c10872edbc5c55ffe58 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 14 Mar 2025 14:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9Aorderplate=E7=9A=84?= =?UTF-8?q?=E6=8B=86=E5=8D=95=E5=AE=BD=E9=AB=98=E7=BC=BA=E7=9C=81=E5=8F=96?= =?UTF-8?q?=E5=BC=80=E6=96=99=E5=AE=BD=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderImport/factory/WebCadOrderImportFactory.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 e904ccd0b..e63e08988 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 @@ -524,6 +524,9 @@ public class WebCadOrderImportFactory { WebCadDataBlockReqVO.InfoDTO blockInfo = block.getInfo(); + + String splitHeight = blockInfo.getSpliteHeight(); + String spliteWidth = blockInfo.getSpliteWidth(); // 创建order_plate PlateDO plateDO = PlateDO.builder() .id(plateId) @@ -535,9 +538,9 @@ public class WebCadOrderImportFactory { .width(BigDecimal.valueOf(block.getWidth())) .height(BigDecimal.valueOf(block.getHeight())) .thickness(BigDecimal.valueOf(block.getThickness())) - .splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(blockInfo.getSpliteHeight()))) + .splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(StringUtils.isNotEmpty(splitHeight) ? splitHeight : String.valueOf(block.getKaiLiaoHeight())))) .splitThickness(BigDecimal.valueOf(NumberUtil.parseDouble(blockInfo.getSpliteThickness()))) - .splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(blockInfo.getSpliteWidth()))) + .splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(StringUtils.isNotEmpty(spliteWidth) ? spliteWidth : String.valueOf(block.getKaiLiaoWidth())))) .area(BigDecimal.valueOf(block.getArea())) .texture(block.getTexture()) .holeFace(block.getHoleFace()) @@ -890,6 +893,9 @@ public class WebCadOrderImportFactory { * @param blockObjectList */ private void analyzeOrderParts(List blockObjectList) { + if (CollUtil.isEmpty(blockObjectList)) { + return; + } // 筛选出组件配件 List moduleCollect = blockObjectList.stream().filter(p -> PART_CATEGORY_THREE.equals(p.getType())).collect(Collectors.toList()); // 基于以下属性分组非组件的配件