From 2b2d1f8045f221769b2fc87c4c1d50225ac24ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=AF=97=E6=B4=A5?= <2723065175@qq.com>
Date: Thu, 5 Sep 2024 02:59:31 +0000
Subject: [PATCH] =?UTF-8?q?!3070=20=E4=BF=AE=E5=A4=8D:=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=85=B6=E4=B8=AD=E4=B8=80=E8=BE=B9=E6=98=AF=E6=9C=A8=E6=A2=A2?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=9A=E5=AD=94=E6=97=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=A2=AB=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/DrawDrilling/DrawDrillingTool.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts
index 06c6ddc6c..ae6ae7099 100644
--- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts
+++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts
@@ -1293,8 +1293,8 @@ export class DrawDrillingTool extends Singleton
                     && isParallelTo(p2, ZAxis, 0.01)
                     && isIntersect(0, en.Height, Math.min(p2.z, p2End.z), Math.max(p2.z, p2End.z), 1e-2))
                 {
-                    //判断通孔 木梢不修改Type和半径
-                    if (en.Type !== GangDrillType.Wood)
+                    //判断通孔 木梢不修改Type和半径(两边都不是木销)
+                    if (en.Type !== GangDrillType.Wood && refEn.Type !== GangDrillType.Wood)
                     {
                         //预埋件类型改为通孔
                         //除了偏移并且不是偏移0的情况，均为通孔类型