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

增加-供应商对账报表

Browse Source
This commit is contained in:
季圣华
2017-10-29 23:46:13 +08:00
parent 2f14504b2a
commit f432351937
7 changed files with 383 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View File

@@ -749,8 +749,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
String beginTime = model.getBeginTime();
String endTime = model.getEndTime();
Long organId = model.getOrganId();
String supType = model.getSupType(); //单位类型：客户、供应商
int j = 1;
if(supType.equals("客户")){ //客户
j = 1;
}
else if(supType.equals("供应商")){ //供应商
j = -1;
}
try{
depotHeadService.findStatementAccount(pageUtil, beginTime, endTime, organId);
depotHeadService.findStatementAccount(pageUtil, beginTime, endTime, organId, supType);
List dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
@@ -805,7 +813,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
}
item.put("discountLastMoney", p1); //金额
item.put("changeAmount", p2); //金额
item.put("allPrice", String .format("%.2f",allPrice)); //计算后的金额
item.put("allPrice", String .format("%.2f",allPrice*j)); //计算后的金额
item.put("supplierName", arr[4]); //供应商
item.put("operTime", arr[5]); //入库出库日期
dataArray.add(item);