软件牛头数定时任务提交

routers/api/db.go

@@ -1539,6 +1539,18 @@ func ExecDataByConfig(c *gin.Context) {
 				tempCommon["jwt_username"] = tempv.(string)
 			}
 
+			for _, paramvalue := range tempval {
+				fmt.Println(paramvalue["name"])
+				if paramvalue["name"].(string) == "updateBigFP" {
+					err = updateLpplandtlInfo(tx, paramvalue["parammaps"].(map[string]interface{}))
+					if err != nil {
+						msg := geterrmsg(err.Error())
+						appG.Response(http.StatusOK, e.ERROR, msg)
+						return
+					}
+				}
+			}
+
 			for _, paramvalue := range tempval {
 				if _, ok := paramvalue["resultname"]; !ok {
 					paramvalue["resultname"] = paramvalue["name"]
@@ -3559,7 +3571,7 @@ func UpdateFpdetailBar(c *gin.Context) {
 		ftmap["ptsid"] = list.Get("ptsid").ValueStr()
 		// fmt.Println(ftmap)
 
-		fpdDataList, err := tx.SQL(`select * from (SELECT TRIM(id) id,times,tratio,ifnull(ROUND(ptsrate*weight,2)-ptsuse,"") weight,TRIM(barid) barid,TRIM(pastureid) pastureid,TRIM(ptid) ptid,TRIM(ptsid ) ptsid ,
+		fpdDataList, err := tx.SQL(`select * from (SELECT TRIM(id) id,times,tratio,ifnull(ROUND(ptsrate*weight,2)-ptsuse,"") weight,TRIM(barid) barid,TRIM(pastureid) pastureid,TRIM(ptid) ptid,TRIM(-1 ) ptsid ,
 			(select bname  from bar where pastureid =fpdetail.pastureid and id = fpdetail.barid ) barname,0 AS fttype,cowcount,ccountradio,1 isfill  FROM fpdetail
 			WHERE fpdetail.pastureid = ?   and barid =(select barid from feedp where id = ? )  and  times = ?
 			UNION
@@ -3606,7 +3618,7 @@ func UpdateFpdetailBar(c *gin.Context) {
 					status = 0
 				} else {
 					// continue
-					if weight-(ftmap["new"].(float64)-ftmap["old"].(float64)) > 0 {
+					if weight <= 0 {
 						continue
 					}
 					w = weight
@@ -7790,3 +7802,24 @@ func ThiGetDataByName(c *gin.Context) {
 
 // 	appG.Response(http.StatusOK, e.SUCCESS, nil)
 // }
+
+func updateLpplandtlInfo(tx *xorm.Session, data map[string]interface{}) error {
+	feedpList, err := tx.SQL(`select id,concat(ftid)ftid ,pastureId,barid from feedp  where id = ?  `, data["id"]).Query().List()
+	if err != nil {
+		return err
+	}
+	for _, item := range feedpList {
+		// if item["ftid"].(string) != data["ftid"].(string) {
+		_, err = tx.SQL(` delete from lpplandtl1  where barid = ?  and  ? != ?`, item["barid"], item["ftid"], data["ftid"]).Execute()
+		if err != nil {
+			return err
+		}
+		_, err = tx.SQL(` UPDATE fpdetail SET ptuse=0,ptsuse=0
+			WHERE pastureid=?    and find_in_set(barid,?) and  ? != ?  `, item["pastureId"], item["barid"], item["ftid"], data["ftid"]).Execute()
+		if err != nil {
+			return err
+		}
+		// }
+	}
+	return nil
+}

routers/api/sap/sap.go

@@ -139,18 +139,18 @@ func materialOutbound(pastureId, date string) error {
 	 d2.fname,IFNULL(ftd.fname,d1.fname ) feedname,
 	SUM(
 	  d2.lweight/(SELECT SUM(lweight) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date)*
-	  d1.lweight*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetail ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid and ftd2.date= ftp.date  ))
+	  d1.lweight*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetaildate ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid and ftd2.date= ftp.date  ))
 	 )lweight,
 	d1.sort sort,
 		  SUM(
 		 if ( (SELECT SUM(actualweightminus) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date) > 0 ,
 	  d2.actualweightminus/(SELECT SUM(actualweightminus) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date)*
-	  d1.actualweightminus*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetail ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid and ftd2.date= ftp.date )),
+	  d1.actualweightminus*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetaildate ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid and ftd2.date= ftp.date )),
 		
 		 d2.lweight/(SELECT SUM(lweight) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date)*
 	  d1.actualweightminus*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetail ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid ))
 		)
-	 )actualweightminus,b.sort as d2sort,b.bname,b.sapcode, b.cattlecode ,f.sapCode MATNR,f.sapGoods ,ftp.cattle
+	 )actualweightminus,b.sort as d2sort,b.bname,b.sapcode, b.cattlecode ,f.sapCode MATNR,f.sapGoods ,(select cattle from feedtemplet where id = d.tempid) cattle
 	 
 	 FROM 
 	downloadedplan d
