From 84e4ce7af34c29527866fbb5a4d327e23eb52b7e Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 17 Jul 2023 17:22:31 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=20=E7=89=A9=E6=96=99=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE-=E8=BD=AF=E5=BA=9F=E7=A2=B3?= =?UTF-8?q?=E5=B9=B3=E8=A1=A1=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaterialParametersServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java index e2e9fe0f..e3fc3388 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java @@ -503,18 +503,20 @@ public class MaterialParametersServiceImpl implements MaterialParametersService } // 将此碳化钨的软废类型转化为数组 - JSONArray wasArr = new WastecchangeServiceImpl().contentShift(jsonWas); +// JSONArray wasArr = new WastecchangeServiceImpl().contentShift(jsonWas); + JSONObject wasArr = jsonWas.getJSONObject("alldata"); String rf_type_code = jsonMater.getString("material_code").substring(jsonMater.getString("material_code").lastIndexOf("-")+1,jsonMater.getString("material_code").length()); double value = 0; - for (int j = 0; j < wasArr.size(); j++) { + value = wasArr.getDoubleValue(rf_type_code); + /* for (int j = 0; j < wasArr.size(); j++) { JSONObject jsonWasDtl = wasArr.getJSONObject(j); if (StrUtil.equals(rf_type_code, jsonWasDtl.getString("name"))) { value = jsonWasDtl.getDoubleValue("value"); break; } - } + }*/ // 软废碳平衡=pg粉碳平衡+此软废修正值 JSONObject jsonPgfExt = extTab.query("material_id = '" + jsonPgfMater.getString("material_id") + "'").uniqueResult(0);