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();
 
         // 柜体长宽深