|
|
|
@ -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 });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|