!3049 修复:排钻智能偏移未过滤排钻在板外问题

Merge pull request !3049 from 林三/fix_CyHoleInBoard

src/Add-on/DrawDrilling/DrawDrillingTool.ts

@@ -683,6 +683,16 @@ export class DrawDrillingTool extends Singleton
                 Log(`移动距离${dist.toFixed(2)},碰撞面宽度${this.m_Face.Length.toFixed(2)},排钻将绘制在板外,跳过绘制`, LogType.Warning);
                 continue;
             }
+            else if (!this.CheckDrillInBoard(dist))
+            {
+                InteractionLog([
+                    { msg: `板件${this.m_Face.LocalBoard.Name}`, entity: [this.m_Face.LocalBoard] },
+                    { msg: "-" },
+                    { msg: `板件${this.m_Face.InterBoard.Name}`, entity: [this.m_Face.InterBoard] },
+                    { msg: "有排钻在板件外,跳过绘制" }
+                ], LogType.Warning);
+                continue;
+            }
             else if (this._AutoDeviation)
             {
                 //偏移值在有效区间 或 有木销时, 第一个和最后一个排钻距离32的位置是否可以放置木销
@@ -770,16 +780,6 @@ export class DrawDrillingTool extends Singleton
                 this._InteractionLog("有排钻与造型碰撞,跳过绘制");
                 continue;
             }
-            else if (!this.CheckDrillInBoard(dist))
-            {
-                InteractionLog([
-                    { msg: `板件${this.m_Face.LocalBoard.Name}`, entity: [this.m_Face.LocalBoard] },
-                    { msg: "-" },
-                    { msg: `板件${this.m_Face.InterBoard.Name}`, entity: [this.m_Face.InterBoard] },
-                    { msg: "有排钻在板件外,跳过绘制" }
-                ], LogType.Warning);
-                continue;
-            }
 
             //新的排钻列表
             let newDrillEnts: ObjectId[] = [];