Merge branch 'chart/13.7' into debug

models/base_from_stock_plant.go

@@ -100,7 +100,7 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 			addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, sValue)
 			isAdd = true
 		} else {
-			if findItem != nil && utils.SubFloatToString(findItem.Value, 30) != item.Value {
+			if findItem != nil && utils.SubFloatToString(findItem.Value, 4) != item.Value {
 				err = ModifyEdbDataById(source, findItem.EdbDataId, item.Value)
 				if err != nil {
 					return err

models/supply_analysis/base_from_stock_plant_data.go

@@ -181,6 +181,7 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 				currVal = preVal - weekVal
 			}
 
+			currVal, _ = decimal.NewFromFloat(currVal).Round(4).Float64()
 			latestValue = currVal
 			timestamp := currDate.UnixNano() / 1e6
 			existItem, ok := existData[currDate]
@@ -292,6 +293,7 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 			} else { // 如果是月度产量变动的话
 				currVal, _ = (preSumValDeci.Sub(decimal.NewFromFloat(sumVal))).Round(4).Float64()
 			}
+			currVal, _ = decimal.NewFromFloat(currVal).Round(4).Float64()
 			latestValue = currVal
 
 			if !ok {