purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化首页

Browse Source
This commit is contained in:
季圣华
2020-08-30 22:19:01 +08:00
parent 6d7c44d3fe
commit 57d8b1c987
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -426,7 +426,7 @@ public class DepotHeadController {
}
/**
* 统计今日销售额、本月销售额、本月进货额
* 统计今日销售额、今日进货额、本月销售额、本月进货额
* @param request
* @return
*/
@@ -441,6 +441,8 @@ public class DepotHeadController {
1, today, getNow3()); //今日销售出库
BigDecimal todayRetailSale = depotHeadService.getBuyAndSaleRetailStatistics("出库", "零售",
0, today, getNow3()); //今日零售出库
BigDecimal todayBuy = depotHeadService.getBuyAndSaleStatistics("入库", "采购",
1, today, getNow3()); //今日采购入库
BigDecimal monthSale = depotHeadService.getBuyAndSaleStatistics("出库", "销售",
1,firstDay, getNow3()); //本月销售出库
BigDecimal monthRetailSale = depotHeadService.getBuyAndSaleRetailStatistics("出库", "零售",
@@ -448,6 +450,7 @@ public class DepotHeadController {
BigDecimal monthBuy = depotHeadService.getBuyAndSaleStatistics("入库", "采购",
1, firstDay, getNow3()); //本月采购入库
map.put("todaySale", todaySale.add(todayRetailSale));
map.put("todayBuy", todayBuy);
map.put("thisMonthSale", monthSale.add(monthRetailSale));
map.put("thisMonthBuy", monthBuy);
res.code = 200;