From ec5a1e89e8f82251eafadf8fdcc5e0e0cc37bbec Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 14 Oct 2022 17:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/pdm/service/impl/PdmWorkTaskServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 45983376..aa3b0dbd 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 @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -768,13 +769,14 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { if (para.getString("para_code").equals("QM008")) { data2.put("value", form_jo.getString("ball_time")); } - //工艺酒精加量设定值：开单重量*[1-工艺参数"预磨1酒精量（改为比例）"] + //工艺酒精加量设定值：开单重量*液料比-开单重量*工艺参数"预磨1酒精量（改为比例）" if (para.getString("para_code").equals("QM009")) { + double liquid_rate = material_ext.getDouble("liquid_rate"); + double a = NumberUtil.mul(masterbucket_qty, liquid_rate); + BigDecimal b = NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3); //查询预磨1酒精设定值 JSONObject qm006 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM006'").uniqueResult(0); - double a = (1.0-qm006.getDoubleValue("value")*0.01); - double b = work_order.getDouble("workorder_qty"); - data2.put("value", NumberUtil.round(NumberUtil.mul(b,a),3)); + data2.put("value", NumberUtil.round(NumberUtil.sub(a, b), 3)); } //卸料酒精每次加量设定值：开单重量*工艺参数"每次卸料酒精加量（改为比例）" if (para.getString("para_code").equals("QM014")) {