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

优化供应商和会员导出功能（重新计算期末金额）

Browse Source
This commit is contained in:
季圣华
2021-11-29 23:36:40 +08:00
parent de6892d8c8
commit 912e578118
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
View File

@@ -552,6 +552,27 @@ public class SupplierService {
List<String[]> objects = new ArrayList<String[]>(); List<String[]> objects = new ArrayList<String[]>();
if (null != dataList) { if (null != dataList) {
for (Supplier s : dataList) { for (Supplier s : dataList) {
Integer supplierId = s.getId().intValue();
String endTime = getNow3();
String supType = s.getType();
BigDecimal sum = BigDecimal.ZERO;
BigDecimal beginNeedGet = s.getBeginNeedGet();
if(beginNeedGet==null) {
beginNeedGet = BigDecimal.ZERO;
}
BigDecimal beginNeedPay = s.getBeginNeedPay();
if(beginNeedPay==null) {
beginNeedPay = BigDecimal.ZERO;
}
sum = sum.add(depotHeadService.findTotalPay(supplierId, endTime, supType))
.subtract(accountHeadService.findTotalPay(supplierId, endTime, supType));
if(("客户").equals(s.getType())) {
sum = sum.add(beginNeedGet);
s.setAllNeedGet(sum);
} else if(("供应商").equals(s.getType())) {
sum = sum.add(beginNeedPay);
s.setAllNeedPay(sum);
}
String[] objs = new String[15]; String[] objs = new String[15];
objs[0] = s.getSupplier(); objs[0] = s.getSupplier();
objs[1] = s.getContacts(); objs[1] = s.getContacts();
@@ -559,8 +580,13 @@ public class SupplierService {
objs[3] = s.getPhoneNum(); objs[3] = s.getPhoneNum();
objs[4] = s.getEmail(); objs[4] = s.getEmail();
objs[5] = s.getFax(); objs[5] = s.getFax();
objs[6] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString(); if(("客户").equals(s.getType())) {
objs[7] = s.getAllNeedPay() == null? "" : s.getAllNeedPay().toString(); objs[6] = s.getBeginNeedGet() == null? "" : s.getBeginNeedGet().toString();
objs[7] = s.getAllNeedGet() == null? "" : s.getAllNeedGet().toString();
} else if(("供应商").equals(s.getType())) {
objs[6] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString();
objs[7] = s.getAllNeedPay() == null? "" : s.getAllNeedPay().toString();
}
objs[8] = s.getTaxNum(); objs[8] = s.getTaxNum();
objs[9] = s.getTaxRate() == null? "" : s.getTaxRate().toString(); objs[9] = s.getTaxRate() == null? "" : s.getTaxRate().toString();
objs[10] = s.getBankName(); objs[10] = s.getBankName();