purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给金额为null的时候赋值0

Browse Source
This commit is contained in:
季圣华
2023-03-09 22:32:03 +08:00
parent e0bf75d6a6
commit ca1c6e13ef
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -146,6 +146,8 @@ public class DepotHeadService {
} }
if(dh.getChangeAmount() != null) { if(dh.getChangeAmount() != null) {
dh.setChangeAmount(dh.getChangeAmount().abs()); dh.setChangeAmount(dh.getChangeAmount().abs());
} else {
dh.setChangeAmount(BigDecimal.ZERO);
} }
if(dh.getTotalPrice() != null) { if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs()); dh.setTotalPrice(dh.getTotalPrice().abs());

2
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -1115,7 +1115,7 @@ public class MaterialService {
List<MaterialVo4Unit> dataList = materialMapperEx.getListWithStock(depotList, idList, materialParam, zeroStock, column, order, offset, rows); List<MaterialVo4Unit> dataList = materialMapperEx.getListWithStock(depotList, idList, materialParam, zeroStock, column, order, offset, rows);
for(MaterialVo4Unit item: dataList) { for(MaterialVo4Unit item: dataList) {
item.setUnitName(null!=item.getUnitId()?item.getUnitName() + "[多单位]":item.getUnitName()); item.setUnitName(null!=item.getUnitId()?item.getUnitName() + "[多单位]":item.getUnitName());
item.setInitialStock(initialStockMap.get(item.getId())); item.setInitialStock(null!=initialStockMap.get(item.getId())?initialStockMap.get(item.getId()):BigDecimal.ZERO);
item.setBigUnitStock(getBigUnitStock(item.getCurrentStock(), item.getUnitId())); item.setBigUnitStock(getBigUnitStock(item.getCurrentStock(), item.getUnitId()));
} }
return dataList; return dataList;