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

完善根据原单号查询关联的单据列表的方法逻辑

Browse Source
This commit is contained in:
季圣华
2023-12-06 23:25:51 +08:00
parent e8a3f14c71
commit 7b8bdc0410
1 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -877,7 +877,7 @@ public class DepotHeadService {
public List<DepotHead> getBillListByLinkNumberList(List<String> linkNumberList)throws Exception { public List<DepotHead> getBillListByLinkNumberList(List<String> linkNumberList)throws Exception {
if(linkNumberList!=null && linkNumberList.size()>0) { if(linkNumberList!=null && linkNumberList.size()>0) {
DepotHeadExample example = new DepotHeadExample(); DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andLinkNumberIn(linkNumberList).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andLinkNumberIn(linkNumberList).andSubTypeLike("退货").andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
return depotHeadMapper.selectByExample(example); return depotHeadMapper.selectByExample(example);
} else { } else {
return new ArrayList<>(); return new ArrayList<>();
@@ -892,19 +892,7 @@ public class DepotHeadService {
*/ */
public List<DepotHead> getBillListByLinkNumber(String linkNumber)throws Exception { public List<DepotHead> getBillListByLinkNumber(String linkNumber)throws Exception {
DepotHeadExample example = new DepotHeadExample(); DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andLinkNumberEqualTo(linkNumber).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andLinkNumberEqualTo(linkNumber).andSubTypeLike("退货").andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
return depotHeadMapper.selectByExample(example);
}
/**
* 根据原单号查询关联的单据列表(排除当前的单据编号)
* @param linkNumber
* @return
* @throws Exception
*/
public List<DepotHead> getBillListByLinkNumberExceptNumber(String linkNumber, String number)throws Exception {
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andLinkNumberEqualTo(linkNumber).andNumberNotEqualTo(number).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
return depotHeadMapper.selectByExample(example); return depotHeadMapper.selectByExample(example);
} }
@@ -1102,38 +1090,6 @@ public class DepotHeadService {
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
} }
/**
* 退货单对应的原单实际欠款（这里面要除去收付款的金额）
* @param linkNumber 原单单号
* @param number 当前单号
* @return
*/
public BigDecimal getOriginalRealDebt(String linkNumber, String number) throws Exception {
DepotHead depotHead = getDepotHead(linkNumber);
BigDecimal discountLastMoney = depotHead.getDiscountLastMoney()!=null?depotHead.getDiscountLastMoney():BigDecimal.ZERO;
BigDecimal otherMoney = depotHead.getOtherMoney()!=null?depotHead.getOtherMoney():BigDecimal.ZERO;
BigDecimal deposit = depotHead.getDeposit()!=null?depotHead.getDeposit():BigDecimal.ZERO;
BigDecimal changeAmount = depotHead.getChangeAmount()!=null?depotHead.getChangeAmount().abs():BigDecimal.ZERO;
//原单欠款
BigDecimal debt = discountLastMoney.add(otherMoney).subtract((deposit.add(changeAmount)));
//完成欠款
BigDecimal finishDebt = accountItemService.getEachAmountByBillId(depotHead.getId());
finishDebt = finishDebt!=null?finishDebt:BigDecimal.ZERO;
//原单对应的退货单欠款(总数)
List<DepotHead> billList = getBillListByLinkNumberExceptNumber(linkNumber, number);
BigDecimal allBillDebt = BigDecimal.ZERO;
for(DepotHead dh: billList) {
BigDecimal billDiscountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO;
BigDecimal billOtherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO;
BigDecimal billDeposit = dh.getDeposit()!=null?dh.getDeposit():BigDecimal.ZERO;
BigDecimal billChangeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount().abs():BigDecimal.ZERO;
BigDecimal billDebt = billDiscountLastMoney.add(billOtherMoney).subtract((billDeposit.add(billChangeAmount)));
allBillDebt = allBillDebt.add(billDebt);
}
//原单实际欠款
return debt.subtract(finishDebt).subtract(allBillDebt);
}
public Map<String, Object> getBuyAndSaleStatistics(String today, String monthFirstDay, String yesterdayBegin, String yesterdayEnd, public Map<String, Object> getBuyAndSaleStatistics(String today, String monthFirstDay, String yesterdayBegin, String yesterdayEnd,
String yearBegin, String yearEnd, HttpServletRequest request) throws Exception { String yearBegin, String yearEnd, HttpServletRequest request) throws Exception {
Long userId = userService.getUserId(request); Long userId = userService.getUserId(request);