파일 정리 및 모델링 수정
This commit is contained in:
@@ -97,10 +97,9 @@ namespace CHN
|
||||
var preInfo = saveData[currentWorknm].completeInfo;
|
||||
var curInfo = data.completeInfo;
|
||||
|
||||
if (!preInfo.ptotm.Equals(curInfo.ptotm) || !preInfo.statusnm.Equals(curInfo.statusnm))
|
||||
if (AlarmInfoCompare(preInfo, curInfo))
|
||||
{
|
||||
preInfo.ptotm = curInfo.ptotm;
|
||||
preInfo.statusnm = curInfo.statusnm;
|
||||
saveData[currentWorknm].completeInfo = curInfo;
|
||||
saveData[currentWorknm].isCheck = false;
|
||||
}
|
||||
}
|
||||
@@ -108,6 +107,22 @@ namespace CHN
|
||||
|
||||
onLoadData?.Invoke(saveData.Values.ToList());
|
||||
}
|
||||
private bool AlarmInfoCompare(CompleteInfo preInfo, CompleteInfo curInfo)
|
||||
{
|
||||
if (!preInfo.progressrate.Equals(curInfo.progressrate))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (!preInfo.ptotm.Equals(curInfo.ptotm))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (!preInfo.statusnm.Equals(curInfo.statusnm))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void CheckCompleteTimeAlarm(CompleteInfo completeInfo, bool isCheck)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user