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

优化对账单接口，扣除退货单的欠款金额

Browse Source
This commit is contained in:
季圣华
2022-11-20 12:24:08 +08:00
parent 966942741b
commit 6e49ae8404
5 changed files with 124 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -146,6 +146,8 @@ public interface DepotHeadMapperEx {
@Param("supplierType") String supplierType,
@Param("type") String type,
@Param("subType") String subType,
@Param("typeBack") String typeBack,
@Param("subTypeBack") String subTypeBack,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
@@ -156,7 +158,9 @@ public interface DepotHeadMapperEx {
@Param("organArray") String[] organArray,
@Param("supplierType") String supplierType,
@Param("type") String type,
@Param("subType") String subType);
@Param("subType") String subType,
@Param("typeBack") String typeBack,
@Param("subTypeBack") String subTypeBack);
List<DepotHeadVo4StatementAccount> getStatementAccountTotalPay(
@Param("beginTime") String beginTime,
@@ -165,7 +169,9 @@ public interface DepotHeadMapperEx {
@Param("organArray") String[] organArray,
@Param("supplierType") String supplierType,
@Param("type") String type,
@Param("subType") String subType);
@Param("subType") String subType,
@Param("typeBack") String typeBack,
@Param("subTypeBack") String subTypeBack);
BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId,

48
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4StatementAccount.java
View File

@@ -17,18 +17,50 @@ public class DepotHeadVo4StatementAccount {
private String email;
/**
* 起始期初金额
*/
private BigDecimal beginNeed;
/**
* 上期欠款金额
*/
private BigDecimal preDebtMoney;
/**
* 上期退货的欠款金额
*/
private BigDecimal preReturnDebtMoney;
/**
* 上期收付款
*/
private BigDecimal preBackMoney;
/**
* 期初应收
*/
private BigDecimal preNeed;
/**
* 本期欠款
*/
private BigDecimal debtMoney;
/**
* 本期退货的欠款金额
*/
private BigDecimal returnDebtMoney;
/**
* 本期收款
*/
private BigDecimal backMoney;
/**
* 期末应收
*/
private BigDecimal allNeed;
public Long getId() {
@@ -95,6 +127,14 @@ public class DepotHeadVo4StatementAccount {
this.preDebtMoney = preDebtMoney;
}
public BigDecimal getPreReturnDebtMoney() {
return preReturnDebtMoney;
}
public void setPreReturnDebtMoney(BigDecimal preReturnDebtMoney) {
this.preReturnDebtMoney = preReturnDebtMoney;
}
public BigDecimal getPreBackMoney() {
return preBackMoney;
}
@@ -119,6 +159,14 @@ public class DepotHeadVo4StatementAccount {
this.debtMoney = debtMoney;
}
public BigDecimal getReturnDebtMoney() {
return returnDebtMoney;
}
public void setReturnDebtMoney(BigDecimal returnDebtMoney) {
this.returnDebtMoney = returnDebtMoney;
}
public BigDecimal getBackMoney() {
return backMoney;
}