优化库存逻辑和单据sku

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -77,12 +77,17 @@ public interface DepotItemMapperEx {
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime);
 
+    DepotItemVo4Stock getSkuStockByParam(
+            @Param("depotId") Long depotId,
+            @Param("meId") Long meId,
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime);
+
     DepotItemVo4Stock getStockByParam(
             @Param("depotId") Long depotId,
             @Param("mId") Long mId,
             @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("tenantId") Long tenantId);
+            @Param("endTime") String endTime);
 
     /**
      * 通过单据主表id查询所有单据子表数据

jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemVo4Stock.java

@@ -5,22 +5,76 @@ import java.math.BigDecimal;
 
 public class DepotItemVo4Stock {
 
-    private BigDecimal inNum;
-    private BigDecimal outNum;
+    private BigDecimal inTotal;
+    private BigDecimal outTotal;
+    private BigDecimal transfInTotal;
+    private BigDecimal transfOutTotal;
+    private BigDecimal assemInTotal;
+    private BigDecimal assemOutTotal;
+    private BigDecimal disAssemInTotal;
+    private BigDecimal disAssemOutTotal;
 
-    public BigDecimal getInNum() {
-        return inNum;
+    public BigDecimal getInTotal() {
+        return inTotal;
     }
 
-    public void setInNum(BigDecimal inNum) {
-        this.inNum = inNum;
+    public void setInTotal(BigDecimal inTotal) {
+        this.inTotal = inTotal;
     }
 
-    public BigDecimal getOutNum() {
-        return outNum;
+    public BigDecimal getOutTotal() {
+        return outTotal;
     }
 
-    public void setOutNum(BigDecimal outNum) {
-        this.outNum = outNum;
+    public void setOutTotal(BigDecimal outTotal) {
+        this.outTotal = outTotal;
+    }
+
+    public BigDecimal getTransfInTotal() {
+        return transfInTotal;
+    }
+
+    public void setTransfInTotal(BigDecimal transfInTotal) {
+        this.transfInTotal = transfInTotal;
+    }
+
+    public BigDecimal getTransfOutTotal() {
+        return transfOutTotal;
+    }
+
+    public void setTransfOutTotal(BigDecimal transfOutTotal) {
+        this.transfOutTotal = transfOutTotal;
+    }
+
+    public BigDecimal getAssemInTotal() {
+        return assemInTotal;
+    }
+
+    public void setAssemInTotal(BigDecimal assemInTotal) {
+        this.assemInTotal = assemInTotal;
+    }
+
+    public BigDecimal getAssemOutTotal() {
+        return assemOutTotal;
+    }
+
+    public void setAssemOutTotal(BigDecimal assemOutTotal) {
+        this.assemOutTotal = assemOutTotal;
+    }
+
+    public BigDecimal getDisAssemInTotal() {
+        return disAssemInTotal;
+    }
+
+    public void setDisAssemInTotal(BigDecimal disAssemInTotal) {
+        this.disAssemInTotal = disAssemInTotal;
+    }
+
+    public BigDecimal getDisAssemOutTotal() {
+        return disAssemOutTotal;
+    }
+
+    public void setDisAssemOutTotal(BigDecimal disAssemOutTotal) {
+        this.disAssemOutTotal = disAssemOutTotal;
     }
 }