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

给进销存统计报表增加商品类别的筛选参数

Browse Source
This commit is contained in:
季圣华
2023-05-14 18:05:28 +08:00
parent fbdfdd73ed
commit 6594130333
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -324,6 +324,7 @@ public class DepotItemController {
public BaseResponseInfo findByAll(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam(value = "depotIds",required = false) String depotIds,
@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam("monthTime") String monthTime,
@RequestParam("materialParam") String materialParam,
@RequestParam("mpList") String mpList,
@@ -331,13 +332,17 @@ public class DepotItemController {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<>();
try {
List<Long> categoryIdList = new ArrayList<>();
if(categoryId != null){
categoryIdList = materialService.getListByParentId(categoryId);
}
String timeA = Tools.firstDayOfMonth(monthTime) + BusinessConstants.DAY_FIRST_TIME;
String timeB = Tools.lastDayOfMonth(monthTime) + BusinessConstants.DAY_LAST_TIME;
List<Long> depotList = parseListByDepotIds(depotIds);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(StringUtil.toNull(materialParam),
timeB,(currentPage-1)*pageSize, pageSize);
categoryIdList, timeB,(currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(",");
int total = depotItemService.findByAllCount(StringUtil.toNull(materialParam), timeB);
int total = depotItemService.findByAllCount(StringUtil.toNull(materialParam), categoryIdList, timeB);
map.put("total", total);
//存放数据json数组
JSONArray dataArray = new JSONArray();
@@ -396,21 +401,28 @@ public class DepotItemController {
@GetMapping(value = "/totalCountMoney")
@ApiOperation(value = "统计总计金额")
public BaseResponseInfo totalCountMoney(@RequestParam(value = "depotIds",required = false) String depotIds,
@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam("monthTime") String monthTime,
@RequestParam("materialParam") String materialParam,
HttpServletRequest request) throws Exception{
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<>();
try {
List<Long> categoryIdList = new ArrayList<>();
if(categoryId != null){
categoryIdList = materialService.getListByParentId(categoryId);
}
String endTime = Tools.lastDayOfMonth(monthTime) + BusinessConstants.DAY_LAST_TIME;
List<Long> depotList = parseListByDepotIds(depotIds);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(StringUtil.toNull(materialParam),
endTime, null, null);
categoryIdList, endTime, null, null);
BigDecimal thisAllStock = BigDecimal.ZERO;
BigDecimal thisAllPrice = BigDecimal.ZERO;
if (null != dataList) {
for (DepotItemVo4WithInfoEx diEx : dataList) {
Long mId = diEx.getMId();
BigDecimal thisSum = depotItemService.getStockByParamWithDepotList(depotList,mId,null,endTime);
thisAllStock = thisAllStock.add(thisSum);
BigDecimal unitPrice = diEx.getPurchaseDecimal();
if(unitPrice == null) {
unitPrice = BigDecimal.ZERO;
@@ -418,6 +430,7 @@ public class DepotItemController {
thisAllPrice = thisAllPrice.add(thisSum.multiply(unitPrice));
}
}
map.put("totalStock", thisAllStock);
map.put("totalCount", thisAllPrice);
res.code = 200;
res.data = map;

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

@@ -56,12 +56,14 @@ public interface DepotItemMapperEx {
List<DepotItemVo4WithInfoEx> findByAll(
@Param("materialParam") String materialParam,
@Param("categoryIdList") List<Long> categoryIdList,
@Param("endTime") String endTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("materialParam") String materialParam,
@Param("categoryIdList") List<Long> categoryIdList,
@Param("endTime") String endTime);
List<DepotItemVo4WithInfoEx> getListWithBugOrSale(

8
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -299,20 +299,20 @@ public class DepotItemService {
return list;
}
public List<DepotItemVo4WithInfoEx> findByAll(String materialParam, String endTime, Integer offset, Integer rows)throws Exception {
public List<DepotItemVo4WithInfoEx> findByAll(String materialParam, List<Long> categoryIdList, String endTime, Integer offset, Integer rows)throws Exception {
List<DepotItemVo4WithInfoEx> list =null;
try{
list = depotItemMapperEx.findByAll(materialParam, endTime, offset, rows);
list = depotItemMapperEx.findByAll(materialParam, categoryIdList, endTime, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public int findByAllCount(String materialParam, String endTime)throws Exception {
public int findByAllCount(String materialParam, List<Long> categoryIdList, String endTime)throws Exception {
int result=0;
try{
result = depotItemMapperEx.findByAllCount(materialParam, endTime);
result = depotItemMapperEx.findByAllCount(materialParam, categoryIdList, endTime);
}catch(Exception e){
JshException.readFail(logger, e);
}