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

优化多选商品的库存显示

Browse Source
This commit is contained in:
季圣华
2021-09-21 23:41:09 +08:00
parent 50905f5f29
commit 69e4034457
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -492,7 +492,12 @@ public class MaterialController {
Long depotId = depotObj.getLong("id"); Long depotId = depotObj.getLong("id");
mvo.setDepotId(depotId); mvo.setDepotId(depotId);
//库存 //库存
BigDecimal stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null); BigDecimal stock;
BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
if(skuStock.compareTo(BigDecimal.ZERO)!=0){
stock = skuStock;
} else {
stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
if (mvo.getUnitId()!=null){ if (mvo.getUnitId()!=null){
Unit unit = unitService.getUnit(mvo.getUnitId()); Unit unit = unitService.getUnit(mvo.getUnitId());
if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) { if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) {
@@ -501,6 +506,7 @@ public class MaterialController {
} }
} }
} }
}
mvo.setStock(stock); mvo.setStock(stock);
} }
} }