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-04 21:50:37 +08:00
parent 747d743838
commit 923cc423de
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,8 +162,9 @@ public class DepotHeadService {
//欠款计算 //欠款计算
BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO; BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO;
BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO; BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO;
BigDecimal deposit = dh.getDeposit()!=null?dh.getDeposit():BigDecimal.ZERO;
BigDecimal changeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount():BigDecimal.ZERO; BigDecimal changeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount():BigDecimal.ZERO;
dh.setDebt(discountLastMoney.add(otherMoney).subtract((dh.getDeposit().add(changeAmount)))); dh.setDebt(discountLastMoney.add(otherMoney).subtract((deposit.add(changeAmount))));
//是否有付款单或收款单 //是否有付款单或收款单
if(financialBillNoMap!=null) { if(financialBillNoMap!=null) {
Integer financialBillNoSize = financialBillNoMap.get(dh.getId()); Integer financialBillNoSize = financialBillNoMap.get(dh.getId());
@@ -729,7 +730,7 @@ public class DepotHeadService {
Map<Long,Integer> financialBillNoMap = getFinancialBillNoMapByBillIdList(idList); Map<Long,Integer> financialBillNoMap = getFinancialBillNoMapByBillIdList(idList);
Map<String,Integer> billSizeMap = getBillSizeMapByLinkNumberList(numberList); Map<String,Integer> billSizeMap = getBillSizeMapByLinkNumberList(numberList);
Map<Long,String> materialsListMap = findMaterialsListMapByHeaderIdList(idList); Map<Long,String> materialsListMap = findMaterialsListMapByHeaderIdList(idList);
for (DepotHeadVo4List dh : list) { DepotHeadVo4List dh = list.get(0);
if(accountMap!=null && StringUtil.isNotEmpty(dh.getAccountIdList()) && StringUtil.isNotEmpty(dh.getAccountMoneyList())) { if(accountMap!=null && StringUtil.isNotEmpty(dh.getAccountIdList()) && StringUtil.isNotEmpty(dh.getAccountMoneyList())) {
String accountStr = accountService.getAccountStrByIdAndMoney(accountMap, dh.getAccountIdList(), dh.getAccountMoneyList()); String accountStr = accountService.getAccountStrByIdAndMoney(accountMap, dh.getAccountIdList(), dh.getAccountMoneyList());
dh.setAccountName(accountStr); dh.setAccountName(accountStr);
@@ -748,6 +749,12 @@ public class DepotHeadService {
if(dh.getTotalPrice() != null) { if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs()); dh.setTotalPrice(dh.getTotalPrice().abs());
} }
//欠款计算
BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO;
BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO;
BigDecimal deposit = dh.getDeposit()!=null?dh.getDeposit():BigDecimal.ZERO;
BigDecimal changeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount():BigDecimal.ZERO;
dh.setDebt(discountLastMoney.add(otherMoney).subtract((deposit.add(changeAmount))));
//是否有付款单或收款单 //是否有付款单或收款单
if(financialBillNoMap!=null) { if(financialBillNoMap!=null) {
Integer financialBillNoSize = financialBillNoMap.get(dh.getId()); Integer financialBillNoSize = financialBillNoMap.get(dh.getId());
@@ -771,7 +778,6 @@ public class DepotHeadService {
dh.setCreatorName(userService.getUser(dh.getCreator()).getUsername()); dh.setCreatorName(userService.getUser(dh.getCreator()).getUsername());
resList.add(dh); resList.add(dh);
} }
}
}catch(Exception e){ }catch(Exception e){
JshException.readFail(logger, e); JshException.readFail(logger, e);
} }