diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java index 72c5e24f..321e2194 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java @@ -938,7 +938,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { data2.put("value", form_jo.getString("ball_time")); } //工艺酒精加量设定值:开单重量*液料比-开单重量*工艺参数"预磨1酒精量(改为比例)" - if (para.getString("para_code").equals("QM009")) { + /* if (para.getString("para_code").equals("QM009")) { //0.35 double liquid_rate = material_ext.getDouble("liquid_rate"); //500*0.35 @@ -947,7 +947,27 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { data2.put("value", NumberUtil.round(NumberUtil.sub(a, QM006_qty), 3)); + }*/ + //工艺酒精加量设定值:开单重量*液料比-(开单重量*液料比 + 开单重量*单次卸料比例*卸料次数)*含水量 ----2025-11-5修改 + if (para.getString("para_code").equals("QM009")) { + // 液料比 + double liquid_rate = material_ext.getDouble("liquid_rate"); + // 开单重量*液料比 + double order_qty = NumberUtil.mul(masterbucket_qty, liquid_rate); + + // 单次卸料比例 + JSONObject QM014 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM014'").uniqueResult(0); + // 卸料次数 + JSONObject QM013 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM013'").uniqueResult(0); + // 含水量 + JSONObject QM001 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM001'").uniqueResult(0); + + double v = NumberUtil.mul(masterbucket_qty, QM014.getDoubleValue("value") * 0.01, QM013.getDoubleValue("value")).doubleValue(); + double value = NumberUtil.mul(NumberUtil.add(order_qty, v), QM001.getDoubleValue("value") * 0.01); + + data2.put("value", NumberUtil.round(NumberUtil.sub(order_qty,value), 3)); } + //卸料酒精每次加量设定值:开单重量*工艺参数"每次卸料酒精加量(改为比例)" if (para.getString("para_code").equals("QM014")) { data2.put("value", NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3));