From 60229b39f1aed623b5a0b39f360d5cb6a14ad8c4 Mon Sep 17 00:00:00 2001
From: bestlqiang <bestlqiang@163.com>
Date: Tue, 30 Mar 2021 15:17:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E6=A0=87=E6=95=B0=E6=8D=AE=E8=B6=85?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=8A=A5=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaiPuLaser/CommonFlowMgr.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/LaiPuLaser/CommonFlowMgr.cpp b/LaiPuLaser/CommonFlowMgr.cpp
index 8be1891..b9a03a2 100644
--- a/LaiPuLaser/CommonFlowMgr.cpp
+++ b/LaiPuLaser/CommonFlowMgr.cpp
@@ -1075,10 +1075,20 @@ void CCommonFlowMgr::MoveToFirstArea()
 //大幅面拼接打标(平台移动,振镜拼接,数据为obj 对象) (bSel ==true 的时候为选择打标)
 bool CCommonFlowMgr::MultipleAreaMark(CProduct &Product, bool bSel)
 {
-	gLogMgr->WriteDebugLog("Fuc---->MultipleAreaMark : bSel = " + Bool2Str(bSel));
+	gLogMgr->WriteDebugLog("Fuc---->MultipleAreaMa/rk : bSel = " + Bool2Str(bSel));
 
 	//搜集加工数据(这里比较耗费时间)
-	gMarkAreaMgr->CollectWorkData(bSel, Product);
+	try
+	{
+		gMarkAreaMgr->CollectWorkData(bSel, Product);
+	}
+	catch (CExceptionMsg msg)
+	{
+		AfxMessageBox(msg.GetMsgStr());
+		gServer->BroadCast("副机收集数据异常!Exception! ");
+		return false;
+	}
+	
 	if (!gMarkAreaMgr->HasWorkData())
 		return false;