优化商品的库存明细

src/main/java/com/jsh/erp/controller/DepotController.java

@@ -199,9 +199,12 @@ public class DepotController {
                 DepotEx de = new DepotEx();
                 if(mId!=0) {
                     BigDecimal stock = materialService.getInitStock(mId, depot.getId());
+                    BigDecimal currentStock = materialService.getCurrentStock(mId, depot.getId());
                     de.setStock(stock);
+                    de.setAllStock(stock.add(currentStock));
                 } else {
                     de.setStock(BigDecimal.ZERO);
+                    de.setAllStock(BigDecimal.ZERO);
                 }
                 de.setId(depot.getId());
                 de.setName(depot.getName());

src/main/java/com/jsh/erp/datasource/entities/DepotEx.java

@@ -17,4 +17,6 @@ public class DepotEx extends Depot{
 
     private BigDecimal stock;
 
+    private BigDecimal allStock;
+
 }

src/main/java/com/jsh/erp/service/material/MaterialService.java

@@ -60,6 +60,8 @@ public class MaterialService {
     @Resource
     private MaterialInitialStockMapper materialInitialStockMapper;
     @Resource
+    private MaterialCurrentStockMapper materialCurrentStockMapper;
+    @Resource
     private DepotService depotService;
     @Resource
     private MaterialExtendService materialExtendService;
@@ -704,7 +706,7 @@ public class MaterialService {
     }
 
     /**
-     * 根据产品和仓库获取初始库存
+     * 根据商品和仓库获取初始库存
      * @param materialId
      * @param depotId
      * @return
@@ -722,7 +724,7 @@ public class MaterialService {
     }
 
     /**
-     * 根据产品获取初始库存
+     * 根据商品获取初始库存
      * @param materialId
      * @return
      */
@@ -747,6 +749,24 @@ public class MaterialService {
         return stock;
     }
 
+    /**
+     * 根据商品和仓库获取当前库存
+     * @param materialId
+     * @param depotId
+     * @return
+     */
+    public BigDecimal getCurrentStock(Long materialId, Long depotId) {
+        BigDecimal stock = BigDecimal.ZERO;
+        MaterialCurrentStockExample example = new MaterialCurrentStockExample();
+        example.createCriteria().andMaterialIdEqualTo(materialId).andDepotIdEqualTo(depotId)
+                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<MaterialCurrentStock> list = materialCurrentStockMapper.selectByExample(example);
+        if(list!=null && list.size()>0) {
+            stock = list.get(0).getCurrentNumber();
+        }
+        return stock;
+    }
+
     public List<MaterialVo4Unit> getMaterialByMeId(Long meId) {
         List<MaterialVo4Unit> result = new ArrayList<MaterialVo4Unit>();
         try{