diff --git a/print/MsgHandler.cxx b/print/MsgHandler.cxx index 1cde84f..18013b4 100644 --- a/print/MsgHandler.cxx +++ b/print/MsgHandler.cxx @@ -869,6 +869,55 @@ void MsgHandler::Print1_1(const std::map& msg) m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end()); m_PrintData.insert(m_PrintData.end(), {0x0A}); + std::string GrossTime; + std::string TareTime; + std::string FirstTime; + std::string SecondTime; + std::string FirstDeviceID; + std::string SecondDeviceID; + + it = msg.find("GrossTime"); + if (it != msg.end()) + { + GrossTime = it->second; + } + it = msg.find("TareTime"); + if (it != msg.end()) + { + TareTime = it->second; + } + + if (GrossTime < TareTime) + { + FirstTime = GrossTime; + SecondTime = TareTime; + it = msg.find("GrossDeviceID"); + if (it != msg.end()) + { + FirstDeviceID = it->second; + } + it = msg.find("TareDeviceID"); + if (it != msg.end()) + { + SecondDeviceID = it->second; + } + } + else + { + FirstTime = TareTime; + SecondTime = GrossTime; + it = msg.find("TareDeviceID"); + if (it != msg.end()) + { + FirstDeviceID = it->second; + } + it = msg.find("GrossDeviceID"); + if (it != msg.end()) + { + SecondDeviceID = it->second; + } + } + //====称重类型===================== m_newObj.clear(); m_newObj[0] = ("│"); @@ -892,11 +941,7 @@ void MsgHandler::Print1_1(const std::map& msg) m_newObj[0] = ("│"); m_newObj[26] = (" 汽车衡编号"); m_newObj[168] = ("│"); - it = msg.find("GrossDeviceID"); - if (it != msg.end()) - { - m_newObj[190] = it->second; - } + m_newObj[190] = FirstDeviceID; m_newObj[528] = ("│"); blTemp = BuildStringLine(m_newObj); m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end()); @@ -916,18 +961,15 @@ void MsgHandler::Print1_1(const std::map& msg) m_newObj[0] = ("│"); m_newObj[26] = ("一次称重时间"); m_newObj[168] = ("│"); - it = msg.find("GrossTime"); - if (it != msg.end()) + + // 防伪 + if (check_odd(FirstTime) == true) { - //防伪 - if (check_odd(it->second) == true) - { - m_newObj[196] = it->second; - } - else - { - m_newObj[190] = it->second; - } + m_newObj[196] = FirstTime; + } + else + { + m_newObj[190] = FirstTime; } m_newObj[528] = ("│"); @@ -966,11 +1008,7 @@ void MsgHandler::Print1_1(const std::map& msg) m_newObj[0] = ("│"); m_newObj[26] = (" 汽车衡编号"); m_newObj[168] = ("│"); - it = msg.find("TareDeviceID"); - if (it != msg.end()) - { - m_newObj[190] = it->second; - } + m_newObj[190] = SecondDeviceID; m_newObj[528] = ("│"); blTemp = BuildStringLine(m_newObj); m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end()); @@ -991,18 +1029,14 @@ void MsgHandler::Print1_1(const std::map& msg) m_newObj[26] = ("二次称重时间"); m_newObj[168] = ("│"); - it = msg.find("TareTime"); - if (it != msg.end()) + // 防伪 + if (check_odd(SecondTime) == true) { - //防伪 - if (check_odd(it->second) == true) - { - m_newObj[196] = it->second; - } - else - { - m_newObj[190] = it->second; - } + m_newObj[196] = SecondTime; + } + else + { + m_newObj[190] = SecondTime; } m_newObj[528] = ("│");