|
|
|
@ -18,16 +18,16 @@ import { EMetalsType } from "../../UI/Components/RightPanel/RightPanelInterface"
|
|
|
|
|
import { ISealingData } from "../../UI/Store/OptionInterface/IHighSealedItem";
|
|
|
|
|
import { FaceDirection } from "../DrawDrilling/DrillType";
|
|
|
|
|
// import { DownPanelStore } from "../../UI/Store/DownPanelStore";
|
|
|
|
|
import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices";
|
|
|
|
|
import { InteractionLog, LogType } from "../../Common/Log";
|
|
|
|
|
import { Intent, Toaster } from "../../Common/Toaster";
|
|
|
|
|
import { Entity } from "../../DatabaseServices/Entity/Entity";
|
|
|
|
|
import { userConfig } from "../../Editor/UserConfig";
|
|
|
|
|
import { GetCountOption, ICountType, lookOverBoardInfosTool } from "../LookOverBoardInfos/LookOverBoardInfosTool";
|
|
|
|
|
import { HardwareCompositeEntity } from './../../DatabaseServices/Hardware/HardwareCompositeEntity';
|
|
|
|
|
import { ProcessingGroupRecord } from './../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord';
|
|
|
|
|
import { TemplateLatticeRecord } from './../../DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord';
|
|
|
|
|
import { TemplateWineRackRecord } from './../../DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord';
|
|
|
|
|
import { groupBy } from "./ErpCommands";
|
|
|
|
|
import { ErpGroupBy } from "./ErpGroupBy";
|
|
|
|
|
import { GetArray, GetPointInfoArray } from "./Models/ArrayHelper";
|
|
|
|
|
import { CadType, OrderDataBlock, WaveType } from "./Models/CadBlock";
|
|
|
|
|
import { BasePosition, CadBlockHoles, CadBlockInfo, CadBlockModel, CadBlockModelPoint, CadBlockPoint, FaceType, HoleType, ModelOffSetData } from "./Models/CadBlockInfo";
|
|
|
|
@ -769,7 +769,7 @@ export class ErpParseData
|
|
|
|
|
{
|
|
|
|
|
return { roomName: t.BoardProcessOption.roomName || '未命名', boxName: t.BoardProcessOption.cabinetName || '未命名', board: t };
|
|
|
|
|
});
|
|
|
|
|
let groupList = groupBy(list, ['roomName', 'boxName']);
|
|
|
|
|
let groupList = ErpGroupBy(list, ['roomName', 'boxName']);
|
|
|
|
|
let options: GetCountOption = {
|
|
|
|
|
getHoles: (name: string, hole: CylinderHole) =>
|
|
|
|
|
{
|
|
|
|
@ -800,7 +800,7 @@ export class ErpParseData
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
let holeList = holeMap.get(name);
|
|
|
|
|
let groupList = groupBy(holeList.map(t => t.GroupId), ['Index']);
|
|
|
|
|
let groupList = ErpGroupBy(holeList.map(t => t.GroupId), ['Index']);
|
|
|
|
|
for (const g of groupList)
|
|
|
|
|
{
|
|
|
|
|
let spec = '';
|
|
|
|
@ -844,7 +844,7 @@ export class ErpParseData
|
|
|
|
|
specList.push({ spec });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let sGroupList = groupBy(specList, ['spec']);
|
|
|
|
|
let sGroupList = ErpGroupBy(specList, ['spec']);
|
|
|
|
|
return sGroupList.map(t => { return { spec: t.key, count: t.value.length }; });
|
|
|
|
|
};
|
|
|
|
|
for (const g of groupList)
|
|
|
|
@ -885,11 +885,11 @@ export class ErpParseData
|
|
|
|
|
|
|
|
|
|
UpdateBoardDrillRemark(spliteData: ISpliteOrderData)
|
|
|
|
|
{
|
|
|
|
|
if (userConfig.chaidanOption.drillRemark === false) return;
|
|
|
|
|
if (HostApplicationServices.chaidanOption.drillRemark === false) return;
|
|
|
|
|
const fun = (holes: IDrillingOption[], frontOrSide: FrontOrSide) =>
|
|
|
|
|
{
|
|
|
|
|
const holeList = holes.map(t => { return { name: t.type == (GangDrillType.Wood || t.type == GangDrillType.WoodPXL) ? '木销' : t.name, type: t.type, face: t.face }; });
|
|
|
|
|
let groupList = groupBy(holeList, ['name', 'type', 'face']);
|
|
|
|
|
let groupList = ErpGroupBy(holeList, ['name', 'type', 'face']);
|
|
|
|
|
let infos: { name: string, type: string, face: string, count: number; }[] = [];
|
|
|
|
|
for (const g of groupList)
|
|
|
|
|
{
|
|
|
|
|