From cb2a82b17b4c9a2ab94cc264980c50d691c794b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 14 May 2023 21:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E8=BF=94=E5=9B=9Enull=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/controller/MaterialController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 d379d19a..6b7aacd8 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 @@ -579,9 +579,9 @@ public class MaterialController { int total = materialService.getListWithStockCount(depotList, idList, StringUtil.toNull(materialParam), zeroStock); MaterialVo4Unit materialVo4Unit= materialService.getTotalStockAndPrice(depotList, idList, StringUtil.toNull(materialParam)); map.put("total", total); - map.put("currentStock", materialVo4Unit.getCurrentStock()); - map.put("currentStockPrice", materialVo4Unit.getCurrentStockPrice()); - map.put("currentWeight", materialVo4Unit.getCurrentWeight()); + map.put("currentStock", materialVo4Unit.getCurrentStock()!=null?materialVo4Unit.getCurrentStock():BigDecimal.ZERO); + map.put("currentStockPrice", materialVo4Unit.getCurrentStockPrice()!=null?materialVo4Unit.getCurrentStockPrice():BigDecimal.ZERO); + map.put("currentWeight", materialVo4Unit.getCurrentWeight()!=null?materialVo4Unit.getCurrentWeight():BigDecimal.ZERO); map.put("rows", dataList); res.code = 200; res.data = map;