From 65d08f671f1ac872b97bea575ddcaebea28995f4 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Wed, 27 Aug 2025 11:13:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=93=B6=E8=A1=8C=E8=BE=85=E5=8A=A9?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=8F=96=E5=80=BC->=E5=B9=BF=E8=84=89?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A6=81=E6=B1=82=EF=BC=8C=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/impl/ICoreServiceImpl.java   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

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<String, String> assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO);
+                                        Map<String, String> 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<VoucherData.Voucher.Detail.Cashflow> 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);