FIX:Fixed HMS issue

jira:[STUDIO-6344 STUDIO-6310 STUDIO-6356  STUDIO-6348]

Change-Id: I9d6660e7c349775004b69bfe41b651bfa8b359b7
This commit is contained in:
tao wang 2024-03-02 16:36:58 +08:00 committed by Lane.Wei
parent d6db3415bf
commit 8cf5061fec
2 changed files with 10 additions and 5 deletions

View File

@ -225,9 +225,9 @@ void HMSPanel::update(MachineObject *obj)
} }
} }
for (auto thms : temp_hms_list) { for (auto it = temp_hms_list.begin(); it != temp_hms_list.end(); ) {
auto key = thms.second.get_long_error_code(); auto key = it->second.get_long_error_code();
auto inr = false; bool inr = false;
for (auto hms : obj->hms_list) { for (auto hms : obj->hms_list) {
if (hms.get_long_error_code() == key) { if (hms.get_long_error_code() == key) {
inr = true; inr = true;
@ -236,7 +236,10 @@ void HMSPanel::update(MachineObject *obj)
} }
if (!inr) { if (!inr) {
temp_hms_list.erase(key); it = temp_hms_list.erase(it);
}
else {
++it;
} }
} }

View File

@ -391,6 +391,8 @@ void MonitorPanel::update_all()
if (!obj) { if (!obj) {
show_status((int)MONITOR_NO_PRINTER); show_status((int)MONITOR_NO_PRINTER);
m_hms_panel->clear_hms_tag();
m_tabpanel->GetBtnsListCtrl()->showNewTag(3, false);
return; return;
} }
@ -416,7 +418,7 @@ void MonitorPanel::update_all()
m_status_info_panel->update(obj); m_status_info_panel->update(obj);
} }
if (m_hms_panel->IsShown() || obj->hms_list.size() > 0) { if (m_hms_panel->IsShown() || (obj->hms_list.size() != m_hms_panel->temp_hms_list.size())) {
m_hms_panel->update(obj); m_hms_panel->update(obj);
} }