From d5546f57dbe1c9e615fac51c2f52d5d0ab874213 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 14 Oct 2022 09:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pf/service/impl/FormulaServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 5be7d6ff..18529b8d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -799,20 +799,20 @@ public class FormulaServiceImpl implements FormulaService { JSONObject jsonQM06 = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM006'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonQM13)) oneMap.put("number_1", jsonQM13.getString("value")); if (ObjectUtil.isNotEmpty(jsonQM14)) { -// String number_2 = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM14.getString("value"), "100").toString()).toString(); -// oneMap.put("number_2", NumberUtil.round(number_2, 2).toString()); - oneMap.put("number_2", jsonQM14.getString("value")); // 待删除 + String number_2 = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM14.getString("value"), "100").toString()).toString(); + oneMap.put("number_2", NumberUtil.round(number_2, 2).toString()); +// oneMap.put("number_2", jsonQM14.getString("value")); // 待删除 } -// if (ObjectUtil.isNotEmpty(jsonQM04)) oneMap.put("pre_time", jsonQM04.getString("value")); -// if (ObjectUtil.isNotEmpty(jsonQM06)) { -// String pre_fas = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM06.getString("value"), "100").toString()).toString(); -// oneMap.put("pre_fas", NumberUtil.round(pre_fas, 2).toString()); -// -// String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), NumberUtil.div(jsonQM06.getString("value"), "100")).toString(); -// oneMap.put("put_fas", NumberUtil.round(put_fas, 2).toString()); -// -// } + if (ObjectUtil.isNotEmpty(jsonQM04)) oneMap.put("pre_time", jsonQM04.getString("value")); + if (ObjectUtil.isNotEmpty(jsonQM06)) { + String pre_fas = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM06.getString("value"), "100").toString()).toString(); + oneMap.put("pre_fas", NumberUtil.round(pre_fas, 2).toString()); + + String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), NumberUtil.div(jsonQM06.getString("value"), "100")).toString(); + oneMap.put("put_fas", NumberUtil.round(put_fas, 2).toString()); + + } if (ObjectUtil.isNotEmpty(jsonPW02)) { oneMap.put("number_8", jsonPW02.getString("value")); }