!1574 拆单板材备注修改，五金增加分类备注，尺寸信息

src/Add-on/Erp/ErpView.tsx

@@ -103,7 +103,8 @@ export class ErpView extends React.Component<ErpViewProp, {}> {
     };
     render()
     {
-        let erpUrl = ErpURL.host.replace(/\/$/, '') + `/?stamp=${new Date().getTime()}#/` + this.props.erpRoute.RouteName;
+        let includes = ErpURL.host.includes('?');
+        let erpUrl = ErpURL.host.replace(/\/$/, '') + `${includes ? '&' : '/?'}stamp=${new Date().getTime()}#/` + this.props.erpRoute.RouteName;
         return (
             <div className={Classes.DIALOG_CONTAINER}>
                 <div className={Classes.DIALOG + " board-config"}>

src/Add-on/Erp/Models/CadBlock.ts

@@ -72,6 +72,7 @@ export class OrderDataBlock
     KaiLiaoWidth: number;
     KaiLiaoHeight: number;
     RemarkExtra: string;
+    AllRemarkList: [string, string][];
 }
 export enum CadType
 {

src/Add-on/Erp/Models/CadObject.ts

@@ -1,5 +1,3 @@
-import { Board } from "../../../DatabaseServices/Entity/Board";
-import { Vector3 } from "three";
 export class OrderDataObject
 {
     ID: number;
@@ -30,7 +28,8 @@ export class OrderDataObject
     ModuleDepth = 0;
     Remark: string;
     GroupKey: string;
-    Size: Vector3;
+    Size: { L: number, W: number, H: number; };
+    RemarkList: [string, string][];
 }
 export class ProcessGroupObject
 {

src/Add-on/Erp/ParseData.ts

@@ -170,10 +170,13 @@ export class ErpParseData
                 block.KaiLiaoHeight = boardData.info.kaiLiaoHeight;
                 let kaiLiaoArray = [boardData.info.kaiLiaoWidth, boardData.info.kaiLiaoHeight];
                 block.CadData = JSON.stringify([pointInfoArray, basepositionArray, cadModelArray, offsetArray, kaiLiaoArray]);
-                let filter = (remark: [string, string]) => { return !remark[0].startsWith('jl-'); };
+                let filter = (remark: [string, string]) => { return !remark[0].startsWith('jl-') && !remark[0].startsWith('$'); };
                 block.RemarkJson = JSON.stringify(this.GetRemark(boardData.info.remarks, filter).map(t => t[1]));
-                let jlFilter = (remark: [string, string]) => { return remark[0].startsWith('jl-'); };
+                //铰链备注处理，后期去掉
+                let jlFilter = (remark: [string, string]) => { return remark[0].startsWith('jl-') || remark[0].startsWith('$'); };
                 block.RemarkExtra = JSON.stringify(this.GetRemark(boardData.info.remarks, jlFilter));
+                //新增板材备注列表
+                block.AllRemarkList = boardData.info.remarks;
                 let boxSize = boxSizeList.get(entity);
                 block.BoxWidth = boxSize.x;
                 block.BoxDepth = boxSize.y;
@@ -792,6 +795,7 @@ export class ErpParseData
                 parts.Units = option.unit;
                 parts.IsComposite = false;
                 parts.Remark = option.comments;
+                parts.RemarkList = t.dataList.slice();
                 partsList.push(parts);
             }
         }

src/Add-on/Erp/ParseParts.ts

@@ -1,10 +1,6 @@
-import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
-import { Polyline } from "../../DatabaseServices/Entity/Polyline";
-import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
+import { ISpliteHardwareData } from '../../Production/Product';
 import { EMetalsType, ICompHardwareOption } from "../../UI/Components/RightPanel/RightPanelInterface";
 import { OrderDataObject } from "./Models/CadObject";
-import { ISpliteHardwareData } from '../../Production/Product';
-
 export function parseParts(spliteData: ISpliteHardwareData, list: OrderDataObject[], parent: OrderDataObject = null)
 {
     let info = spliteData.metalsOption as ICompHardwareOption;
@@ -15,7 +11,7 @@ export function parseParts(spliteData: ISpliteHardwareData, list: OrderDataObjec
     parts.Brand = info.brand;
     parts.Factory = info.factory;
     parts.Remark = info.comments;
-    parts.Size = spliteData.size;
+    parts.Size = { L: spliteData.size.x, W: spliteData.size.y, H: spliteData.size.z };
     let specList: string[] = [];
     if (info.spec && info.spec.length > 0)
     {
@@ -52,6 +48,7 @@ export function parseParts(spliteData: ISpliteHardwareData, list: OrderDataObjec
         parts.BoxName = parent.BoxName;
     }
     parts.IsComposite = info.type === EMetalsType.Comp ? true : false;
+    parts.RemarkList = spliteData.dataList.slice();
     parts.Name = info.name || '未命名';
     parts.ObjectType = info.name;
     parts.Num = Number(info.count || 0);