root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-13 10:45:15 +08:00
parent e71381bf5d
commit d438cd1453
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -799,20 +799,21 @@ public class FormulaServiceImpl implements FormulaService {
JSONObject jsonQM06 = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM006'").uniqueResult(0); 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(jsonQM13)) oneMap.put("number_1", jsonQM13.getString("value"));
if (ObjectUtil.isNotEmpty(jsonQM14)) { if (ObjectUtil.isNotEmpty(jsonQM14)) {
String number_2 = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM14.getString("value"), "100").toString()).toString(); // 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", 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(jsonQM04)) oneMap.put("pre_time", jsonQM04.getString("value"));
if (ObjectUtil.isNotEmpty(jsonQM06)) { // if (ObjectUtil.isNotEmpty(jsonQM06)) {
String pre_fas = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM06.getString("value"), "100").toString()).toString(); // 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()); // oneMap.put("pre_fas", NumberUtil.round(pre_fas, 2).toString());
//
double liquid_rate = jsonMaterExt.getDoubleValue("liquid_rate"); // double liquid_rate = jsonMaterExt.getDoubleValue("liquid_rate");
String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), liquid_rate, NumberUtil.div(jsonQM06.getString("value"), "100")).toString(); // String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), liquid_rate, NumberUtil.div(jsonQM06.getString("value"), "100")).toString();
oneMap.put("put_fas", NumberUtil.round(put_fas, 2).toString()); // oneMap.put("put_fas", NumberUtil.round(put_fas, 2).toString());
//
} // }
if (ObjectUtil.isNotEmpty(jsonPW02)) { if (ObjectUtil.isNotEmpty(jsonPW02)) {
oneMap.put("number_8", jsonPW02.getString("value")); oneMap.put("number_8", jsonPW02.getString("value"));
} }