|
|
@ -429,7 +429,7 @@ export class ErpParseData
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//获取侧面造型数据
|
|
|
|
//获取侧面造型数据
|
|
|
|
GetSideModelDetail(DataArray: IOriginSideModelingData[]): CadBlockModel[]
|
|
|
|
GetSideModelDetail(DataArray: IOriginSideModelingData[], isRect: boolean, add: number): CadBlockModel[]
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (DataArray == null) return [];
|
|
|
|
if (DataArray == null) return [];
|
|
|
|
let sideModelList: CadBlockModel[] = [];
|
|
|
|
let sideModelList: CadBlockModel[] = [];
|
|
|
@ -439,9 +439,15 @@ export class ErpParseData
|
|
|
|
if (DataArray[i].outline)
|
|
|
|
if (DataArray[i].outline)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
let newModel = new CadBlockModel();
|
|
|
|
let newModel = new CadBlockModel();
|
|
|
|
|
|
|
|
let face = DataArray[i].dir;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//保持与排钻孔对应 修正到从自身坐标系原点开始计算
|
|
|
|
|
|
|
|
if (isRect)
|
|
|
|
|
|
|
|
face = (face + add) % 4;
|
|
|
|
|
|
|
|
|
|
|
|
newModel.ModelID = modelID;
|
|
|
|
newModel.ModelID = modelID;
|
|
|
|
newModel.LineID = 1;
|
|
|
|
newModel.LineID = 1;
|
|
|
|
newModel.Face = DataArray[i].dir;
|
|
|
|
newModel.Face = face;
|
|
|
|
newModel.KnifeName = "";
|
|
|
|
newModel.KnifeName = "";
|
|
|
|
newModel.ChaiDanName = DataArray[i].chaiDanName;
|
|
|
|
newModel.ChaiDanName = DataArray[i].chaiDanName;
|
|
|
|
newModel.KnifeRadius = DataArray[i].knifeRadius;
|
|
|
|
newModel.KnifeRadius = DataArray[i].knifeRadius;
|
|
|
@ -679,7 +685,7 @@ export class ErpParseData
|
|
|
|
frontModelDetail.push(...this.GetOffSetModelDetail(board.modeling2D, maxID));
|
|
|
|
frontModelDetail.push(...this.GetOffSetModelDetail(board.modeling2D, maxID));
|
|
|
|
maxID = frontModelDetail.length + 1;
|
|
|
|
maxID = frontModelDetail.length + 1;
|
|
|
|
frontModelDetail.push(...this.Get3DModelDetail(board.modeling3D, maxID));
|
|
|
|
frontModelDetail.push(...this.Get3DModelDetail(board.modeling3D, maxID));
|
|
|
|
let sideModelDetail = this.GetSideModelDetail(board.sideModeling);
|
|
|
|
let sideModelDetail = this.GetSideModelDetail(board.sideModeling, board.info.isRect, add);
|
|
|
|
let frontHoleDetail = this.GetHolesDetail(board.holes.frontBackHoles, FrontOrSide.正面反面);
|
|
|
|
let frontHoleDetail = this.GetHolesDetail(board.holes.frontBackHoles, FrontOrSide.正面反面);
|
|
|
|
let sideHoleDetail = this.GetHolesDetail(board.holes.sideHoles, FrontOrSide.侧面, board.info.isRect, add);
|
|
|
|
let sideHoleDetail = this.GetHolesDetail(board.holes.sideHoles, FrontOrSide.侧面, board.info.isRect, add);
|
|
|
|
let result = new CadBlockInfo();
|
|
|
|
let result = new CadBlockInfo();
|
|
|
|