Browse Source

执行转态后添加OP->Moniter

gyj 4 days ago
parent
commit
c0b0015ed8

+ 18 - 18
TIN001-PLC/Jet_Furance_PMC/Jet_Furance_PMC/Jet_Furance_PMC/FurancePMC/RecipeContext.cpp

@@ -77,24 +77,7 @@ int RecipeContext::Moniter()
 	}
 	if (recipeExecuteStatus == recipeExecuteStatusValue::ExecStep)
 	{
-		char jumpRecipeCmd[32];
-		sprintf(jumpRecipeCmd, "%s.Recipe.Command", MODULE_NAME);
-		SC->setStringValue(jumpRecipeCmd, "");
-		OperatorStatus& status = OP->monitor();
-		if (status == OperatorStatusEnum::SUCCESS) {
-			if (status.trigger()) {
-				status.clearTrigger();
-				//TODO:这里是第一次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd 继续判断处理
-			}
-			//TODO:这里是第n次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd继续判断处理
-		}
-		else if (status == OperatorStatusEnum::ALARM) {
-			//TODO:这里发生了ALARM,且alarm condition处理未能挽回
 
-		}
-		else {
-			//TODO:命令执行过程中
-		}
 	}
 
 
@@ -1277,7 +1260,24 @@ void RecipeContext::executeNextStep()
 		recipeExecuteStatus = recipeExecuteStatusValue::ExecStep;
 		//数据上报,本步开始
 
-
+		char jumpRecipeCmd[32];
+		sprintf(jumpRecipeCmd, "%s.Recipe.Command", MODULE_NAME);
+		SC->setStringValue(jumpRecipeCmd, "");
+		OperatorStatus& status = OP->monitor();
+		if (status == OperatorStatusEnum::SUCCESS) {
+			if (status.trigger()) {
+				status.clearTrigger();
+				//TODO:这里是第一次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd 继续判断处理
+			}
+			//TODO:这里是第n次所有命令都检查通过(或alarm condition设置了跳转),但仍需根据step time和jumpRecipeCmd继续判断处理
+		}
+		else if (status == OperatorStatusEnum::ALARM) {
+			//TODO:这里发生了ALARM,且alarm condition处理未能挽回
+			ReportAlarm();
+		}
+		else {
+			//TODO:命令执行过程中
+		}
 
 
 		//	4.刷新计时upateTime(TRUE)

+ 2 - 2
TIN001-PLC/TIN001/PMC.tsproj

@@ -2889,9 +2889,9 @@ External Setpoint Generation:
 			<Licenses>
 				<Target>
 					<ManualSelect>{96ADB134-211A-4863-977F-10E53B30C2D2}</ManualSelect>
-					<ManualSelect>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</ManualSelect>
-					<ManualSelect>{3E823FFB-0BB3-43BA-9023-5952947C15A8}</ManualSelect>
 					<ManualSelect>{AD7F40C3-F160-4413-83E3-6B7656A795A2}</ManualSelect>
+					<ManualSelect>{3E823FFB-0BB3-43BA-9023-5952947C15A8}</ManualSelect>
+					<ManualSelect>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</ManualSelect>
 					<ManualSelect>{19E93A3D-90D1-45B9-A28A-32DD8D2A166A}</ManualSelect>
 					<ManualSelect>{6952449D-F68C-49A2-ADE4-8639D85B33A4}</ManualSelect>
 					<ManualSelect>{A1AF8A04-C08D-4853-A5A0-0E6C3A278A8C}</ManualSelect>

+ 2 - 2
TIN001-PLC/TIN001/PMC.tsproj.bak

@@ -2889,9 +2889,9 @@ External Setpoint Generation:
 			<Licenses>
 				<Target>
 					<ManualSelect>{96ADB134-211A-4863-977F-10E53B30C2D2}</ManualSelect>
-					<ManualSelect>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</ManualSelect>
-					<ManualSelect>{3E823FFB-0BB3-43BA-9023-5952947C15A8}</ManualSelect>
 					<ManualSelect>{AD7F40C3-F160-4413-83E3-6B7656A795A2}</ManualSelect>
+					<ManualSelect>{3E823FFB-0BB3-43BA-9023-5952947C15A8}</ManualSelect>
+					<ManualSelect>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</ManualSelect>
 					<ManualSelect>{19E93A3D-90D1-45B9-A28A-32DD8D2A166A}</ManualSelect>
 					<ManualSelect>{6952449D-F68C-49A2-ADE4-8639D85B33A4}</ManualSelect>
 					<ManualSelect>{A1AF8A04-C08D-4853-A5A0-0E6C3A278A8C}</ManualSelect>

BIN
TIN001-PLC/TIN001/PMC/_CompileInfo/3F581919-8DE5-3414-5B46-74662B58ED84.compileinfo