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

优化客户和供应商的对账单

Browse Source
This commit is contained in:
季圣华
2021-07-08 00:11:56 +08:00
parent a4cf56d631
commit 1149ada422
8 changed files with 91 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View File

@@ -99,7 +99,9 @@ public class AccountHeadService {
if(ah.getTotalPrice() != null) {
ah.setTotalPrice(ah.getTotalPrice().abs());
}
ah.setBillTimeStr(getCenternTime(ah.getBillTime()));
if(ah.getBillTime() !=null) {
ah.setBillTimeStr(getCenternTime(ah.getBillTime()));
}
resList.add(ah);
}
}
@@ -308,9 +310,9 @@ public class AccountHeadService {
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (("customer").equals(supType)) { //客户
if (("客户").equals(supType)) { //客户
i = 1;
} else if (("vendor").equals(supType)) { //供应商
} else if (("供应商").equals(supType)) { //供应商
i = -1;
}
//收付款部分