From da526fa89aa76f5d6e0853e7c8a65eb0f32addea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 24 May 2022 20:49:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=9A=84?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=B1=95=E7=A4=BA=E5=92=8C=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/service/material/MaterialService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 6c6228d0..51cd9c5b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -132,7 +132,7 @@ public class MaterialService { Map currentStockMap = getCurrentStockMapByMaterialList(list); for (MaterialVo4Unit m : list) { m.setMaterialOther(getMaterialOtherByParam(mpArr, m)); - m.setStock(currentStockMap.get(m.getId())); + m.setStock(currentStockMap.get(m.getId())!=null? currentStockMap.get(m.getId()): BigDecimal.ZERO); resList.add(m); } } @@ -182,7 +182,7 @@ public class MaterialService { highSafeStock = jsonObj.getBigDecimal("highSafeStock"); } Long depotId = jsonObj.getLong("id"); - if(StringUtil.isNotEmpty(number) && Double.valueOf(number)>0 || lowSafeStock!=null || highSafeStock!=null) { + if(StringUtil.isNotEmpty(number) && Double.parseDouble(number)>0 || lowSafeStock!=null || highSafeStock!=null) { insertInitialStockByMaterialAndDepot(depotId, mId, parseBigDecimalEx(number), lowSafeStock, highSafeStock); insertCurrentStockByMaterialAndDepot(depotId, mId, parseBigDecimalEx(number)); } @@ -233,7 +233,7 @@ public class MaterialService { MaterialInitialStockExample example = new MaterialInitialStockExample(); example.createCriteria().andMaterialIdEqualTo(material.getId()).andDepotIdEqualTo(depotId); materialInitialStockMapper.deleteByExample(example); - if (StringUtil.isNotEmpty(number) && Double.parseDouble(number) != 0 || lowSafeStock!=null || highSafeStock!=null) { + if (StringUtil.isNotEmpty(number) || lowSafeStock!=null || highSafeStock!=null) { insertInitialStockByMaterialAndDepot(depotId, material.getId(), parseBigDecimalEx(number), lowSafeStock, highSafeStock); } //更新当前库存