From 896788707c3f04fb85a8faa3f37b5865c0215710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 1 Apr 2023 16:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=A4=9A=E5=8D=95=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=8E=BB=E9=99=A4=E6=9C=AB=E5=B0=BE=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=840?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/MaterialController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index 0e76a4ee..c1ddde8f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -234,14 +234,14 @@ public class MaterialController { if(commodityUnit.equals(unit.getBasicUnit())) { ratioStr = "[基本]"; } - if(commodityUnit.equals(unit.getOtherUnit())) { - ratioStr = "[" + unit.getRatio() + unit.getBasicUnit() + "]"; + if(commodityUnit.equals(unit.getOtherUnit()) && unit.getRatio()!=null) { + ratioStr = "[" + unit.getRatio().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]"; } - if(commodityUnit.equals(unit.getOtherUnitTwo())) { - ratioStr = "[" + unit.getRatioTwo() + unit.getBasicUnit() + "]"; + if(commodityUnit.equals(unit.getOtherUnitTwo()) && unit.getRatioTwo()!=null) { + ratioStr = "[" + unit.getRatioTwo().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]"; } - if(commodityUnit.equals(unit.getOtherUnitThree())) { - ratioStr = "[" + unit.getRatioThree() + unit.getBasicUnit() + "]"; + if(commodityUnit.equals(unit.getOtherUnitThree()) && unit.getRatioThree()!=null) { + ratioStr = "[" + unit.getRatioThree().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]"; } } item.put("mBarCode", material.getmBarCode());