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

给出入库明细接口增加税率和税额字段

Browse Source
This commit is contained in:
季圣华
2022-08-25 22:24:35 +08:00
parent 57de1c4d93
commit a10fabb7ef
5 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -126,9 +126,9 @@ public class DepotHeadController {
String [] organArray = depotHeadService.getOrganArray(subType, "");
beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, creatorArray, organArray,
List<DepotHeadVo4InDetail> list = depotHeadService.findInDetail(beginTime, endTime, type, creatorArray, organArray,
StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findByAllCount(beginTime, endTime, type, creatorArray, organArray,
int total = depotHeadService.findInDetailCount(beginTime, endTime, type, creatorArray, organArray,
StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark);
map.put("total", total);
//存放数据json数组