@@ -182,7 +182,7 @@ func materialOutbound(pastureId, date string) error {
 		  SUM(
 		 if ( (SELECT SUM(actualweightminus) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date) > 0 ,
 	  d2.actualweightminus/(SELECT SUM(actualweightminus) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date)*
-	  d1.actualweightminus*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetail ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid and ftd2.date= ftp.date  )),
+	  d1.actualweightminus*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetaildate ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid and ftd2.date= ftp.date  )),
 		
 		 d2.lweight/(SELECT SUM(lweight) FROM downloadplandtl2  d2t WHERE d2t.pastureid = d2.pastureid AND d2t.flpid = d2.flpid AND d2t.type = 0 AND d2t.date = d2.date)*
 	  d1.actualweightminus*IF(ftd.id IS NULL,1,ftd.fweight/(SELECT SUM(ftd2.fweight) FROM ftdetail ftd2 WHERE ftd2.pastureid =d1.pastureid AND ftd2.ftid = d1.fid ))
@@ -208,7 +208,7 @@ left join feed f on f.id = ftd.fid
 	
 	) tem
 	
-	ORDER BY tem.d2sort,tem.feedname  `, pastureId, pastureId, pastureId, date, date, date, pastureId, date).Query().List()
+	ORDER BY tem.d2sort,tem.feedname   `, pastureId, pastureId, pastureId, date, date, date, pastureId, date).Query().List()
 	if err != nil {
 		logs.Error(err)
 		return err

routers/api/scheduled.go

@@ -19,7 +19,7 @@ import (
 	"../../pkg/logging"
 	"../../pkg/setting"
 
-	"../../routers/api/sap"
+	// "../../routers/api/sap"
 	"../../routers/restful"
 	"github.com/Anderson-Lu/gofasion/gofasion"
 	"github.com/astaxie/beego/logs"
@@ -133,11 +133,11 @@ func CronScheduled(ctx context.Context) {
 	// //圣牧自动同步前天有进行中的任务
 	// manualUdData(pastureinfo)
 
-	xdmy := cron.New()
-	dayCron.AddFunc("50 04 * * *", func() {
-		sap.SyncMaterialOutbound()
-	})
-	xdmy.Start()
+	// xdmy := cron.New()
+	// dayCron.AddFunc("50 04 * * *", func() {
+	// 	sap.SyncMaterialOutbound()
+	// })
+	// xdmy.Start()
 
 }
 
@@ -1104,11 +1104,23 @@ func manualUdData(pastureinfo *udPastureInfo) {
 	c.Start()
 
 	c1 := cron.New()
-	c1.AddFunc("30 20 * * *", func() {
+	c1.AddFunc("01 18 * * *", func() {
 		udFeedpSync(pastureinfo)
 	})
 	c1.Start()
 
+	c2 := cron.New()
+	c2.AddFunc("30 11 * * *", func() {
+		udFeedpSync(pastureinfo)
+	})
+	c2.Start()
+
+	c3 := cron.New()
+	c3.AddFunc("59 23 * * *", func() {
+		udFeedpSync(pastureinfo)
+	})
+	c3.Start()
+
 }
 
 func abnormalMixingDelay(target []string, pastureId string, serviceId int64) {

update.sql

@@ -97,19 +97,52 @@ CREATE TABLE `cattleorder` (
 
 
 
-ALTER TABLE `tmrwatch5`.`feedtemplethistory` 
+
+
+
+
+
+
+
+
+	
+	  ALTER TABLE `feedtemplet` 
+  ADD COLUMN 
+	`volume` DECIMAL(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积';
+	
+		  ALTER TABLE `tmr` 
+  ADD COLUMN 
+	`volume` DECIMAL(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积';
+	
+	
+			  ALTER TABLE `feedtemplethistory` 
+  ADD COLUMN 
+	`volume` DECIMAL(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积';
+	
+	
+		
+			  ALTER TABLE `feedtempletdate` 
+  ADD COLUMN 
+	`volume` DECIMAL(12,2) NOT NULL DEFAULT 0.00 COMMENT '容积';
+
+
+
+
+
+
+ALTER TABLE `tmrwatch2`.`feedtemplethistory` 
 ADD COLUMN `userId` varchar(30) NULL COMMENT '修改用户' AFTER `volume`;
 
-ALTER TABLE `tmrwatch5`.`fpdetailhistory` 
+ALTER TABLE `tmrwatch2`.`fpdetailhistory` 
 ADD COLUMN `userId` varchar(30) NULL COMMENT '修改用户' AFTER `createdate`;
 
-ALTER TABLE `tmrwatch5`.`feedphistory` 
+ALTER TABLE `tmrwatch2`.`feedphistory` 
 ADD COLUMN `userId` varchar(30) NULL COMMENT '修改用户' AFTER `createdate`;
 
-ALTER TABLE `tmrwatch5`.`lpplandtl1history` 
+ALTER TABLE `tmrwatch2`.`lpplandtl1history` 
 ADD COLUMN `userId` varchar(30) NULL COMMENT '修改用户' AFTER `createdate`;
 
-ALTER TABLE `tmrwatch5`.`fit_history` 
+ALTER TABLE `tmrwatch2`.`fit_history` 
 ADD COLUMN `userId` varchar(30) NULL AFTER `feedgroup`;