Browse Source

切换分支

baishaojie 4 tháng trước cách đây
mục cha
commit
d7a1980609

BIN
TMRWatchComm


BIN
TMRWatchComm.zip


BIN
__debug_bin.exe


+ 1 - 2
conf/app.ini

@@ -75,7 +75,7 @@ Host = 192.168.1.93:3326
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tmrwatch5
+Name = grfd
 TablePrefix =
 
 ShowXormlog = false
@@ -107,4 +107,3 @@ StopBits = 1
 ParityMode = 0    #PARITY_NONE  0	PARITY_ODD  1	PARITY_EVEN  2
 InterCharacterTimeout = 100
 MinimumReadSize = 0
-

+ 1 - 1
http/handle/api/ops.go

@@ -1598,7 +1598,7 @@ func getParamValue(parammaps map[string]interface{}, value string, ParamMap []ma
 			return valuestring
 		}
 	} else if valuestring, ok := parammaps[strings.Trim(value, " ")].(float64); ok {
-		return strconv.FormatInt(int64(valuestring), 10)
+		return fmt.Sprintf("%f", valuestring)
 	}
 	return ""
 }

+ 1 - 1
http/handle/api/spillage.go

@@ -1407,7 +1407,7 @@ GROUP BY fpd.ptsid`
 		sqlstr := `SELECT
 		lpplan.date,
 		-- ifnull((select eqcode from tmr where pastureid =lpplan.pastureid and id = lpplan.tmrid ),lpplan.tmrname) 
-		lpplan.tmrname tmrname,trim(lpplan.tmrid) tmrid,lpplan.sort,lpplan.sel,lpplan.times timesInt,
+		(select eqcode from tmr where pastureid =lpplan.pastureid and id = lpplan.tmrid ) tmrname,trim(lpplan.tmrid) tmrid,lpplan.sort,lpplan.sel,lpplan.times timesInt,
 		if( ifnull((select inforvalue from sysopt where inforname = 'language' and lpplan.pastureId),0) = 0 ,
 		CASE
 		lpplan.times

BIN
uploads/file/导入导出模板/配方计划/配方模板导入模板.xlsx