!2839 优化:有拆单尺寸板件不支持绘制侧面造型,避免拆单错误

src/Production/Product.ts

@@ -477,7 +477,12 @@ export namespace Production
         let sideModel: IOriginSideModelingData[] = [];
         let sideHole: IDrillingOption[] = [];
 
-        if (!br.SideModelingMap.size) return { sideModel, sideHole };
+        let hasSplitSize = (br.BoardProcessOption[EBoardKeyList.SpliteHeight]
+            || br.BoardProcessOption[EBoardKeyList.SpliteWidth]
+            || br.BoardProcessOption[EBoardKeyList.SpliteThickness]
+        );
+        //跳过有拆单尺寸板件 避免拆单错误
+        if (!br.SideModelingMap.size || hasSplitSize) return { sideModel, sideHole };
 
         const tool = FeedingToolPath.GetInstance();
         let faces = new ParseBoardSideFace(br);

src/UI/Components/Board/BoardConfigModal.tsx

@@ -1185,14 +1185,16 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>
     //编辑侧面造型
     private EditorSideModeling = async () =>
     {
+        //跳过有拆单尺寸板件 避免拆单错误
         let br = this.props.br;
-        if ((br.BoardProcessOption.spliteHeight ||
+        if (
             br.BoardProcessOption.spliteHeight ||
-            br.BoardProcessOption.spliteHeight) && !br.IsRect
+            br.BoardProcessOption.spliteThickness ||
+            br.BoardProcessOption.spliteWidth
         )
         {
             AppToaster.show({
-                message: "板件有拆单值且是异形板不支持绘制侧面造型！",
+                message: "板件有拆单尺寸不支持绘制侧面造型！",
                 timeout: 5000,
                 intent: Intent.WARNING,
             });

src/UI/Components/Board/CommonBoardOption.tsx

@@ -388,7 +388,6 @@ export function AddCommonBoardProps(Com: React.ComponentType<ICommonOptionProps>
                         board.ClearBoardModeling();
                         board.ClearLayerNails();
                         board.ClearRelevance();
-                        board.ClearSideModeling();
                     }
                 }
                 else
@@ -401,11 +400,14 @@ export function AddCommonBoardProps(Com: React.ComponentType<ICommonOptionProps>
                             board.ClearBoardModeling();
                             board.ClearLayerNails();
                             board.ClearRelevance();
-                            board.ClearSideModeling();
                         }
                     }
                 }
 
+                //有拆单尺寸都清除侧面造型
+                if (board.BoardProcessOption.spliteHeight || board.BoardProcessOption.spliteWidth || board.BoardProcessOption.spliteThickness)
+                    board.ClearSideModeling();
+
                 app.Editor.ModalManage.Destory();
 
                 board.AutoUpdate = oldAutoUpdate;