From 39bc7354e4e70cfb00b21c39ab1ec3cd983ef93b Mon Sep 17 00:00:00 2001 From: bestlqiang Date: Mon, 1 Feb 2021 11:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=96=99=E7=BA=BF=E7=A8=8B,=E4=B8=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaiPuLaser/LaiPuLaser.rc | Bin 136852 -> 136908 bytes LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp | 11 ++++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/LaiPuLaser/LaiPuLaser.rc b/LaiPuLaser/LaiPuLaser.rc index 00943a3823edfc70b0f3aabede3f10f63528dff6..a56407d719a87b1fafff9b49fd372e086800fbc1 100644 GIT binary patch delta 51 zcmbQTmgCG?j)pCaM{1@E88K>1zSpWWy`_;+ZMt4FBinYlT1E>NxWsm#guqk){^1gP delta 36 pcmX@JmSf6Vj)pCaM{1^}G3ssSt7S}K0kNh7S!&xKH8Q@M0ssox4kG{n diff --git a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp index fa29bf8..f62e7f3 100644 --- a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp +++ b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp @@ -125,12 +125,12 @@ void CTrackWorkFlow::WorkFlowCtrl() if (m_CurWorkStep == m_OldWorkStep)//无变化 continue; - //进入下料函数,设置 步骤为_ETrack_Step_Unload时,不执行 + /*//进入下料函数,设置 步骤为_ETrack_Step_Unload时,不执行 if (m_OldWorkStep == _ETrack_Step_Throw_Edge_End&&m_CurWorkStep == _ETrack_Step_Unload) { m_OldWorkStep = m_CurWorkStep;//记录当前步骤 continue; - } + }*/ if (m_OldWorkStep == _ETrack_Step_Unload)//unload 结束步骤时 { @@ -140,7 +140,12 @@ void CTrackWorkFlow::WorkFlowCtrl() } m_OldWorkStep = m_CurWorkStep;//记录当前步骤 //在新线程中执行 - m_pthread=AfxBeginThread(ExecuteStepThread, this); + if (m_CurWorkStep== _ETrack_Step_Throw_Edge_End) + m_pthread = AfxBeginThread(ExecuteStepThread, this); //m_pthread只记录下料 + else + AfxBeginThread(ExecuteStepThread, this); + + } } //执行当前步骤