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))