tod 查询条件

db/Pln_custorder_ver.go

@@ -126,7 +126,7 @@ func (t *Pln_custorder_ver) SelectOne() (data Pln_custorder_ver, err error) {
 func (t *Pln_custorder_ver) SelectInfo() bool {
 	var data Pln_custorder_ver
 	e := G_DbEngine
-	ok, err := e.Table("pln_custorder_ver").In("parsed",common.EDI_PARSE_NO,common.EDI_PARSE_ERROR).Where("finr = ? and custordernr = ? and version < ?", G_FINR, t.Custordernr, t.Version).Get(&data)
+	ok, err := e.Table("pln_custorder_ver").In("parsed",common.EDI_PARSE_NO,common.EDI_PARSE_ERROR).Where("finr = ? and custordernr = ? and version < ?  and edifiletype = ?", G_FINR, t.Custordernr, t.Version, common.EDI_TOD).Get(&data)
 	if err != nil {
 		return false
 	}

seq/Seqtask.go

@@ -136,13 +136,13 @@ func ParseSeqOrder() {
 			// 读取SEQ的LandingData
 			for j, _ = range seqlandtablst {
 				/* 获取锁 */
-			//LOOP:
-			//	err = etcd.G_jobLock.TryLock("lock")
-			//	if err != nil {
-			//		fmt.Println("seq groutine lock fail!")
-			//		time.Sleep(5 * time.Millisecond)
-			//		goto LOOP
-			//	}
+			LOOP:
+				err = etcd.G_jobLock.TryLock("lock")
+				if err != nil {
+					fmt.Println("seq groutine lock fail!")
+					time.Sleep(5 * time.Millisecond)
+					goto LOOP
+				}
 				fmt.Println("seq groutine lock success!")
 				// 初始化客户订单对象并获取客户订单头，如果不存在则返回
 				cotab = db.Pln_custorder{Projnr: seqlandtablst[j].Projnr, Oemordernr: seqlandtablst[j].Oemordernr, Partfamilyid: seqlandtablst[j].Partfamilyid}

tod/Todtask.go

@@ -200,22 +200,13 @@ func ParseTodCustorderNew() {
 					perInfo.Custordernr = vcovlst[j].Pln_custorder_ver.Custordernr
 					perInfo.Version = vcovlst[j].Pln_custorder_ver.Version
 					res := perInfo.SelectInfo()
-					glog.InfoExtln("tod", "Custordernr", vcovlst[j].Pln_custorder_ver.Custordernr)
-					glog.InfoExtln("tod", "Version", vcovlst[j].Pln_custorder_ver.Version)
-					glog.InfoExtln("tod", "上一版本Version", perInfo.Version)
-					glog.InfoExtln("tod", "result", res)
 					if err != nil {
 						glog.InfoExtln("TOD解析创建生产订单", "err is:", err)
 						return
 					}
 					if res {
-						//添加邮件预警
-						mailsubject = "客户订单上一版本没有解析"
-						mailbody = "项目号: " + todProj.Projectid + "\r\n客户订单号: " + bl_co.Oemordernr + "\r\nErrorinfo : 客户订单上一版本没有解析！"
-						if err = SendTodErrorEmail(projtablst[i], mailsubject, mailbody); err != nil {
-							glog.InfoExtln("发送邮件", "err is :", err)
-						}
-						glog.InfoExtln("tod", "result：", mailsubject)
+						glog.InfoExtln("TOD版本解析", "perInfo.Custordernr:", perInfo.Custordernr)
+						glog.InfoExtln("TOD版本解析", "perInfo.Version:", perInfo.Version)
 						continue
 					}
 				}