From 38d40e5c44a95b7ab18b3b29d0a1c1b80124787f Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 3 Jan 2025 16:38:25 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=93=E5=8D=B0=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=8D=A1=EF=BC=9A=E5=8D=B8=E6=96=99=E9=85=92=E7=B2=BE?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=85=AC=E5=8F=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 1da932b7..89a10864 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -896,7 +896,8 @@ public class FormulaServiceImpl implements FormulaService { String unload_percentage = qm014_unload_percentage.getString("value"); BigDecimal 开单重量_液料比 = NumberUtil.mul(jsonMaterExt.getString("liquid_rate"), masterbucket_qty).setScale(3, RoundingMode.HALF_UP); - BigDecimal 卸料酒精 = NumberUtil.div(NumberUtil.mul(masterbucket_qty, unload_num, unload_percentage), 100).setScale(3, RoundingMode.HALF_UP); + // 2025年1.3修改：卸料酒精 = 配粉重量*单次卸料酒精*卸料次数 + BigDecimal 卸料酒精 = NumberUtil.div(NumberUtil.mul(jsonMst.getString("masterbucket_qty"), unload_num, unload_percentage), 100).setScale(3, RoundingMode.HALF_UP); int 含水量 = NumberUtil.mul(卸料酒精.add(开单重量_液料比), (json98jj.getDoubleValue("value") / 100)).intValue(); int 酒精含量 = 开单重量_液料比.intValue() - 含水量; oneMap.put("water", String.valueOf(含水量));