diff --git a/APIServer.exe b/APIServer.exe index c60320f..963ced8 100644 Binary files a/APIServer.exe and b/APIServer.exe differ diff --git a/ews/ews.go b/ews/ews.go index a7cde1c..7ee0068 100644 --- a/ews/ews.go +++ b/ews/ews.go @@ -28,7 +28,6 @@ type UutInfo struct { FirstAck string LastAck string LastChg string - LastTrn string } type DefectInfo struct { @@ -77,7 +76,7 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri } rec := dbo.QueryRow( - fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change,last_transfer + fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change FROM uutinfo WHERE usn='%s';`, params["USN"])) @@ -98,7 +97,6 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri &ui.FirstAck, &ui.LastAck, &ui.LastChg, - &ui.LastTrn, ) //如果在uutinfo表中未查找到此USN的记录, 则新增一条此USN的记录 @@ -317,7 +315,7 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri //Get Last Record last := "" curr, err := dbo.Query( - fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change,last_transfer + fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change FROM uutinfo WHERE %s='%s' ORDER BY usn ASC, seqid ASC;`, params["KEY"], params["VALUE"])) @@ -347,7 +345,6 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri &ul.FirstAck, &ul.LastAck, &ul.LastChg, - &ul.LastTrn, ) if err != nil { break @@ -391,7 +388,7 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri uh := new(UutInfo) bkup := "" prev, err := dbo.Query( - fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change,last_transfer + fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change FROM uutinfobkup WHERE %s='%s' ORDER BY usn ASC, seqid ASC;`, params["KEY"], params["VALUE"])) @@ -421,7 +418,6 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri &uh.FirstAck, &uh.LastAck, &uh.LastChg, - &uh.LastTrn, ) if err != nil { break