From 6d5df5024822d6aa743836a59f9e70f4cb362db2 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 11 Jun 2026 13:55:35 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"cad=E6=8B=86=E5=8D=95=E9=80=A0?=
 =?UTF-8?q?=E5=9E=8B=E5=88=A4=E5=AE=9A=E4=BF=AE=E6=AD=A3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9e191c5730e160970a183048eed9b69f4b428da2.
---
 .../admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java | 5 +++++
 .../factory/WebCadOrderImportAsyncFactory.java            | 8 +++-----
 .../orderImport/factory/WebCadOrderImportFactory.java     | 8 +++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java
index 9e05a3409..4d946901b 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockReqVO.java
@@ -84,6 +84,7 @@ public class WebCadDataBlockReqVO {
     private boolean has2DModel;
     private boolean has3DModel;
     private String boardTypeName;
+    private boolean isModel;
     private boolean isSideModel;
     private boolean hasSide2DModel;
 
@@ -105,6 +106,10 @@ public class WebCadDataBlockReqVO {
         isSideModel = sideModel;
     }
 
+    public void setIsModel(boolean model) {
+        isModel = model;
+    }
+
     @NoArgsConstructor
     @Data
     public static class FrontBackHolesDTO {
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 585b9ffd7..e158e14f9 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
@@ -743,9 +743,7 @@ public class WebCadOrderImportAsyncFactory {
         // 是否有侧面二维刀路
         boolean hasSide2DModel = block.isHasSide2DModel();
         // 是否造型
-        Integer frontModelCount = block.getFrontModelCount();
-        Integer backModelCount = block.getBackModelCount();
-        boolean isModel = frontModelCount > 0 || backModelCount > 0 || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
+        boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
         // 是否排孔
         Integer frontHoleCount = block.getFrontHoleCount();
         Integer backHoleCount = block.getBackHoleCount();
@@ -812,8 +810,8 @@ public class WebCadOrderImportAsyncFactory {
                 .frontHoleCount(block.getFrontHoleCount())
                 .backHoleCount(block.getBackHoleCount())
                 .sideHoleCount(block.getSideHoleCount())
-                .frontModelCount(frontModelCount)
-                .backModelCount(backModelCount)
+                .frontModelCount(block.getFrontModelCount())
+                .backModelCount(block.getBackModelCount())
                 .offsetX(getBigDecimalOrNull(block.getOffsetX()))
                 .offsetY(getBigDecimalOrNull(block.getOffsetY()))
                 .isArcAcross(getDefaultFalse(block.getIsArcBase()))
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 0dfa3bf99..8dfc80e60 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
@@ -937,9 +937,7 @@ public class WebCadOrderImportFactory {
         // 是否有侧面二维刀路
         boolean hasSide2DModel = block.isHasSide2DModel();
         // 是否造型
-        Integer frontModelCount = block.getFrontModelCount();
-        Integer backModelCount = block.getBackModelCount();
-        boolean isModel = frontModelCount > 0 || backModelCount > 0 || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
+        boolean isModel = block.isModel() || sideModel || has2DModel || hasSide2DModel || block.isHas3DModel();
         // 是否排孔
         Integer frontHoleCount = block.getFrontHoleCount();
         Integer backHoleCount = block.getBackHoleCount();
@@ -1005,8 +1003,8 @@ public class WebCadOrderImportFactory {
                 .frontHoleCount(block.getFrontHoleCount())
                 .backHoleCount(block.getBackHoleCount())
                 .sideHoleCount(block.getSideHoleCount())
-                .frontModelCount(frontModelCount)
-                .backModelCount(backModelCount)
+                .frontModelCount(block.getFrontModelCount())
+                .backModelCount(block.getBackModelCount())
                 .offsetX(getBigDecimalOrNull(block.getOffsetX()))
                 .offsetY(getBigDecimalOrNull(block.getOffsetY()))
                 .isArcAcross(getDefaultFalse(block.getIsArcBase()))