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-11 00:33:54 +08:00
parent 1fa7107491
commit 364af45c7c
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,6 +161,7 @@ public class DepotItemController {
public BaseResponseInfo getDetailList(@RequestParam("headerId") Long headerId, public BaseResponseInfo getDetailList(@RequestParam("headerId") Long headerId,
@RequestParam("mpList") String mpList, @RequestParam("mpList") String mpList,
@RequestParam(value = "linkType", required = false) String linkType, @RequestParam(value = "linkType", required = false) String linkType,
@RequestParam(value = "isReadOnly", required = false) String isReadOnly,
HttpServletRequest request)throws Exception { HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
try { try {
@@ -174,6 +175,10 @@ public class DepotItemController {
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if (null != dataList) { if (null != dataList) {
BigDecimal totalOperNumber = BigDecimal.ZERO;
BigDecimal totalAllPrice = BigDecimal.ZERO;
BigDecimal totalTaxMoney = BigDecimal.ZERO;
BigDecimal totalTaxLastMoney = BigDecimal.ZERO;
for (DepotItemVo4WithInfoEx diEx : dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("id", diEx.getId()); item.put("id", diEx.getId());
@@ -223,6 +228,19 @@ public class DepotItemController {
item.put("mType", diEx.getMaterialType()); item.put("mType", diEx.getMaterialType());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
//合计数据汇总
totalOperNumber = totalOperNumber.add(diEx.getOperNumber()==null?BigDecimal.ZERO:diEx.getOperNumber());
totalAllPrice = totalAllPrice.add(diEx.getAllPrice()==null?BigDecimal.ZERO:diEx.getAllPrice());
totalTaxMoney = totalTaxMoney.add(diEx.getTaxMoney()==null?BigDecimal.ZERO:diEx.getTaxMoney());
totalTaxLastMoney = totalTaxLastMoney.add(diEx.getTaxLastMoney()==null?BigDecimal.ZERO:diEx.getTaxLastMoney());
}
if(StringUtil.isNotEmpty(isReadOnly) && "1".equals(isReadOnly)) {
JSONObject footItem = new JSONObject();
footItem.put("operNumber", totalOperNumber);
footItem.put("allPrice", totalAllPrice);
footItem.put("taxMoney", totalTaxMoney);
footItem.put("taxLastMoney", totalTaxLastMoney);
dataArray.add(footItem);
} }
} }
outer.put("rows", dataArray); outer.put("rows", dataArray);