|
|
@@ -1289,23 +1289,24 @@ namespace FurnaceUI.Client
|
|
|
}
|
|
|
private void SetTubeStatus()
|
|
|
{
|
|
|
- if (SecondPjList != null && SecondPjList.Count > 0 && SecondPjList.FirstOrDefault() != null && ControlJobs != null && ControlJobs.Count > 0)
|
|
|
- {
|
|
|
- var secondPj = SecondPjList.FirstOrDefault();
|
|
|
- var actualPjName = ControlJobs.FirstOrDefault().ProcessJobNameList.FirstOrDefault();
|
|
|
- if (secondPj.Name.Equals(actualPjName) && (int)secondPj.ProcessingState <= (int)EnumProcessingState.Processing)
|
|
|
- {
|
|
|
- NewPM1EntityStatus = "Process";
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- NewPM1EntityStatus = PM1EntityStatus;
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- NewPM1EntityStatus = PM1EntityStatus;
|
|
|
- }
|
|
|
+ NewPM1EntityStatus = PM1EntityStatus;
|
|
|
+ //if (SecondPjList != null && SecondPjList.Count > 0 && SecondPjList.FirstOrDefault() != null && ControlJobs != null && ControlJobs.Count > 0)
|
|
|
+ //{
|
|
|
+ // var secondPj = SecondPjList.FirstOrDefault();
|
|
|
+ // var actualPjName = ControlJobs.FirstOrDefault().ProcessJobNameList.FirstOrDefault();
|
|
|
+ // if (secondPj.Name.Equals(actualPjName) && (int)secondPj.ProcessingState <= (int)EnumProcessingState.Processing)
|
|
|
+ // {
|
|
|
+ // NewPM1EntityStatus = "Process";
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // NewPM1EntityStatus = PM1EntityStatus;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // NewPM1EntityStatus = PM1EntityStatus;
|
|
|
+ //}
|
|
|
|
|
|
}
|
|
|
protected override bool OnTimer()
|