浏览代码

圣牧集团端问题处理

baishaojie 2 月之前
父节点
当前提交
69297f0e5d

二进制
TMRWatchComm


二进制
TMRWatchComm.zip


+ 4 - 4
conf/app.ini

@@ -21,7 +21,7 @@ TimeFormat = 20060102-150405
 #debug or release
 #RunMode = debuggit 
 RunMode = release
-HttpPort = 8081
+HttpPort = 8082
 ReadTimeout = 60
 WriteTimeout = 60
 NoAuth = 1
@@ -51,8 +51,8 @@ User = root
 #Password = root
 #Password = kepaiteng!QAZ
 #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 = root
 Password = root
 #Password = root
@@ -76,7 +76,7 @@ Password = root
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tn
+Name = tmrwatch2
 TablePrefix =
 
 ShowXormlog = false

+ 0 - 0
dist/favicon.ico → distzc/favicon.ico


+ 0 - 0
dist/index.html → distzc/index.html


+ 0 - 0
dist/static/css/app.ae6944cd.css → distzc/static/css/app.ae6944cd.css


+ 0 - 0
dist/static/css/chunk-elementUI.c1c3b808.css → distzc/static/css/chunk-elementUI.c1c3b808.css


+ 0 - 0
dist/static/css/chunk-libs.f403b559.css → distzc/static/css/chunk-libs.f403b559.css


+ 0 - 0
dist/static/fonts/element-icons.535877f5.woff → distzc/static/fonts/element-icons.535877f5.woff


+ 0 - 0
dist/static/fonts/element-icons.732389de.ttf → distzc/static/fonts/element-icons.732389de.ttf


+ 0 - 0
dist/static/img/404.a57b6f31.png → distzc/static/img/404.a57b6f31.png


+ 0 - 0
dist/static/img/404_cloud.0f4bc32b.png → distzc/static/img/404_cloud.0f4bc32b.png


+ 0 - 0
dist/static/img/guiji2.9dc0addf.jpeg → distzc/static/img/guiji2.9dc0addf.jpeg


+ 0 - 0
dist/static/img/iconfont.0ddaba12.svg → distzc/static/img/iconfont.0ddaba12.svg


+ 0 - 0
dist/static/img/logo.afed751a.png → distzc/static/img/logo.afed751a.png


+ 0 - 0
dist/static/img/logo1.0121925c.png → distzc/static/img/logo1.0121925c.png


+ 0 - 0
dist/static/img/logo_u3.3c77f543.png → distzc/static/img/logo_u3.3c77f543.png


+ 0 - 0
dist/static/img/nlogin-bg1.77301f56.jpg → distzc/static/img/nlogin-bg1.77301f56.jpg


+ 0 - 0
dist/static/img/row-bg3.b3be7548.png → distzc/static/img/row-bg3.b3be7548.png


+ 0 - 0
dist/static/img/topBg.69ecd1e1.png → distzc/static/img/topBg.69ecd1e1.png


+ 0 - 0
dist/static/js/app.725702c9.js → distzc/static/js/app.725702c9.js


+ 0 - 0
dist/static/js/chunk-4be30289.2369f77e.js → distzc/static/js/chunk-4be30289.2369f77e.js


+ 0 - 0
dist/static/js/chunk-52ecc0ac.351a4392.js → distzc/static/js/chunk-52ecc0ac.351a4392.js


+ 0 - 0
dist/static/js/chunk-5c4dc4a9.72b2f70d.js → distzc/static/js/chunk-5c4dc4a9.72b2f70d.js


+ 0 - 0
dist/static/js/chunk-b702d234.5ae7551f.js → distzc/static/js/chunk-b702d234.5ae7551f.js


+ 0 - 0
dist/static/js/chunk-elementUI.c961dc79.js → distzc/static/js/chunk-elementUI.c961dc79.js


+ 0 - 0
dist/static/js/chunk-libs.8d47e7c4.js → distzc/static/js/chunk-libs.8d47e7c4.js


+ 7 - 5
http/handle/api/ops.go

@@ -19,6 +19,7 @@ import (
 	"time"
 	"tmr-watch/conf/setting"
 	"tmr-watch/http/handle/gm"
+	"tmr-watch/http/handle/jpud"
 	"tmr-watch/http/handle/restful"
 	"tmr-watch/models"
 	"tmr-watch/module"
@@ -1162,7 +1163,8 @@ func GetRJSBData(c *gin.Context) {
 				wg.Add(1)
 				go func(value map[string]interface{}) {
 					defer wg.Done()
-					_, err = tx.SQL(`update downloadedplan set  artificial = 2 ,havebutton = 1 where id = ? and pastureid = ? `, value["projuctid"], value["pastureid"]).Execute()
+					// ,havebutton = 1
+					_, err = tx.SQL(`update downloadedplan set  artificial = 2 where id = ? and pastureid = ? `, value["projuctid"], value["pastureid"]).Execute()
 				}(value)
 			}
 			wg.Wait()
@@ -9225,8 +9227,8 @@ func UdBarSync(c *gin.Context) {
 		return
 	}
 
-	gm.UdBarSync(pastureid, pastureinfo.Werks)
-
+	// gm.UdBarSync(pastureid, pastureinfo.Werks)
+	jpud.UdBarSync(pastureid, pastureinfo.Werks)
 	appG.Response(http.StatusOK, e.SUCCESS, "ok")
 }
 
@@ -9246,8 +9248,8 @@ func UdFeedSync(c *gin.Context) {
 		return
 	}
 
-	gm.UdFeedSync(pastureid, pastureinfo.Werks)
-
+	// gm.UdFeedSync(pastureid, pastureinfo.Werks)
+	// jpud.UdBarSync(pastureid, pastureinfo.Werks)
 	appG.Response(http.StatusOK, e.SUCCESS, "ok")
 }
 

+ 3 - 3
http/routers/app_api.go

@@ -140,8 +140,8 @@ func AppAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 			apiV1.POST("/summary", api.GetSummary)
 
 			apiV1.POST("/ftdetail/edit", api.UpdateFTdetail)
-			apiV1.POST("/fpdetail/edit", api.UpdateFpdetailBar)
-			apiV1.POST("/fpdetail/batch/edit", api.FpdBatchEdit)
+			apiV1.POST("/fpdetail/edit", api.UpdateFpdetailBar)  //自动补料
+			apiV1.POST("/fpdetail/batch/edit", api.FpdBatchEdit) //自动补料
 			apiV1.POST("/fpdetail/batch/edit/weight", api.FpdBatchEditByWeight)
 			apiV1.POST("/ftdetai/del", api.DeleteFTdetail)
 			apiV1.POST("/lpplandtl/add", api.AddLpplandtl)
@@ -161,7 +161,7 @@ func AppAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 			//	立即同步
 			apiV1.POST("/synchronizeNow", api.SynchronizeNow)
 
-			apiV1.POST("/fpdimportexcel", api.FpdImportExcel)
+			apiV1.POST("/fpdimportexcel", api.FpdImportExcel) //自动补料
 
 			apiV1.POST("/barfeedremain/excel", api.GetBarfeedremainExcel)