更新版本

types/Common/BoardUtils.d.ts

@@ -0,0 +1,46 @@
+import { Matrix4, Vector3 } from "three";
+import { Board, ObjectIdArr } from "../DatabaseServices/Entity/Board";
+import { Entity } from "../DatabaseServices/Entity/Entity";
+import { ExtrudeContourCurve } from "../DatabaseServices/Entity/Extrude";
+import { HardwareCompositeEntity } from "../DatabaseServices/Hardware/HardwareCompositeEntity";
+import { ObjectId } from "../DatabaseServices/ObjectId";
+export declare function ParseNewBr2OldBr_EdgeMap(newBr: Board, oldBr: Board, oldBrOcsInv: Matrix4): number[];
+/**
+ * 获取切割后的板，在原始轮廓坐标系上的新轮廓
+ * @param {Board} oriBr 原始板
+ * @param {Board[]} cutBrs 切割后的板
+ * @return {*}  {Map<Board, ExtrudeContourCurve>}  key = 切割后板，value = 切割后板在原始板上的轮廓
+ */
+export declare function GetCutBrsConInOriBrConCoordSys(oriBr: Board, cutBrs: Board[]): Map<Board, ExtrudeContourCurve>;
+/**
+ * 在板轮廓上的，实体中心点
+ * @param {Board} br 板
+ * @param {ObjectId[][]} ens 实体ID集合
+ * @return {*}  {Map<ObjectIdArr, Vector3>} Map<实体，实体的中心点在板轮廓上的位置>
+ */
+export declare function GetEnsCenPtInBrCon(br: Board, ens: ObjectId[][]): Map<ObjectIdArr, Vector3>;
+/**
+ * 把圆弧板上的实体， 转换到圆弧板对应的平板上
+ * 思路：在SweepPath原始坐标系下，把SweepPath沿着x轴拉直，并把实体放到对应位置
+ * @param {Board} br 圆弧板
+ * @param {Entity[]} ens 实体
+ * @return {*}
+ */
+export declare function MoveEntityToFlatBoard(br: Board, ens: Entity[]): Entity[];
+/**
+ * 分配关联五金给新板
+ * @param {ObjectId<HardwareCompositeEntity>} hwdObjId 五金id
+ * @param {Board} oldBr 旧版
+ * @param {Board} newBr 新板
+ */
+export declare function AllocateRelHardwareToBr(hwdObjId: ObjectId<HardwareCompositeEntity>, oldBr: Board, newBr: Board): boolean;
+/**
+ * 分配实体对象给切割后的板材
+ * @param {Board} oriBr 原始板
+ * @param {Board[]} cutBrs 切割后的板
+ * @param {ObjectId[][]} objIds 和板关联的实体对象id
+ * @param {Map<Board, ExtrudeContourCurve>} curtBrsOriCon 切割后的板轮廓在原始板上的位置
+ * @return {*}  {Map<Board, ObjectId[]>} Map<板，关联的实体对象id>
+ */
+export declare function AllocateEnsToCutBrs(oriBr: Board, cutBrs: Board[], objIds: ObjectId[][], curtBrsOriCon: Map<Board, ExtrudeContourCurve>): Map<Board, ObjectId[]>;
+//# sourceMappingURL=BoardUtils.d.ts.map

types/Common/BoardUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BoardUtils.d.ts","sourceRoot":"","sources":["../../../src/Common/BoardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAKxD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,EAAE,CAoBnG;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAoC7G;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CA+B1F;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,YAwD7D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,WAkB9G;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,KAAK,EAAE,mBAAmB,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CA6E/J"}

types/Common/ColorPalette.d.ts

@@ -1,5 +1,6 @@
 import { Color, LineBasicMaterial, LineDashedMaterial, MeshBasicMaterial, ShaderMaterial, Side } from 'three';
 import { LineMaterial } from 'three/examples/jsm/lines/LineMaterial';
