圣牧：云养牛编码上传调整

http/handle/api/mqtt.go

@@ -272,8 +272,7 @@ func stirPush(c MQTT.Client, pubTopic, date string) {
 	d.times loadShift,
 	d.tempid recipeId,
 	d.templetname recipeName,
-	
-	 f.feedcode ingId,
+	 if( f.backup2 <> '',f.backup2 ,f.feedcode) ingId,
 	d1.fname ingName,
 	12 ingType,
 	f.dry dmPct,
@@ -291,7 +290,7 @@ FROM
 	JOIN feed f ON  f.id = d1.fid  
 	AND f.pastureid = d.pastureid 
 WHERE
-	DATE_FORMAT( d.mydate ,'%Y-%m-%d' ) = ?   and  f.feedcode LIKE '%00000000%' `, date).QueryString()
+	DATE_FORMAT( d.mydate ,'%Y-%m-%d' ) = ?   and  (f.feedcode LIKE '%00000000%'  or  f.backup2 <> ''  )  `, date).QueryString()
 // DATE_FORMAT( d.mydate ,'%Y-%m-%d' ) = ?   and f.sapCode is not null and f.sapCode != '' `, date).QueryString()
 
 	if err != nil {

http/handle/api/scheduled.go

@@ -708,8 +708,8 @@ func (h *ScheduledDown) SyncFeed(pastureid string, feedList []interface{}) {
 			logging.Info("create SnowIds err", err)
 		}
 		insertSql := `insert into feed(id,pastureid,feedcode,fname,fclassid,fclass,dry)VALUES(?,?,?,?,?,?,?) 
-		ON DUPLICATE KEY UPDATE fname = ? ,dry = ? `
-		_, err = tx.SQL(insertSql, ids, pastureid, feedcode, fname, fclassid, fclass, dry, fname, dry).Execute()
+		ON DUPLICATE KEY UPDATE dry = ? `
+		_, err = tx.SQL(insertSql, ids, pastureid, feedcode, fname, fclassid, fclass, dry,  dry).Execute()
 		// fmt.Println(feedcode, fname, fclassid)
 		if err != nil {
 			tx.Rollback()