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);