+import { LineType } from '../DatabaseServices/Entity/LineType';
 export declare const ColorPalette: number[][];
 export declare const LINE_WIDTH = 2;
 export declare class ColorMaterial {
@@ -7,7 +8,7 @@ export declare class ColorMaterial {
     private static _LineMaterialMap;
     private static _BasicMaterialMap;
     static UseLogBuf: boolean;
-    static GetLineMaterial(color: number, freeze?: boolean): LineBasicMaterial;
+    static GetLineMaterial(color: number, freeze?: boolean, lineType?: LineType): LineBasicMaterial;
     private static _WallLineMtlMap;
     static GetWallLineMtl(color: number): LineDashedMaterial;
     static GetBasicMaterial(color: number): MeshBasicMaterial;
@@ -36,6 +37,8 @@ export declare class ColorMaterial {
     static RubberBandMaterial: LineDashedMaterial;
     static SnapAxisMaterial: LineDashedMaterial;
     static PrintLineMatrial: LineMaterial;
+    private static _PrintLineMatrialMap;
+    static GetPrintLineMaterial(color: number): LineMaterial;
     static GrayTransparentMeshMaterial: MeshBasicMaterial;
     static TransparentLineMaterial: MeshBasicMaterial;
 }

types/Common/ColorPalette.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColorPalette.d.ts","sourceRoot":"","sources":["../../../src/Common/ColorPalette.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAyB,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,cAAc,EAAE,IAAI,EAAoB,MAAM,OAAO,CAAC;AACvJ,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAIrE,eAAO,MAAM,YAAY,YAwQxB,CAAC;AAEF,eAAO,MAAM,UAAU,IAAI,CAAC;AAG5B,qBAAa,aAAa;IAEtB,OAAO;IACP,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAwC;IACvE,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAwC;IACxE,MAAM,CAAC,SAAS,UAAS;IACzB,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,iBAAiB;IAUxE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAyC;IACvE,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB;IAYxD,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB;IASzD,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAwC;IAClF,MAAM,CAAC,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,MAAU,GAAG,iBAAiB;IAUxF,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAA0C;IAC5E,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,IAAgB,EAAE,iBAAiB,UAAQ;IAqB7F,OAAO,CAAC,MAAM,CAAC,8BAA8B,CAA0C;IACvF,MAAM,CAAC,gCAAgC,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,IAAgB;IAiB7E,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO;IAKlD,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAiB;IACxD,MAAM,CAAC,0BAA0B;IAiBjC,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAA6C;IACxF,MAAM,CAAC,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAUjE,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAA6C;IACzF,MAAM,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAUlE,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAU7B,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAe;IACrD,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAoB;IAC/D,MAAM,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IA0BvE,MAAM,CAAC,4BAA4B;IAenC,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAe;IACpD,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAoB;IAC9D,MAAM,CAAC,wBAAwB,CAAC,SAAS,GAAE,MAAU;IAwBrD,MAAM,CAAC,2BAA2B;IAiBlC,MAAM,CAAC,kBAAkB,qBAItB;IAGH,MAAM,CAAC,gBAAgB,qBAIpB;IAGH,MAAM,CAAC,gBAAgB,eAMpB;IAGH,MAAM,CAAC,2BAA2B,oBAI/B;IAEH,MAAM,CAAC,uBAAuB,oBAG3B;CACN"}
+{"version":3,"file":"ColorPalette.d.ts","sourceRoot":"","sources":["../../../src/Common/ColorPalette.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAyB,iBAAiB,EAAsE,kBAAkB,EAAE,iBAAiB,EAAE,cAAc,EAAE,IAAI,EAAoB,MAAM,OAAO,CAAC;AAC3N,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAG/D,eAAO,MAAM,YAAY,YAwQxB,CAAC;AAEF,eAAO,MAAM,UAAU,IAAI,CAAC;AAG5B,qBAAa,aAAa;IAEtB,OAAO;IACP,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAwC;IACvE,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAwC;IACxE,MAAM,CAAC,SAAS,UAAS;IAEzB,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,EAAE,QAAQ,WAAsB,GAAG,iBAAiB;IA8FxG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAyC;IACvE,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB;IAYxD,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB;IASzD,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAwC;IAClF,MAAM,CAAC,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,MAAU,GAAG,iBAAiB;IAUxF,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAA0C;IAC5E,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,IAAgB,EAAE,iBAAiB,UAAQ;IAqB7F,OAAO,CAAC,MAAM,CAAC,8BAA8B,CAA0C;IACvF,MAAM,CAAC,gCAAgC,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,IAAgB;IAiB7E,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO;IAKlD,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAiB;IACxD,MAAM,CAAC,0BAA0B;IAiBjC,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAA6C;IACxF,MAAM,CAAC,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAUjE,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAA6C;IACzF,MAAM,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAUlE,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAU7B,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAe;IACrD,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAoB;IAC/D,MAAM,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IA0BvE,MAAM,CAAC,4BAA4B;IAenC,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAe;IACpD,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAoB;IAC9D,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,MAAM;IAwBlD,MAAM,CAAC,2BAA2B;IAiBlC,MAAM,CAAC,kBAAkB,qBAItB;IAGH,MAAM,CAAC,gBAAgB,qBAIpB;IAGH,MAAM,CAAC,gBAAgB,eAMpB;IAEH,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAmC;IAEtE,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAoBxD,MAAM,CAAC,2BAA2B,oBAI/B;IAEH,MAAM,CAAC,uBAAuB,oBAG3B;CACN"}

types/Common/StoreageKeys.d.ts

@@ -19,6 +19,7 @@ export declare enum StoreageKeys {
     Uid = "uid",
     Goods = "Goods_",
     DrillTemp = "drilltemp_",
+    DrillHWTemp = "drillHWtemp_",// 排钻五金模板
     DrillReactor = "drillRreactor",
     kjlConfig = "kjl",
     HistoryWs = "HistoryWs"

types/Common/StoreageKeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StoreageKeys.d.ts","sourceRoot":"","sources":["../../../src/Common/StoreageKeys.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY;IAEpB,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,SAAS,cAAc;IAEvB,aAAa,kBAAkB,CAAC,OAAO;IACvC,UAAU,eAAe,CAAC,OAAO;IACjC,WAAW,gBAAgB,CAAC,MAAM;IAClC,YAAY,iBAAiB,CAAC,MAAM;IAEpC,UAAU,eAAe;IACzB,UAAU,mBAAmB;IAC7B,UAAU,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,cAAc,YAAY;IAC1B,GAAG,QAAQ;IACX,KAAK,WAAW;IAChB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,SAAS,QAAQ;IACjB,SAAS,cAAc;CAC1B"}
+{"version":3,"file":"StoreageKeys.d.ts","sourceRoot":"","sources":["../../../src/Common/StoreageKeys.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY;IAEpB,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,SAAS,cAAc;IAEvB,aAAa,kBAAkB,CAAC,OAAO;IACvC,UAAU,eAAe,CAAC,OAAO;IACjC,WAAW,gBAAgB,CAAC,MAAM;IAClC,YAAY,iBAAiB,CAAC,MAAM;IAEpC,UAAU,eAAe;IACzB,UAAU,mBAAmB;IAC7B,UAAU,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,cAAc,YAAY;IAC1B,GAAG,QAAQ;IACX,KAAK,WAAW;IAChB,SAAS,eAAe;IACxB,WAAW,iBAAiB,CAAE,SAAS;IACvC,YAAY,kBAAkB;IAC9B,SAAS,QAAQ;IACjB,SAAS,cAAc;CAC1B"}