资金日报

This commit is contained in:
“wyx12345678” 2024-08-07 09:43:52 +08:00
parent 1981f693b6
commit fa1eb6623b
1 changed files with 12 additions and 12 deletions

View File

@ -42,7 +42,7 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
String groupName = null;
//如果查询是查的集团然后想要查询需查询下级及下级所有公司的id
if("group".equals(shkd_queryorgtype)){
ArrayList<Long> grouplongs = new ArrayList<>();
ArrayList<Long> grouplongs = new ArrayList<>();
for (DynamicObject group : groups) {
groupName = group.getString("name");
grouplongs.add(group.getLong("id"));
@ -71,7 +71,7 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
// Long exchangeRateTableId = ((DynamicObject)paramMap.get("exratetable")).getLong("id");//汇率表
String[] fileNames = {"shkd_ordinal","shkd_company","shkd_init_original","shkd_income_original","shkd_expend_original",
"shkd_period_original","shkd_currencyfield"};//字段标识数组
"shkd_period_original","shkd_currencyfield"};//字段标识数组
DataType[] dataTypes = {DataType.StringType,DataType.StringType,DataType.BigDecimalType,DataType.BigDecimalType,DataType.BigDecimalType,
DataType.BigDecimalType,DataType.LongType};//字段类型数组
//查询已出纳初始化的公司
@ -178,8 +178,8 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
if (orgcurrency != null){
per_recQF.and("currency.id",QCP.equals,orgcurrencyId);
}
per_recQF.and("bizdate",QCP.large_equals,startDate);
per_recQF.and("bizdate",QCP.less_equals,overDate);
per_recQF.and("payeedate",QCP.large_equals,startDate);
per_recQF.and("payeedate",QCP.less_equals,overDate);
DynamicObject[] per_cas_recbills = BusinessDataServiceHelper.load("cas_recbill", "id,org,org.id,org.number,actrecamt,currency,payertype,customerf7,customerf7", per_recQF.toArray());
BigDecimal transactions = this.getTransactions(per_cas_recbills);
recLB =recLB.add(transactions); //内部往来收入合计
@ -331,7 +331,7 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
public BigDecimal getTransactions(DynamicObject[] per_cas_recbills){
BigDecimal recAmountTotal = BigDecimal.ZERO;
for (DynamicObject per_cas_recbill : per_cas_recbills) {
//查询收款单为内部往来的公司
//查询收款单为内部往来的公司
String payertype = per_cas_recbill.getString("payertype");//付款人类型
if("bd_customer".equals(payertype)||"bd_supplier".equals(payertype)||"bos_org".equals(payertype)){
if("bd_supplier".equals(payertype)){
@ -389,13 +389,13 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
continue;
}
}
String payNumber = per_cas_paybill.getDynamicObject("org").getString("number");
String recNumber = per_cas_paybill.getString("payeenumber");
BigDecimal actpayamt = per_cas_paybill.getBigDecimal("actpayamt");
perPayAmountTotal = perPayAmountTotal.add(actpayamt);
if (payNumber.equals(recNumber)){//当付款编码同收款编码时
perPayAmountTotal = perPayAmountTotal.add(actpayamt);//补充收款数据
}
String payNumber = per_cas_paybill.getDynamicObject("org").getString("number");
String recNumber = per_cas_paybill.getString("payeenumber");
BigDecimal actpayamt = per_cas_paybill.getBigDecimal("actpayamt");
perPayAmountTotal = perPayAmountTotal.add(actpayamt);
if (payNumber.equals(recNumber)){//当付款编码同收款编码时
perPayAmountTotal = perPayAmountTotal.add(actpayamt);//补充收款数据
}
}