diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index a46251b2..49bdd703 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -479,11 +479,11 @@ public class DepotHeadController { String firstDay = Tools.getCurrentMonth() + "-01 00:00:00"; BigDecimal todaySale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", 1, today, getNow3()); //今日销售出库 - BigDecimal todayRetailSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", + BigDecimal todayRetailSale = depotHeadService.getBuyAndSaleRetailStatistics("出库", "零售", 0, today, getNow3()); //今日零售出库 BigDecimal monthSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", 1,firstDay, getNow3()); //本月销售出库 - BigDecimal monthRetailSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售", + BigDecimal monthRetailSale = depotHeadService.getBuyAndSaleRetailStatistics("出库", "零售", 0,firstDay, getNow3()); //本月零售出库 BigDecimal monthBuy = depotHeadService.getBuyAndSaleStatistics("入库", "采购", 1, firstDay, getNow3()); //本月采购入库 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 210e27bc..65ae87c6 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -125,4 +125,11 @@ public interface DepotHeadMapperEx { @Param("hasSupplier") Integer hasSupplier, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + BigDecimal getBuyAndSaleRetailStatistics( + @Param("type") String type, + @Param("subType") String subType, + @Param("hasSupplier") Integer hasSupplier, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime); } diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index e5fb636b..5bd6f438 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -642,4 +642,8 @@ public class DepotHeadService { public BigDecimal getBuyAndSaleStatistics(String type, String subType, Integer hasSupplier, String beginTime, String endTime) { return depotHeadMapperEx.getBuyAndSaleStatistics(type, subType, hasSupplier, beginTime, endTime); } + + public BigDecimal getBuyAndSaleRetailStatistics(String type, String subType, Integer hasSupplier, String beginTime, String endTime) { + return depotHeadMapperEx.getBuyAndSaleRetailStatistics(type, subType, hasSupplier, beginTime, endTime); + } } diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index d222bf83..f4078ebb 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -424,4 +424,30 @@ and ifnull(delete_Flag,'0') !='1' + + \ No newline at end of file