yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 weeks ago
parent
4338a930ad 59d0edda32
commit
663237c04c
2 changed files with 7 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  2. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -52,8 +52,6 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
import com.yxt.anrui.fin.api.finpaymentrecord.*;
@ -73,7 +71,6 @@ import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.flow.FlowableFeign;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@ -1718,7 +1715,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
}
if (payPriceTotal.compareTo(exePayPriceTotal) == -1) {
//借方
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoJF.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@ -1727,13 +1724,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
} else {
//借方
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoJF.setSubjectNo("2111");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@ -1742,14 +1739,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(bzj).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方1
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoDf.setSubjectNo("1009.03");
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoDf.setBank(key);
voucherResultDetailDtoDf.setCredit(exePayPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
//贷方2
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf2);

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
View File

@ -47,8 +47,8 @@ public class ApPayBillCastToKingDeeBillFields {
for (Map.Entry<String, String> entry : params.entrySet()) {
map_fEntityDetail_.put(entry.getKey(),entry.getValue());
}
fPAYBILLENTRY_ =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_,Feature.OrderedField));
String fPAYBILLENTRY_NEW =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_NEW,Feature.OrderedField));
}
jsonFEntityModel_.put("FPAYBILLENTRY", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));

Write Preview
Loading…
Cancel
Save