!753 拆单增加开门类型

pull/753/MERGE
cf-erp 5 years ago committed by ChenX
parent ffb582b5dc
commit 688fd158b2

@ -6,7 +6,7 @@ import { Entity } from "../../DatabaseServices/Entity/Entity";
import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude";
import { CoordinateSystem } from "../../Geometry/CoordinateSystem";
import { DrillingFace, IContourData, IDrillingOption, IModelingData, ISpliteOrderData, Production, IMetalsType, ISealingData } from "../../Production/Product";
import { FaceDirection, LinesType } from "../../UI/Store/BoardInterface";
import { FaceDirection, LinesType, BoardOpenDir } from "../../UI/Store/BoardInterface";
import { OrderDataBlock, WaveType, CadType } from "./Models/CadBlock";
import { BasePosition, CadBlockHoles, CadBlockInfo, CadBlockModel, CadBlockModelPoint, CadBlockPoint, FaceType, HoleType } from "./Models/CadBlockInfo";
import { CadBlockBasePosition, CadBlockDrillings, CADDbBoard } from "./Models/CadModel";
@ -47,15 +47,17 @@ export class ErpParseData
block.BoardType = entity.BoardType; // 板类型 0:层板 1:立板 2:背板
block.GoodsID = 0;
//封边
block.SealedUp = this.GetNumberBit(Number(entity.BoardProcessOption.sealedUp), 3); //封边上
block.SealedDown = this.GetNumberBit(Number(entity.BoardProcessOption.sealedDown), 3); //封边下
block.SealedLeft = this.GetNumberBit(Number(entity.BoardProcessOption.sealedLeft), 3); //封边左
block.SealedUp = this.GetNumberBit(Number(entity.BoardProcessOption.sealedUp), 3); //封边上
block.SealedRight = this.GetNumberBit(Number(entity.BoardProcessOption.sealedRight), 3); //封边右
block.Area = this.GetNumberBit(entity.Shape.Area / 1000 / 1000, 3); // 面积
block.Wave = this.GetWave(entity.BoardProcessOption.lines); // 纹路
block.PaiKong = entity.BoardProcessOption.composingFace as number; // 排孔面
block.HoleFace = entity.BoardProcessOption.bigHoleDir as number; //孔面
block.UnRegularPointCount = entity.IsSpecialShape && entity.Shape ? 1 : 0; // 异形数量
block.OpenDoorType = entity.OpenDir;
block.IsDoor = entity.OpenDir !== BoardOpenDir.None;
// //基点坐标
let xVec = new Vector3().setFromMatrixColumn(entity.OCS, 0);
let yVec = new Vector3().setFromMatrixColumn(entity.OCS, 1);

@ -300,9 +300,9 @@ export interface IBoardBatchCurtailOption extends IBaseOption
export enum BoardOpenDir
{
Left = "左开门",
Right = "右开门",
Up = "上开门",
Down = "下开门",
None = "无类型",
Left = 1,
Right = 2,
Up = 3,
Down = 4,
None = 0,
}

Loading…
Cancel
Save