代码更新

This commit is contained in:
2022-10-18 18:38:47 +08:00
parent e82af8005c
commit 536078f78e

View File

@@ -421,18 +421,18 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
// 酒精体积:液料比*开单总重 // 酒精体积:液料比*开单总重
double bar_bulk = NumberUtil.mul(jsonFormMst.getDoubleValue("confirm_qty"), jsonMark.getDoubleValue("liquid_rate")); double bar_bulk = NumberUtil.mul(jsonFormMst.getDoubleValue("confirm_qty"), jsonMark.getDoubleValue("liquid_rate"));
oneMap.put("bar_bulk", NumberUtil.round(bar_bulk, 3).toString()); oneMap.put("bar_bulk", NumberUtil.round(bar_bulk, 0).toString());
// 合金球重量:球料比*开单总重 // 合金球重量:球料比*开单总重
double ball_rate_2 = NumberUtil.mul(jsonFormMst.getDoubleValue("confirm_qty"), jsonMark.getDoubleValue("ball_rate")); double ball_rate_2 = NumberUtil.mul(jsonFormMst.getDoubleValue("confirm_qty"), jsonMark.getDoubleValue("ball_rate"));
double ball_weight = NumberUtil.div(ball_rate_2, 1000); double ball_weight = NumberUtil.div(ball_rate_2, 1000);
oneMap.put("ball_weight", NumberUtil.round(ball_weight, 3).toString()); oneMap.put("ball_weight", NumberUtil.round(ball_weight, 0).toString());
// 球磨时间 // 球磨时间
oneMap.put("ball_time", jsonMark.getString("ball_time")); oneMap.put("ball_time",NumberUtil.round(jsonMark.getString("ball_time"),0).toString());
// 转速 // 转速
oneMap.put("ball_speed", jsonMark.getString("ball_speed")); oneMap.put("ball_speed", NumberUtil.round(jsonMark.getString("ball_speed"),0).toString());
// 原料总碳 // 原料总碳
oneMap.put("c_balance", jsonMark.getString("c_balance")); oneMap.put("c_balance", jsonMark.getString("c_balance"));
@@ -475,7 +475,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
} }
mapFL.put("class_name", class_name); mapFL.put("class_name", class_name);
mapFL.put("dtl_pcsn", json.getString("dtl_pcsn")); mapFL.put("dtl_pcsn", json.getString("dtl_pcsn"));
mapFL.put("formula_qty", NumberUtil.round(json.getString("formula_qty"), 3).toString()); mapFL.put("formula_qty", NumberUtil.round(json.getString("formula_qty"), 2).toString());
flData.add(mapFL); flData.add(mapFL);
} }
} }