优化商品模块的库存统计

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

@@ -10,7 +10,7 @@ public class MaterialVo4Unit extends Material{
 
     private String materialOther;
 
-    private Long stock;
+    private BigDecimal stock;
 
     public String getUnitName() {
         return unitName;
@@ -36,11 +36,11 @@ public class MaterialVo4Unit extends Material{
         this.materialOther = materialOther;
     }
 
-    public Long getStock() {
+    public BigDecimal getStock() {
         return stock;
     }
 
-    public void setStock(Long stock) {
+    public void setStock(BigDecimal stock) {
         this.stock = stock;
     }
 }

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -36,12 +36,6 @@ public interface DepotItemMapperEx {
     Long findDetailByTypeAndMaterialIdCounts(
             @Param("mId") Long mId);
 
-    Long findByTypeAndMaterialIdIn(
-            @Param("mId") Long mId);
-
-    Long findByTypeAndMaterialIdOut(
-            @Param("mId") Long mId);
-
     List<DepotItemVo4WithInfoEx> getDetailList(
             @Param("headerId") Long headerId);
 
@@ -77,12 +71,10 @@ public interface DepotItemMapperEx {
             @Param("tenantId") Long tenantId);
 
     /**
-     * create by: cjl
-     * description:
-     *  通过单据主表id查询所有单据子表数据
-     * create time: 2019/1/24 16:56
-     * @Param: depotheadId
-     * @return java.util.List<com.jsh.erp.datasource.entities.DepotItem>
+     * 通过单据主表id查询所有单据子表数据
+     * @param depotheadId
+     * @param enableSerialNumber
+     * @return
      */
      List<DepotItem> findDepotItemListBydepotheadId(@Param("depotheadId")Long depotheadId,
                                                     @Param("enableSerialNumber")String enableSerialNumber);
@@ -103,7 +95,6 @@ public interface DepotItemMapperEx {
 
     List<DepotItem> getDepotItemListListByMaterialIds(@Param("materialIds") String[] materialIds);
 
-
     List<DepotItemStockWarningCount> findStockWarningCount(@Param("offset") Integer offset,
                                                            @Param("rows") Integer rows, @Param("pid") Integer pid);
 

src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

@@ -215,20 +215,6 @@ public class DepotItemService {
         return result;
     }
 
-    public Long findByTypeAndMaterialId(String type, Long mId) throws Exception{
-        Long result = 0l;
-        try{
-            if(type.equals(TYPE)) {
-                result= depotItemMapperEx.findByTypeAndMaterialIdIn(mId);
-            } else {
-                result= depotItemMapperEx.findByTypeAndMaterialIdOut(mId);
-            }
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return result;
-    }
-
     public List<DepotItemVo4WithInfoEx> getDetailList(Long headerId)throws Exception {
         List<DepotItemVo4WithInfoEx> list =null;
         try{

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

@@ -100,9 +100,8 @@ public class MaterialService {
                     }
                 }
                 m.setMaterialOther(materialOther);
-                Long InSum = depotItemService.findByTypeAndMaterialId("入库", m.getId());
-                Long OutSum = depotItemService.findByTypeAndMaterialId("出库", m.getId());
-                m.setStock(InSum - OutSum);
+                Long tenantId = m.getTenantId();
+                m.setStock(depotItemService.getStockByParam(null,m.getId(),null,null,tenantId));
                 resList.add(m);
             }
         }