修改日执行实际重量接口

conf/app.ini

@@ -48,8 +48,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
@@ -73,7 +73,7 @@ Host = 127.0.0.1:3316
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tmrwatch2
+Name = sfmc
 TablePrefix =
 
 ShowXormlog = false
@@ -89,7 +89,6 @@ User =
 Password = 
 Name = 
 
-
 [yyn]
 FarmId = "118300003869"
 ProductKey = "k03txxLKFae"

http/handle/api/ops.go

@@ -8874,3 +8874,73 @@ func ddmmtoddd(lng, lat float64) (float64, float64) {
 	b, _ := strconv.ParseFloat(latStr, 64)
 	return coordtransform.WGS84toGCJ02(b, a)
 }
+
+func EditDownloadedplanExecWeight(c *gin.Context) {
+	appG := app.Gin{C: c}
+	dataByte, _ := ioutil.ReadAll(c.Request.Body)
+	fsions := gofasion.NewFasion(string(dataByte))
+	pid := fsions.Get("pid").ValueStr()
+	sort := fsions.Get("sort").ValueStr()
+	weight := fsions.Get("weight").ValueStr()
+
+	tx := restful.Engine.NewSession()
+	defer tx.Close()
+	tx.Begin()
+
+	_, err := tx.Exec(` update downloadplandtl1_exec set actualweight = ? where pid = ?  and sort = ? `, weight, pid, sort)
+	if err != nil {
+		logs.Error(err)
+		appG.Response(http.StatusOK, e.ERROR, "修改计划重量失败！"+err.Error())
+		tx.Rollback()
+		return
+	}
+
+	_, err = tx.Exec(` update downloadplandtl1 set actualweight = lweight / (select sum(lweight) from downloadplandtl1 where pid = ? and sort = ? ) * ?  where pid = ?  and sort = ? `, pid, sort, weight, pid, sort)
+	if err != nil {
+		logs.Error(err)
+		appG.Response(http.StatusOK, e.ERROR, "修改计划重量失败！"+err.Error())
+		tx.Rollback()
+		return
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		logs.Error(err)
+		appG.Response(http.StatusOK, e.ERROR, "修改计划重量失败！"+err.Error())
+		tx.Rollback()
+		return
+	}
+
+	appG.Response(http.StatusOK, e.SUCCESS, true)
+}
+
+func EditDownloadplandtl2Weight(c *gin.Context) {
+	appG := app.Gin{C: c}
+	dataByte, _ := ioutil.ReadAll(c.Request.Body)
+	fsions := gofasion.NewFasion(string(dataByte))
+	pid := fsions.Get("pid").ValueStr()
+	sort := fsions.Get("sort").ValueStr()
+	weight := fsions.Get("weight").ValueStr()
+
+	tx := restful.Engine.NewSession()
+	defer tx.Close()
+	tx.Begin()
+
+	_, err := tx.Exec(` update downloadplandtl2 set actualweight = ? where pid = ?  and sort = ? `, weight, pid, sort)
+	if err != nil {
+		logs.Error(err)
+		appG.Response(http.StatusOK, e.ERROR, "修改计划重量失败！"+err.Error())
+		tx.Rollback()
+		return
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		logs.Error(err)
+		appG.Response(http.StatusOK, e.ERROR, "修改计划重量失败！"+err.Error())
+		tx.Rollback()
+		return
+	}
+
+	appG.Response(http.StatusOK, e.SUCCESS, true)
+}

http/handle/api/scheduled.go

@@ -134,15 +134,15 @@ func CronScheduled(ctx context.Context) {
 	// manualUdData(pastureinfo)
 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
 	// xdmy := cron.New()
-	// err = xdmy.AddFunc("0 30 8 * * *", func() {
+	// err = xdmy.AddFunc("0 30 4 * * *", func() {
 	// 	// 	//现代牧业sap同步
-	// 	// sap.SyncMaterialOutbound()
+	// 	sap.SyncMaterialOutbound()
 	// 	// 	// 光明ud同步
 	// 	// 	fmt.Println(time.Now())
-	// 	gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
+	// 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
 	// })
 	// xdmy.Start()
-	InitMqttClient()
+	// InitMqttClient()
 }
 
 type ScheduledInfo struct {

http/handle/sap/sap.go

@@ -132,9 +132,6 @@ func materialOutbound(pastureId, date string) error {
 	,tem.bname CHSTX,tem.sapcode CHSNO,tem.cattle FCWTS,tem.MATNR,tem.sapGoods LGORT
 
 	 FROM (
-	 
-	 
-	 
 	(SELECT 
 	d2.type,
 	 d2.fname,IFNULL(ftd.fname,d1.fname ) feedname,

http/routers/app_api.go

@@ -231,6 +231,11 @@ func AppAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 			apiV1.POST("/plan/artificial/edit", api.EditDownloadedplanArtificial)
 
 			apiV1.GET("/equipment/muster", api.GetTmrEquipmentMuster)
+			// 修改混料实际重量
+			apiV1.POST("/planexec/edit", api.EditDownloadedplanExecWeight)
+			// 修改撒料实际重量
+			apiV1.POST("/plan2/edit", api.EditDownloadplandtl2Weight)
+
 		}
 
 		//不需要登录验证的接口