From 595d07d8f595548a2eb7786f8a644a18d063773f Mon Sep 17 00:00:00 2001
From: wyj <157651241@qq.com>
Date: Tue, 25 Jun 2024 13:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=82=B9=E6=A3=80=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=BC=80LDD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaiPuLaser/LaiPuLaser/CommonFlowMgr.cpp | 23 +++++++++++++++++++++--
 LaiPuLaser/LaiPuLaser/CommonFlowMgr.h   |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/LaiPuLaser/LaiPuLaser/CommonFlowMgr.cpp b/LaiPuLaser/LaiPuLaser/CommonFlowMgr.cpp
index 13d4a8b..c3e393b 100644
--- a/LaiPuLaser/LaiPuLaser/CommonFlowMgr.cpp
+++ b/LaiPuLaser/LaiPuLaser/CommonFlowMgr.cpp
@@ -1822,7 +1822,7 @@ void CCommonFlowMgr::InsertMoveRetListExt(CListCtrl &List,int Line,int Idx,CMove
 #endif
 #if 1
 //创建点检准备cmd
-void CCommonFlowMgr::CreatPowCheckPrepareCmd(CWorkCmdInvoker  &WorkCmdInvoker)
+void CCommonFlowMgr::CreatPowCheckPrepareCmd(CWorkCmdInvoker  &WorkCmdInvoker, eLaserDeviceType PowCheckType)
 {
       CMotor &MotorZ = *(CMotor::GetMotor(MOTOR_Z));
       //关闭光闸
@@ -1833,6 +1833,25 @@ void CCommonFlowMgr::CreatPowCheckPrepareCmd(CWorkCmdInvoker  &WorkCmdInvoker)
             pCmd->SetBoolParVal(bCLOSE);
             WorkCmdInvoker.AddCmd(pCmd);
       }
+	  //检查LDD 状态
+	  if (gDeviceStateMgr->QueryUsedFunc(_EUsedFunc_LaserDeviceCtrl))
+	  {
+		  eFlowCheckType FlowCheckType = _FlowCheck_Null;
+		  if (_LaserDeviceType_MainLaser1 == PowCheckType)
+		  {
+			  FlowCheckType = _FlowCheck_Laser1LDD;
+		  }
+		  else if (_LaserDeviceType_MainLaser2 == PowCheckType)
+		  {
+			  FlowCheckType = _FlowCheck_Laser2LDD;
+		  }
+		  CWorkCmdExcuteAction *pCmd = new CWorkCmdExcuteAction();
+		  CExcuteActionPar ActionPar;
+		  ActionPar.m_ExcuteAction = _ExcuteAction_FlowCheck;
+		  ActionPar.AddFlowCheck(FlowCheckType);
+		  pCmd->SetExcuteActionPar(ActionPar);
+		  WorkCmdInvoker.AddCmd(pCmd);
+	  }
       if(gDeviceStateMgr->QueryUsedFunc(_EUsedFunc_RotatoDimmer))
       {
             //衰减器1旋转到0 (Home)
@@ -1948,7 +1967,7 @@ bool CCommonFlowMgr::LaserPowCheckFlow(bool bWaitcooling)
            }
       }
       //创建点检准备cmd
-      CreatPowCheckPrepareCmd(WorkCmdInvoker);
+      CreatPowCheckPrepareCmd(WorkCmdInvoker, CurPowCheckType);
 
       CSetMainLaserPar CurLaserPar;
       CurLaserPar.m_Laser1_PRF = CurPowCheckPar.m_PulseFre;//点检的激光频率
diff --git a/LaiPuLaser/LaiPuLaser/CommonFlowMgr.h b/LaiPuLaser/LaiPuLaser/CommonFlowMgr.h
index 330b28a..09b63ce 100644
--- a/LaiPuLaser/LaiPuLaser/CommonFlowMgr.h
+++ b/LaiPuLaser/LaiPuLaser/CommonFlowMgr.h
@@ -221,7 +221,7 @@ private:
       bool CheckLaserSpotData();
       void DrawTestLineVec(CDC* pDC);
       void CreatAutoFindFocusInvokerCmd(CWorkCmdInvoker &WorkCmdInvoker,bool bToLaserFocus);
-      void CreatPowCheckPrepareCmd(CWorkCmdInvoker  &CmdInvoker);
+      void CreatPowCheckPrepareCmd(CWorkCmdInvoker  &CmdInvoker, eLaserDeviceType PowCheckType);
       void CreatLaserBeamFlowCmd(CWorkCmdInvoker  &CmdInvoker,CWafer *pWafer,bool bEdiCheckCmd);
       void AutomationWorkJobFlow();
       void AutomationWorkJobFlow_CJob(CControlJob &ControlJob);