소스 검색

青储出库bug修复

baishaojie 1 년 전
부모
커밋
3bf725d248

+ 1 - 0
apiserver/service/proof.go

@@ -243,6 +243,7 @@ func (s *Service) UseProof(p interface{}, tx *sqlx.Tx) error {
 		bp.PastureID, _ = strconv.Atoi(data["pastureId"].(string))
 		bp.ProofCode, _ = data["ProofCode"].(string)
 		bp.DepartmentID, _ = strconv.Atoi(data["departmentId"].(string))
+		bp.UseType, _ = strconv.Atoi(data["useType"].(string))
 
 		if data["useType"] != "6" {
 			if _, ok := data["oddCode"]; !ok {

+ 10 - 10
cmd/conf/app.ini

@@ -71,8 +71,8 @@ EasUrl = http://60.174.151.11:6888
 
 
 [database]
-DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
-; ####DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local
+; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
+DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local
@@ -80,16 +80,16 @@ DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc
 
 Type = mysql
 #####本地
-#User = root
-#Password = kepaiteng!QAZ
-#Host = 222.73.129.15:31306
-#Name = eq230508
+User = root
+Password = kepaiteng!QAZ
+Host = 222.73.129.15:31306
+Name = eq230508
 
 #####线上
-User = eq
-Password = Xdmy@1234
-Host = 192.168.61.42:3306
-Name = eq
+#User = eq
+#Password = Xdmy@1234
+#Host = 192.168.61.42:3306
+#Name = eq
 TablePrefix =
 
 #####现代牧业测试线

+ 8 - 8
cmd/conf/conf.toml

@@ -1,7 +1,7 @@
 [db]
 #dsn = "root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local"
-#dsn = "root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local"
-dsn = "eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
+dsn = "root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eq230508?charset=utf8&parseTime=True&loc=Local"
+#dsn = "eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
 #dsn = "eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local"
 #dsn = "root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local"
 
@@ -10,18 +10,18 @@ idle_timeout = 3600
 [http]
 timeout =600
 ###sap测试线密码
-#sapname ="zinf_sheb"
-#sappwd ="zinf_sheb@1234"
+sapname ="zinf_sheb"
+sappwd ="zinf_sheb@1234"
 
 ###sap正式线密码
-sapname ="zinf_sheb"
-sappwd ="n4mJj^BVMs"
+#sapname ="zinf_sheb"
+#sappwd ="n4mJj^BVMs"
 #srmname= "PEC"
 #srmpwd = "3FxnFswa0hYb8y4nh6dzTtAS4kQYh0xP"
 ###正式线
-routing = "http://192.168.61.117/SAPP0"
+#routing = "http://192.168.61.117/SAPP0"
 ##Q系统
-#routing = "http://192.168.61.117/SAPQ0"
+routing = "http://192.168.61.117/SAPQ0"
 
 
 

BIN
cmd/dist-现代牧业-本地地址-20230522-1.zip


BIN
cmd/dist-现代牧业-本地地址-20230529-1.zip


BIN
cmd/dist.zip


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
cmd/dist/index.html


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
cmd/dist/static/css/app.34a78bb3.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
cmd/dist/static/js/app.2f4e3cc7.js


+ 2 - 2
cmd/main.go

@@ -37,8 +37,8 @@ import (
 // @BasePath /
 func main() {
 	var path string
-	path = "./"
-	//path = "D:/catering/eam-go/cmd/"
+	//path = "./"
+	path = "D:/catering/eam-go/cmd/"
 	flag.Parse()
 	setting.Setup(path)
 	dao.Setup()

BIN
cmd/sh/eqserver


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.