diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java index 1d28d9fc..e4c92449 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java @@ -201,13 +201,13 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService WmsMaterialWarning warning = new WmsMaterialWarning(); warning.setCoilId(coil.getCoilId()); warning.setWarningType("LENGTH"); - warning.setTheoreticalVal(theoreticalLength); - warning.setActualVal(actual); - warning.setAllowDeviation(threshold); - warning.setDeviationValue(actual.subtract(theoreticalLength)); - warning.setDeviationRate(rate.multiply(new BigDecimal("100")).setScale(4, RoundingMode.HALF_UP)); + warning.setTheoreticalVal(theoreticalLength.setScale(3, RoundingMode.HALF_UP)); + warning.setActualVal(actual.setScale(3, RoundingMode.HALF_UP)); + warning.setAllowDeviation(threshold.setScale(3, RoundingMode.HALF_UP)); + warning.setDeviationValue(actual.subtract(theoreticalLength).setScale(3, RoundingMode.HALF_UP)); + warning.setDeviationRate(rate.multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP)); warning.setWarningLevel("WARNING"); - warning.setWarningMsg("钢卷长度偏差超过阈值,理论长度=" + theoreticalLength + "m,实测长度=" + actualLength + "mm"); + warning.setWarningMsg("钢卷长度偏差超过阈值,理论长度=" + theoreticalLength.setScale(3, RoundingMode.HALF_UP) + "m,实测长度=" + actualLength + "mm"); warning.setWarningStatus(0); warnings.add(warning); } @@ -243,15 +243,15 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService WmsMaterialWarning warning = new WmsMaterialWarning(); warning.setCoilId(coil.getCoilId()); warning.setWarningType("THICKNESS"); - warning.setTheoreticalVal(theoreticalThickness); - warning.setActualVal(specThickness); - warning.setAllowDeviation(threshold); - warning.setDeviationValue(specThickness.subtract(theoreticalThickness)); + warning.setTheoreticalVal(theoreticalThickness.setScale(3, RoundingMode.HALF_UP)); + warning.setActualVal(specThickness.setScale(3, RoundingMode.HALF_UP)); + warning.setAllowDeviation(threshold.setScale(3, RoundingMode.HALF_UP)); + warning.setDeviationValue(theoreticalThickness.subtract(specThickness).setScale(3, RoundingMode.HALF_UP)); BigDecimal rate = diff.divide(specThickness, 10, RoundingMode.HALF_UP) - .multiply(new BigDecimal("100")).setScale(4, RoundingMode.HALF_UP); + .multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP); warning.setDeviationRate(rate); warning.setWarningLevel("WARNING"); - warning.setWarningMsg("钢卷厚度偏差超出允许范围,理论厚度=" + theoreticalThickness + "mm,规格厚度=" + specThickness + "mm"); + warning.setWarningMsg("钢卷厚度偏差超出允许范围,理论厚度=" + theoreticalThickness.setScale(3, RoundingMode.HALF_UP) + "mm,规格厚度=" + specThickness.setScale(3, RoundingMode.HALF_UP) + "mm"); warning.setWarningStatus(0); warnings.add(warning); }