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

优化进销存统计接口

Browse Source
This commit is contained in:
季圣华
2021-12-07 00:26:08 +08:00
parent f7014987b2
commit e7d7666b3d
5 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -762,15 +762,16 @@ public class MaterialService {
}
/**
* 根据商品获取初始库存，仓库为空的时候查全部库存
* 根据商品获取初始库存-多仓库
* @param depotList
* @param materialId
* @return
*/
public BigDecimal getInitStockByMid(Long depotId, Long materialId) {
public BigDecimal getInitStockByMidAndDepotList(List<Long> depotList, Long materialId) {
BigDecimal stock = BigDecimal.ZERO;
MaterialInitialStockExample example = new MaterialInitialStockExample();
if(depotId!=null) {
example.createCriteria().andMaterialIdEqualTo(materialId).andDepotIdEqualTo(depotId)
if(depotList!=null && depotList.size()>0) {
example.createCriteria().andMaterialIdEqualTo(materialId).andDepotIdIn(depotList)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else {
example.createCriteria().andMaterialIdEqualTo(materialId)