|
|
|
@ -469,14 +469,12 @@ export namespace Production
|
|
|
|
|
|
|
|
|
|
let modeling = getModelings([...br.BoardModeling, ...allModeling.modeling, ...curveBoardModeling]).filter(f => f.feeding.length > 0);
|
|
|
|
|
// 拆单值有效的板件勾选取消孔槽加工
|
|
|
|
|
const { partialSplitValueCanTakesEffect, cancelHoleProcessing } = HostApplicationServices.chaidanOption;
|
|
|
|
|
const [L, W, H] = [br.BoardProcessOption.spliteHeight, br.BoardProcessOption.spliteWidth, br.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((HostApplicationServices.chaidanOption.partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
if (((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H)) && cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
if (HostApplicationServices.chaidanOption.cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
modeling.length = 0;
|
|
|
|
|
allModeling.sideModeling.length = 0;
|
|
|
|
|
}
|
|
|
|
|
modeling.length = 0;
|
|
|
|
|
allModeling.sideModeling.length = 0;
|
|
|
|
|
}
|
|
|
|
|
return { modeling, sideModeling: allModeling.sideModeling };
|
|
|
|
|
}
|
|
|
|
@ -610,12 +608,9 @@ export namespace Production
|
|
|
|
|
const { partialSplitValueCanTakesEffect, cancelHoleProcessing } = HostApplicationServices.chaidanOption;
|
|
|
|
|
// 拆单值有效的板件勾选取消孔槽加工
|
|
|
|
|
const [L, W, H] = [br.BoardProcessOption.spliteHeight, br.BoardProcessOption.spliteWidth, br.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
if (((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H)) && cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
if (cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
let brNormal = br.Normal;
|
|
|
|
|
|
|
|
|
@ -631,10 +626,10 @@ export namespace Production
|
|
|
|
|
for (let [key, driss] of br.DrillList)
|
|
|
|
|
{
|
|
|
|
|
let linkBoard = key.Object as Board;
|
|
|
|
|
const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
if (cancelHoleProcessing && linkBoard !== undefined)
|
|
|
|
|
{
|
|
|
|
|
if (cancelHoleProcessing)
|
|
|
|
|
const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
@ -682,10 +677,10 @@ export namespace Production
|
|
|
|
|
continue;
|
|
|
|
|
let nail = nid.Object as CylinderHole;
|
|
|
|
|
let linkBoard = nail.MId.Object as Board;
|
|
|
|
|
const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
if (cancelHoleProcessing && linkBoard !== undefined)
|
|
|
|
|
{
|
|
|
|
|
if (cancelHoleProcessing)
|
|
|
|
|
const [L, W, H] = [linkBoard.BoardProcessOption.spliteHeight, linkBoard.BoardProcessOption.spliteWidth, linkBoard.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
@ -1339,13 +1334,11 @@ export namespace Production
|
|
|
|
|
{
|
|
|
|
|
let res: I2DModeling[] = [];
|
|
|
|
|
// 拆单值有效的板件勾选取消孔槽加工
|
|
|
|
|
const { partialSplitValueCanTakesEffect, cancelHoleProcessing } = HostApplicationServices.chaidanOption;
|
|
|
|
|
const [L, W, H] = [br.BoardProcessOption.spliteHeight, br.BoardProcessOption.spliteWidth, br.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((HostApplicationServices.chaidanOption.partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
if (((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H)) && cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
if (HostApplicationServices.chaidanOption.cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
let tmtx = MoveMatrix(offset.clone().negate());
|
|
|
|
|
for (let m of br.Modeling2D)
|
|
|
|
@ -1364,13 +1357,11 @@ export namespace Production
|
|
|
|
|
{
|
|
|
|
|
let res: I3DModeling[] = [];
|
|
|
|
|
// 拆单值有效的板件勾选取消孔槽加工
|
|
|
|
|
const { partialSplitValueCanTakesEffect, cancelHoleProcessing } = HostApplicationServices.chaidanOption;
|
|
|
|
|
const [L, W, H] = [br.BoardProcessOption.spliteHeight, br.BoardProcessOption.spliteWidth, br.BoardProcessOption.spliteThickness];
|
|
|
|
|
if ((HostApplicationServices.chaidanOption.partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H))
|
|
|
|
|
if (((partialSplitValueCanTakesEffect && (L || W || H)) || (L && W && H)) && cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
if (HostApplicationServices.chaidanOption.cancelHoleProcessing)
|
|
|
|
|
{
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
for (let m of br.Modeling3D)
|
|
|
|
|
{
|
|
|
|
|