合并商品的库存到商品列表接口一起查询

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

@@ -10,6 +10,8 @@ public class MaterialVo4Unit extends Material{
 
     private String materialOther;
 
+    private Long stock;
+
     public String getUnitName() {
         return unitName;
     }
@@ -33,4 +35,12 @@ public class MaterialVo4Unit extends Material{
     public void setMaterialOther(String materialOther) {
         this.materialOther = materialOther;
     }
+
+    public Long getStock() {
+        return stock;
+    }
+
+    public void setStock(Long stock) {
+        this.stock = stock;
+    }
 }

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

@@ -45,10 +45,10 @@ public interface DepotItemMapperEx {
             @Param("mId") Long mId,
             @Param("monthTime") String monthTime);
 
-    int findByTypeAndMaterialIdIn(
+    Long findByTypeAndMaterialIdIn(
             @Param("mId") Long mId);
 
-    int findByTypeAndMaterialIdOut(
+    Long findByTypeAndMaterialIdOut(
             @Param("mId") Long mId);
 
     int findByTypeAndDepotIdAndMaterialIdIn(