!2233 优化:拆单时,板件大孔面检查

pull/2289/MERGE
林三 1 year ago committed by ChenX
parent d25da19eff
commit 22dbd3a753

@ -275,7 +275,7 @@ async function ExecChaiDan(chaiDanRoute: ErpRoutes)
message: `拆单数据校验错误:${check.msg}`,
intent: Intent.DANGER,
timeout: 3000,
});
}, "CD_checkDataError");
return;
}
app.Editor.ModalManage.RenderModal(ErpView, {

@ -16,7 +16,10 @@ import { I2DModeling, I3DContourData, I3DModeling, IDrillingOption, IHardwareTyp
import { EMetalsType } from "../../UI/Components/RightPanel/RightPanelInterface";
import { BoardOpenDir, FaceDirection, ISealingData, LinesType } from "../../UI/Store/BoardInterface";
// import { DownPanelStore } from "../../UI/Store/DownPanelStore";
import { Intent } from "@blueprintjs/core";
import { InteractionLog, LogType } from "../../Common/Log";
import { userConfig } from "../../Editor/UserConfig";
import { AppToaster } from "../../UI/Components/Toaster";
import { GetCountOption, ICountType, lookOverBoardInfosTool } from "../LookOverBoardInfos/LookOverBoardInfosTool";
import { HardwareCompositeEntity } from './../../DatabaseServices/Hardware/HardwareCompositeEntity';
import { ProcessingGroupRecord } from './../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord';
@ -45,6 +48,8 @@ export class ErpParseData
let blockMap: Map<number, number> = new Map();
let blockIndex: number = 0;
let boxSizeList = Production.GetCabSize(boardList);
let holeFaceErrorBoards = new Set<Board>();
const AddTempToMapFunc = (key: string, temp: TemplateRecord) =>
{
let trs = pgMap_template.get(key);
@ -129,6 +134,20 @@ export class ErpParseData
if (!boardData)
return;//返回空数据,提示用户修改,结束拆单
this.UpdateBoardDrillRemark(boardData);
// 大孔面检查
let hasHoleFaceError = false;
if (boardData.holes.sideHoles.length)
for (let hole of boardData.holes.frontBackHoles)
{
if (hole.type === GangDrillType.Pxl && hole.face !== block.HoleFace as number)
{
holeFaceErrorBoards.add(entity);
hasHoleFaceError = true;
break;
}
}
// if (boardData.info.isRect)
// {
//矩形和异形封边
@ -198,6 +217,20 @@ export class ErpParseData
// }
}
// 提示大孔面错误
if (holeFaceErrorBoards.size)
{
AppToaster.show({
message: "部分板件的排钻大孔面异常(排钻的大孔面与板的大孔面相反)!详情见左下角日志!",
timeout: 5000,
intent: Intent.DANGER,
});
for (let board of holeFaceErrorBoards)
{
InteractionLog([{ msg: `板件:${board.Name}`, entity: [board] }, { msg: "大孔面相反!" }], LogType.Error);
}
}
//进度条代码
// down.progress = 1;

Loading…
Cancel
Save