From 3707299e5c48fbf91bc49fad084779c63820a145 Mon Sep 17 00:00:00 2001
From: ChenX <maple6@vip.qq.com>
Date: Sun, 20 Dec 2020 13:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E5=9C=A8=E6=8E=92=E9=92=BB?=
 =?UTF-8?q?=E7=BC=96=E7=BB=84=E4=B8=A2=E5=A4=B1=E7=9A=84=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E4=B8=8B,=E8=AD=A6=E5=91=8A=E7=94=A8=E4=BA=8E=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1=E5=BC=82=E5=B8=B8(=E8=83=BD?=
 =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=8B=86=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LookOverBoardInfosTool.ts                 | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts b/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts
index 48876b080..0afd47455 100644
--- a/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts
+++ b/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts
@@ -1,18 +1,17 @@
-import { Board } from "../../DatabaseServices/Entity/Board";
-import { Hole } from "../../DatabaseServices/3DSolid/Hole";
+import { Vector3 } from "three";
+import { EBoardKeyList } from "../../Common/BoardKeyList";
+import { ParseExpr, safeEval } from "../../Common/eval";
+import { Intent, Toaster } from "../../Common/Toaster";
+import { FixedNotZero } from "../../Common/Utils";
 import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole";
-import { GroupRecord } from "../../DatabaseServices/GroupTableRecord";
 import { ExtrudeHole } from "../../DatabaseServices/3DSolid/ExtrudeHole";
-import { IHardwareType, Production } from "../../Production/Product";
-import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
+import { Hole } from "../../DatabaseServices/3DSolid/Hole";
+import { Board } from "../../DatabaseServices/Entity/Board";
+import { GroupRecord } from "../../DatabaseServices/GroupTableRecord";
 import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
-import { Vector3 } from "three";
-import { safeEval, ParseExpr } from "../../Common/eval";
-import { FixedNotZero } from "../../Common/Utils";
+import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
 import { equaln } from "../../Geometry/GeUtils";
-import { Polyline } from "../../DatabaseServices/Entity/Polyline";
-import { EBoardKeyList } from "../../Common/BoardKeyList";
-import { Toaster, Intent } from "../../Common/Toaster";
+import { IHardwareType, Production } from "../../Production/Product";
 
 export interface ICountType<T = IHardwareType>
 {
@@ -144,9 +143,16 @@ class LookOverBoardInfosTool
                                 //TODO:统计自定义排钻
                                 if (gd instanceof ExtrudeHole)
                                 {
-                                    let name = (gd.GroupId.Object as GroupRecord).Name;
-                                    let ents = (gd.GroupId.Object as GroupRecord).Entitys;
-                                    addDrillToMap(name, ents[0].Object as Hole);
+                                    if (gd?.GroupId?.Object)
+                                    {
+                                        let name = (gd.GroupId.Object as GroupRecord).Name;
+                                        let ents = (gd.GroupId.Object as GroupRecord).Entitys;
+                                        addDrillToMap(name, ents[0].Object as Hole);
+                                    }
+                                    else
+                                    {
+                                        Toaster({ message: `柜名:${b.BoardProcessOption.cabinetName} 板名:${b.Name} 的排钻的编组丢失，统计排钻个数时会丢失该个数!`, timeout: 5000, intent: Intent.DANGER });
+                                    }
                                 }
                             }
                         }