diff --git a/cmd/printer/main.go b/cmd/printer/main.go index f8a5e7f..e181c07 100644 --- a/cmd/printer/main.go +++ b/cmd/printer/main.go @@ -98,6 +98,7 @@ func imain() { connstring := fmt.Sprintf("server=%s;user id=%s;password=%s;database=%s;port=%d;encrypt=disable", conf.Server, conf.User, conf.Password, conf.DbName, conf.Port) + fmt.Println(connstring) if err := db.InitMssqlDb(connstring); err != nil { glog.Infoln("初始化数据库", "InitMssqlDb return fail") return diff --git a/config/config.yaml b/config/config.yaml index 5e24e69..d50199e 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,3 +1,4 @@ +finr: 100 dbtype: mssql server: localhost #server: CCN-MESDB diff --git a/db/Printertab.go b/db/Printertab.go index 5a1650a..0268882 100644 --- a/db/Printertab.go +++ b/db/Printertab.go @@ -118,7 +118,6 @@ func (t *Printertab) GetPrinterList(conf *conf.EnvConfig) ( []Printertab, error ) e := G_DbEngine pt = strings.Split(conf.PrinterType, ",") - err := e.Where("finr = ? and active = ?", conf.Finr, 1).In("printertype",pt).Find(&printertablist) if err != nil{ glog.Infoln("failed to query printertab for type: %s due to: %v", pt, err) diff --git a/service/Asn.go b/service/Asn.go index edbbd44..342604d 100644 --- a/service/Asn.go +++ b/service/Asn.go @@ -91,7 +91,7 @@ func (bt *BL_Tier2ASN) CLoseTier2WorkOrder() (err error) { if strings.TrimSpace(cotab.Wotablst[i].Supplygroupid) != strings.TrimSpace(bl_t2ord.Asnordertab.Supplygroupid) || strings.TrimSpace(cotab.Wotablst[i].Partfamilyid) != strings.TrimSpace(bl_t2ord.Asnordertab.Partfamilyid){ continue } - if cotab.Wotablst[i].Status < common.WO_STATUS_CLOSED && cotab.Wotablst[i].Status >= common.CO_STATUS_RELEASED{ + if cotab.Wotablst[i].Status < common.WO_STATUS_CLOSED && cotab.Wotablst[i].Status >= common.WO_STATUS_RUNNING{ // 验证订单的零件和ASN中的零件是否匹配,不匹配报错返回 for j = 0; j < len(cotab.Wotablst[i].Partlst); j++ { if _, match = bl_t2ord.Itemdict[cotab.Wotablst[i].Partlst[j].Partid]; !match { diff --git a/service/Snrtab.go b/service/Snrtab.go index 463e613..badd340 100644 --- a/service/Snrtab.go +++ b/service/Snrtab.go @@ -1,12 +1,10 @@ package service import ( - "fmt" "github.com/go-xorm/xorm" "leit.com/leit_seat_aps/common" "leit.com/leit_seat_aps/db" "leit.com/leit_seat_aps/etcd" - "leit.com/leit_seat_aps/glog" "strconv" "strings" "time" @@ -183,8 +181,6 @@ func SN_GetNextSnrBySession(snr string, session *xorm.Session) (retsnr string, e nextsnr = snrtab.Nextnr } } - glog.InfoExtln("流水号","nextsnr",nextsnr) - glog.InfoExtln("流水号","snrtab.Length",snrtab.Length) // 组合返回值 layout = []byte(snrtab.Identifierlayout) for i = 0; i < len(layout); i++ { @@ -233,8 +229,7 @@ func SN_SyncGetNextSnr(snr string) (retsnr string, err error) { LOOPSNR: err = etcd.Snr_jobLock.TryLock("msgid") if err != nil { - fmt.Println("msgid groutine lock fail!") - time.Sleep(5 * time.Millisecond) + time.Sleep(1 * time.Millisecond) goto LOOPSNR } var ( @@ -301,8 +296,6 @@ LOOPSNR: nextsnr = snrtab.Nextnr } } - glog.InfoExtln("流水号","nextsnr",nextsnr) - glog.InfoExtln("流水号","snrtab.Length",snrtab.Length) // 组合返回值 layout = []byte(snrtab.Identifierlayout) for i = 0; i < len(layout); i++ {