From d968c5e7acd05960ef59fee89e5e69b28d2ae539 Mon Sep 17 00:00:00 2001
From: wyj <157651241@qq.com>
Date: Tue, 25 Jun 2024 13:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9CLDD=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2LDD=E5=85=B3=E9=97=AD=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E7=94=B5=E6=B5=81=E4=B8=BA=E9=9B=B6=E6=A3=80=E6=B5=8B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LaiPuLaser/LaserDevicePhotonics.cpp       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp b/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp
index 6cd174e..4a20b4e 100644
--- a/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp
+++ b/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp
@@ -1486,6 +1486,18 @@ void CLaserDevicePhotonics::OprateLaserLdd(eLaserDeviceType LaserDeviceType,bool
       LogInfo.m_LogMsg = Bool2CStringOnOff(bOpen);
       gLogMgr->WriteLogInfo(LogInfo);
             
+	  CString LaserHead;
+	  if (LaserDeviceType == _LaserDeviceType_MainLaser1)
+	  {
+		  LaserHead = Photonics_LaserHead_00;
+		  m_CurOperateType = _ELaserDeviceOperateType_Ldd1;
+	  }
+	  if (LaserDeviceType == _LaserDeviceType_MainLaser2)
+	  {
+		  LaserHead = Photonics_LaserHead_01;
+		  m_CurOperateType = _ELaserDeviceOperateType_Ldd2;
+	  }
+
       //检查Power 和Enable key
       if(!GetBitState(Photonics_Power))
       {
@@ -1529,15 +1541,6 @@ void CLaserDevicePhotonics::OprateLaserLdd(eLaserDeviceType LaserDeviceType,bool
                  gWarningMgr->OperateAlarmState(OperateAlarmPar);
            }
       }
-      CString LaserHead;
-      if(LaserDeviceType==_LaserDeviceType_MainLaser1)
-      {
-            LaserHead = Photonics_LaserHead_00;
-      }
-      if(LaserDeviceType==_LaserDeviceType_MainLaser2)
-      {
-            LaserHead = Photonics_LaserHead_01;
-      }
       if(bOpen)
       {
               //先打开shutter