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

优化收款单

Browse Source
This commit is contained in:
季圣华
2021-06-30 00:53:56 +08:00
parent dc2ba7237c
commit 4e66aeb98b
23 changed files with 693 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
View File

@@ -205,6 +205,12 @@ public class AccountItemService {
String billNo = tempInsertedJson.getString("billNumber");
accountItem.setBillId(depotHeadService.getDepotHead(billNo).getId());
}
if (tempInsertedJson.get("needDebt") != null && !tempInsertedJson.get("needDebt").equals("")) {
accountItem.setNeedDebt(tempInsertedJson.getBigDecimal("needDebt"));
}
if (tempInsertedJson.get("finishDebt") != null && !tempInsertedJson.get("finishDebt").equals("")) {
accountItem.setFinishDebt(tempInsertedJson.getBigDecimal("finishDebt"));
}
if (tempInsertedJson.get("eachAmount") != null && !tempInsertedJson.get("eachAmount").equals("")) {
BigDecimal eachAmount = tempInsertedJson.getBigDecimal("eachAmount");
if (type.equals("付款")) {
@@ -249,4 +255,8 @@ public class AccountItemService {
}
return result;
}
public BigDecimal getEachAmountByBillId(Long billId) {
return accountItemMapperEx.getEachAmountByBillId(billId);
}
}

45
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -3,7 +3,10 @@ package com.jsh.erp.service.depotHead;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample;
import com.jsh.erp.datasource.entities.DepotItem;
import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.DepotHeadMapper;
import com.jsh.erp.datasource.mappers.DepotHeadMapperEx;
import com.jsh.erp.datasource.mappers.DepotItemMapperEx;
@@ -14,6 +17,7 @@ import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.account.AccountService;
import com.jsh.erp.service.accountItem.AccountItemService;
import com.jsh.erp.service.depot.DepotService;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.log.LogService;
@@ -36,7 +40,10 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.jsh.erp.utils.Tools.getCenternTime;
@@ -65,6 +72,8 @@ public class DepotHeadService {
@Resource
private AccountService accountService;
@Resource
private AccountItemService accountItemService;
@Resource
DepotItemMapperEx depotItemMapperEx;
@Resource
private LogService logService;
@@ -685,4 +694,36 @@ public class DepotHeadService {
}
return depotHead;
}
public List<DepotHeadVo4List> debtList(Long organId, String materialParam, String number, String beginTime, String endTime,
String type, String subType, String roleType, String status) {
List<DepotHeadVo4List> resList = new ArrayList<>();
try{
String depotIds = depotService.findDepotStrByCurrentUser();
String [] depotArray=depotIds.split(",");
String [] creatorArray = getCreatorArray(roleType);
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<DepotHeadVo4List> list=depotHeadMapperEx.debtList(organId, type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotArray);
if (null != list) {
for (DepotHeadVo4List dh : list) {
if(dh.getChangeAmount() != null) {
dh.setChangeAmount(dh.getChangeAmount().abs());
}
if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs());
}
if(dh.getOperTime() != null) {
dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
}
dh.setFinishDebt(accountItemService.getEachAmountByBillId(dh.getId()));
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);
}
}
}catch(Exception e){
JshException.readFail(logger, e);
}
return resList;
}
}