From fc188bd209a05197c2b279c4ab04f446dcfd6fbc Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 17 Dec 2025 17:14:02 +0800
Subject: [PATCH] =?UTF-8?q?webcad=E5=AF=BC=E5=85=A5=E6=8E=92=E5=AD=94?=
 =?UTF-8?q?=E7=A9=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/factory/WebCadOrderImportAsyncFactory.java   | 5 ++++-
 .../orderImport/factory/WebCadOrderImportFactory.java        | 5 ++++-
 2 files 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/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 4ddb28600..e29bc9577 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
@@ -770,7 +770,10 @@ public class WebCadOrderImportAsyncFactory {
         // 是否造型
         boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
         // 是否排孔
-        boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0;
+        Integer frontHoleCount = block.getFrontHoleCount();
+        Integer backHoleCount = block.getBackHoleCount();
+
+        boolean isRawHole = ((frontHoleCount != null ? frontHoleCount : 0) + (backHoleCount != null ? backHoleCount : 0)) > 0;
 
         // 柜体长宽深
         orderBodyDO.setWidth(block.getCabinetWidth());
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 d81c618c1..1a27d82ff 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
@@ -626,7 +626,10 @@ public class WebCadOrderImportFactory {
         // 是否造型
         boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
         // 是否排孔
-        boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0;
+        Integer frontHoleCount = block.getFrontHoleCount();
+        Integer backHoleCount = block.getBackHoleCount();
+
+        boolean isRawHole = ((frontHoleCount != null ? frontHoleCount : 0) + (backHoleCount != null ? backHoleCount : 0)) > 0;
         Double area = block.getArea();
 
         // 柜体长宽深