diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java index 59e9dc43..4e2eedc7 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java @@ -597,7 +597,18 @@ public class ICoreServiceImpl implements ICoreService { } //辅助核算取值 - Map assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO); + Map assValue = new HashMap<>(); + try{ + assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO); + }catch (Exception e){ + e.printStackTrace(); + //广脉特殊要求,指定账户 + if("96".equals(value)){ + assValue.put("pk", "1001ZZ1000000005HYPU"); + assValue.put("code", "默认"); + assValue.put("name", "默认"); + } + } System.out.println(assValue); if (assValue.size() != 0) { VoucherData.Voucher.Detail.Ass assEntity = new VoucherData.Voucher.Detail.Ass(); @@ -2579,9 +2590,21 @@ public class ICoreServiceImpl implements ICoreService { } } - //现金流映射 + List cashflow =new LinkedList<>(); + if(detail.getCashflow()!=null){ + //现金流映射 + for (VoucherData.Voucher.Detail.Cashflow cash : detail.getCashflow()) { + VoucherData.Voucher.Detail.Cashflow c = new VoucherData.Voucher.Detail.Cashflow(); + c.setMoney(cash.getMoney());//金额 money + c.setPk_cashflow(cash.getPk_cashflow());//现金流 pk_cashflow + c.setPk_currtype(cash.getPk_currtype());//币种编码 pk_currtype + cashflow.add(c); + } + } + det.setAss(ass); + det.setCashflow(cashflow); details.add(det); } resuVoucher.setDetails(details);