diff --git a/ews/ews.go b/ews/ews.go index 39ed024..88cfe32 100644 --- a/ews/ews.go +++ b/ews/ews.go @@ -210,30 +210,32 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri return rst } - //如果部分客户端参数为空, 则保留uutinfo表中已存在记录的值 + //如果测试项不为空(第一个心跳包), 当部分客户端参数为空, 则保留uutinfo表中已存在记录的值 mac := params["MAC"] - if mac == "" { - mac = ui.MAC - } pn := params["PARTNO"] - if pn == "" { - pn = ui.PartNO - } mo := params["MO"] - if mo == "" { - mo = ui.MfgMO - } sku := params["SKU"] - if sku == "" { - sku = ui.MfgSKU - } line := params["LINE"] - if line == "" { - line = ui.MfgLine - } stage := params["STAGE"] - if stage == "" { - stage = ui.MfgStage + if params["ITEM"] != "" { + if mac == "" { + mac = ui.MAC + } + if pn == "" { + pn = ui.PartNO + } + if mo == "" { + mo = ui.MfgMO + } + if sku == "" { + sku = ui.MfgSKU + } + if line == "" { + line = ui.MfgLine + } + if stage == "" { + stage = ui.MfgStage + } } //如果此USN的记录存在于uutinfo表中, 且此USN的Relay/MAC/Item/Status/Message已变化, 则: