切换分支

conf/app.ini

@@ -50,8 +50,8 @@ Type = mysql
 User = root
 Password = root
 #Host = 8.130.17.8:3306
-Host = 192.168.1.93:3326
-#Host = 127.0.0.1:3316
+#Host = 192.168.1.93:3326
+Host = 127.0.0.1:3316
 #Name = haiyuan
 #Password = root
 #Password = root
@@ -75,7 +75,7 @@ Host = 192.168.1.93:3326
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tmrwatch5
+Name = tmrwatch2
 TablePrefix =
 
 ShowXormlog = false

http/handle/api/grfdApi.go

@@ -520,9 +520,10 @@ func GetFormula(pastureid string) error {
 						" (select id from feed where pastureid=? and backup1=? limit 1),?,?,?,(if(?='',0,?)),?,?) ",
 						ids, pastureid, pastureid, ftName, pastureid, fId, fName, fodderWeight, mixNo, autosecond, autosecond, autosecond, fName)
 					if err != nil {
+						logging.Info("3333333333", err)
 						return err
 					}
-					_, err = tx.Exec("call updateFPbyFTChange((select id from feedtemplet where pastureid=? and tname=? limit 1),?,(select fttypeid from feedtemplet where pastureid=? and tname=? limit 1))", pastureid, ftName, pastureid, pastureid, ftName)
+					_, err = tx.Exec("call updateFPbyFTChange((select id from feedtemplet where pastureid=? and tname=? limit 1),?,(select fttypeid from feedtemplet where pastureid=? and tname=? limit 1),1)", pastureid, ftName, pastureid, pastureid, ftName)
 					if err != nil {
 						return err
 					}
@@ -555,13 +556,14 @@ func AddOtherDevice() {
 	}()
 
 	queryIdList, err1 := tx.SQL(`SELECT d.pid +UNIX_TIMESTAMP(d.mydate) id,d.pid did,d.projname projName ,DATE_FORMAT(d.mydate,'%Y-%m-%d') mydate 
-		FROM downloadedplan d 
-		WHERE   (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') ) 
-		AND d.isuse=0 
-		AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid')
-		AND (SELECT COUNT(*) FROM downloadplandtl1 d1 WHERE  d.id=d1.PID AND d.pastureid=d1.pastureid  AND  d1.type = 0)>0
-		AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND  downloadedplan.lpplantype=1 and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
-		GROUP BY d.pid +UNIX_TIMESTAMP(d.mydate)`).Query().List()
+	FROM downloadedplan d 
+	WHERE   (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')) 
+	AND d.isuse=0 
+	AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid')
+	AND (SELECT COUNT(*) FROM downloadplandtl1 d1 WHERE  d.id=d1.PID AND d.pastureid=d1.pastureid  AND  d1.type = 0)>0
+	AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND    lpplantype in(0,1,5)  and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+	and d.lpplantype in(0,1,5)  and d.iscompleted = 1
+	GROUP BY d.pid +UNIX_TIMESTAMP(d.mydate)`).Query().List()
 
 	queryDataList, err2 := tx.SQL(`SELECT  d.pid +UNIX_TIMESTAMP(d.mydate) id,d.projname projName,ROUND(d.lweight,2) lWeight,DATE_FORMAT(d.mydate,'%Y-%m-%d') AS loadDate,d.SORT AS tmrNo,d.Times AS times,ft.backup1 AS ftId,d.templetName  AS ftName,f.backup1 AS fId,
 		 de.Fname AS fName,fc.FCNAME AS feedclassName,de.SORT AS sort,de.feedallowratio AS allowableError, 
@@ -570,10 +572,11 @@ func AddOtherDevice() {
 		 FROM downloadedplan d  JOIN downloadplandtl1 de ON d.id=de.PID AND d.pastureid=de.pastureid  AND de.type = 0
 		 LEFT JOIN feed f ON de.fid=f.id AND f.pastureid=d.pastureid LEFT JOIN feedtemplet ft ON d.tempid=ft.id AND ft.pastureid=d.pastureid 
 		 LEFT JOIN feedclass fc ON f.fclassid=fc.id AND fc.pastureid=d.pastureid  
-		 WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d') OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') ) AND d.isuse=0  
+		 WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')) AND d.isuse=0  
 		 AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid') 
 		 AND (SELECT COUNT(*) FROM downloadplandtl1 d1 WHERE  d.id=d1.PID AND d.pastureid=d1.pastureid  AND  d1.type = 0)>0
-		 AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND downloadedplan.lpplantype=1 and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+		 AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid  and  lpplantype in(0,1,5)  and mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+		 and d.lpplantype in(0,1,5)   and d.iscompleted = 1
 		  group by d.pid,de.Fname,d.mydate`).Query().List()
 
 	if err1 == nil && err2 == nil {
@@ -666,10 +669,12 @@ func AddOtherDeviceFeeding() {
 	// TODO isuse2 =0 待定
 	queryIdList, err1 := tx.SQL(`SELECT d.pid +UNIX_TIMESTAMP(d.mydate) id,d.pid did,d.projname projName,DATE_FORMAT(d.mydate,'%Y-%m-%d') mydate 
 		FROM downloadedplan d 
- 		WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') )   
+ 		WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d') )   
  		AND iscompleted=1 AND d.isuse2=0
  		AND (SELECT COUNT(*) FROM downloadplandtl2 d2 WHERE  d.id=d2.PID AND d.pastureid=d2.pastureid  AND  d2.type = 0)>0
  		AND (SELECT COUNT(*) FROM downloadedplan WHERE pastureid = d.pastureid AND mydate = d.mydate AND pid = d.pid AND iscompleted = 0) = 0
+		 and d.lpplantype in(0,2)  
+		 AND d.iscompleted=1 
 		`).Query().List()
 
 	queryDataList, err2 := tx.SQL(`		SELECT  d.pid +UNIX_TIMESTAMP(d.mydate) id,d.projname projName,DATE_FORMAT(d.mydate,'%Y-%m-%d') AS dropDate,d.Times AS times,d.SORT AS tmrNo,
@@ -678,8 +683,9 @@ func AddOtherDeviceFeeding() {
 		 FROM  downloadedplan d JOIN downloadplandtl2 d2 ON d.id=d2.PID AND d.pastureid=d2.pastureid  AND  d2.type = 0
 		 LEFT JOIN bar ON  d2.fbarid=bar.id AND bar.pastureid=d2.pastureid LEFT JOIN feedpdate fp ON d2.fbarid=fp.barid AND fp.pastureid=d2.pastureid AND fp.date  = d2.date 
 		 LEFT JOIN feedtemplet ft ON d.tempid=ft.id AND ft.pastureid=d.pastureid 
-		 WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d')OR d.mydate=DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d') )  AND iscompleted=1 AND d.isuse2=0 
+		 WHERE  (d.mydate=DATE_FORMAT(NOW(),'%Y-%m-%d') )  AND iscompleted=1 AND d.isuse2=0 
 		 AND d.pastureid =(SELECT column_default  FROM information_schema.COLUMNS WHERE table_name = 'recweight' AND table_schema = 'tmrwatch2' AND column_name = 'pastureid')
+		 and d.lpplantype in(0,2)  
 		 `).Query().List()
 
 	if err1 == nil && err2 == nil {

http/handle/api/ops.go

@@ -1061,11 +1061,11 @@ func PostDataByName(c *gin.Context) {
 	case "deleteCowclass":
 		keyWord = "cow_delete"
 		err = module.GroupCategoryDelete(keyWord, fsion)
-	case "updateFT":
-		FtdetailSurplus(fsion)
+	// case "updateFT":
+	// 	FtdetailSurplus(fsion)
 
-	case "updateFeed":
-		FeedSurplus(fsion)
+	// case "updateFeed":
+	// 	FeedSurplus(fsion)
 	default:
 	}
 	if err != nil {
@@ -3049,6 +3049,7 @@ func UpdateFTdetail(c *gin.Context) {
 			}
 		}
 	}
+
 	parammaps := fTChange["parammaps"].(map[string]interface{})
 
 	// oldFpdDataList, err := tx.SQL(` select *  from fpdetail where ptid = ? or  ptsid = ? `, parammaps["ftid"], parammaps["ftid"]).Query().List()
@@ -3206,24 +3207,22 @@ func UpdateFTdetail(c *gin.Context) {
 			return
 		}
 
-		for _, lpp := range lpplandtl1AllList {
-			_, err = tx.SQL(` update  lpplandtl1  set lweight = 0 where pastureid = ? and  lppid in(select  id from lpplan where pastureid = ?  ) 
-		and find_in_set(barid,?) `, parammaps["pastureid"], parammaps["pastureid"], lpp.Barid).Execute()
-			if err != nil {
-				logs.Error(err)
-				appG.Response(http.StatusInternalServerError, e.ERROR, err)
-				return
-			}
-			_, err = tx.SQL(` UPDATE fpdetail SET ptuse=0,ptsuse=0
-		WHERE pastureid=?  and find_in_set(barid,?  )   `, parammaps["pastureid"], lpp.Barid).Execute()
-			if err != nil {
-				logs.Error(err)
-				appG.Response(http.StatusInternalServerError, e.ERROR, err)
-				return
-			}
-
-		}
-
+		// 		for _, lpp := range lpplandtl1AllList {
+		// 	_, err = tx.SQL(` update  lpplandtl1  set lweight = 0 where pastureid = ? and  lppid in(select  id from lpplan where pastureid = ?  )
+		// and find_in_set(barid,?) `, parammaps["pastureid"], parammaps["pastureid"], lpp.Barid).Execute()
+		// 	if err != nil {
+		// 		logs.Error(err)
+		// 		appG.Response(http.StatusInternalServerError, e.ERROR, err)
+		// 		return
+		// 	}
+		// 	_, err = tx.SQL(` UPDATE fpdetail SET ptuse=0,ptsuse=0
+		// WHERE pastureid=?  and find_in_set(barid,?  )   `, parammaps["pastureid"], lpp.Barid).Execute()
+		// 	if err != nil {
+		// 		logs.Error(err)
+		// 		appG.Response(http.StatusInternalServerError, e.ERROR, err)
+		// 		return
+		// 	}
+		// }
 		var wg sync.WaitGroup
 		for _, old := range fpdOldDataList {
 			for _, fpd := range fpdDataList {

module/post_data.go

@@ -48,51 +48,51 @@ func PostDataByName(c *gin.Context, fashion *gofasion.Fasion) (interface{}, erro
 		}
 	}()
 
-	if sqlnamestr == "updateFT" {
-		params := fashion.Get("parammaps")
-		surplus := params.Get("surplus").ValueStr()
-		surplusId := params.Get("surplusId").ValueStr()
+	// if sqlnamestr == "updateFT" {
+	// 	params := fashion.Get("parammaps")
+	// 	surplus := params.Get("surplus").ValueStr()
+	// 	surplusId := params.Get("surplusId").ValueStr()
 
-		tx.Exec(` delete from ftdetail where ftid  = ?  and is_surplus = 1 `, params.Get("id").ValueStr())
-		if surplus != "日粮" && surplus != "" {
-			if surplusId != "0" {
-				dataList, err := tx.Table("ftdetail").Where("ftid = ? ", params.Get("id").ValueStr()).QueryString()
-				if err != nil {
-					return nil, err
-				}
+	// 	tx.Exec(` delete from ftdetail where ftid  = ?  and is_surplus = 1 `, params.Get("id").ValueStr())
+	// 	if surplus != "日粮" && surplus != "" {
+	// 		if surplusId != "0" {
+	// 			dataList, err := tx.Table("ftdetail").Where("ftid = ? ", params.Get("id").ValueStr()).QueryString()
+	// 			if err != nil {
+	// 				return nil, err
+	// 			}
 
-				type ftdetail struct {
-					Id    string
-					Fname string
-					Sort  int64
-				}
-				ftList := make([]*ftdetail, 0)
-				for _, data := range dataList {
-					ft := new(ftdetail)
-					ft.Fname = data["fname"]
-					ft.Id = data["id"]
+	// 			type ftdetail struct {
+	// 				Id    string
+	// 				Fname string
+	// 				Sort  int64
+	// 			}
+	// 			ftList := make([]*ftdetail, 0)
+	// 			for _, data := range dataList {
+	// 				ft := new(ftdetail)
+	// 				ft.Fname = data["fname"]
+	// 				ft.Id = data["id"]
 
-					sort, err := strconv.ParseInt(data["sort"], 10, 64)
-					if err != nil {
-						return nil, err
-					}
-					ft.Sort = sort
-					ftList = append(ftList, ft)
-				}
+	// 				sort, err := strconv.ParseInt(data["sort"], 10, 64)
+	// 				if err != nil {
+	// 					return nil, err
+	// 				}
+	// 				ft.Sort = sort
+	// 				ftList = append(ftList, ft)
+	// 			}
 
-				exist := false
-				for _, ft := range ftList {
-					if ft.Fname == surplus {
-						exist = true
-						break
-					}
-				}
-				if !exist {
-					return nil, errors.New(fmt.Sprintf("%s不存在", surplus))
-				}
-			}
-		}
-	}
+	// 			exist := false
+	// 			for _, ft := range ftList {
+	// 				if ft.Fname == surplus {
+	// 					exist = true
+	// 					break
+	// 				}
+	// 			}
+	// 			if !exist {
+	// 				return nil, errors.New(fmt.Sprintf("%s不存在", surplus))
+	// 			}
+	// 		}
+	// 	}
+	// }
 
 	sql, p := restful.GetSqlByNameDBT(sqlnamestr, tx)
 	if sql != "" {

pkg/util/grfdApiUtil.go

@@ -58,6 +58,7 @@ func Send_Message1(msg string, url string) []byte {
 		fmt.Println(err)
 		return nil
 	}
+
 	return result_body
 
 }