From e56d650633761b60f601e8b95af6b394e996cce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com>
Date: Thu, 27 Jun 2024 11:01:02 +0000
Subject: [PATCH] =?UTF-8?q?!2844=20=E4=BF=AE=E5=A4=8D:=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E6=9C=89=E6=8B=86=E5=8D=95=E5=B0=BA=E5=AF=B8=E6=97=B6=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=AD=94=E6=A7=BD=E5=8A=A0=E5=B7=A5=E6=97=B6=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E9=92=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GraphicsSystem/ToolPath/FeedingToolPath.ts | 12 +++++++++++-
 src/Production/Product.ts                      |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/GraphicsSystem/ToolPath/FeedingToolPath.ts b/src/GraphicsSystem/ToolPath/FeedingToolPath.ts
index fa3dd7f2d..d9b8e4d98 100644
--- a/src/GraphicsSystem/ToolPath/FeedingToolPath.ts
+++ b/src/GraphicsSystem/ToolPath/FeedingToolPath.ts
@@ -640,8 +640,18 @@ export function GetModelingFromCustomDrill(br: Board)
     if (br.IsArcBoard && br.DrillList.size)
         ParseArcBoardHoles(br, new Vector3);
 
-    for (let [, idss] of br.DrillList)
+    const { partialSplitValueCanTakesEffect, cancelHoleProcessing } = HostApplicationServices.chaidanOption;
+
+    for (let [objetId, idss] of br.DrillList)
     {
+        let linkBoard = objetId.Object as Board;
+        if (cancelHoleProcessing && linkBoard)
+        {
+            const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
+            if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
+                continue;
+        }
+
         for (let ids of idss)
         {
             for (let id of ids)
diff --git a/src/Production/Product.ts b/src/Production/Product.ts
index 2d5c19179..793471e4d 100644
--- a/src/Production/Product.ts
+++ b/src/Production/Product.ts
@@ -626,7 +626,7 @@ export namespace Production
         for (let [key, driss] of br.DrillList)
         {
             let linkBoard = key.Object as Board;
-            if (cancelHoleProcessing && linkBoard !== undefined)
+            if (cancelHoleProcessing && linkBoard)
             {
                 const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
                 if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
@@ -677,7 +677,7 @@ export namespace Production
                 continue;
             let nail = nid.Object as CylinderHole;
             let linkBoard = nail.MId.Object as Board;
-            if (cancelHoleProcessing && linkBoard !== undefined)
+            if (cancelHoleProcessing && linkBoard)
             {
                 const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
                 if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))