From f772afdec6f5427f04679deda6c06fe130d73843 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 10 Sep 2025 17:19:54 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=87=AD=E8=AF=81=E7=94=9F=E6=88=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/impl/ICoreServiceImpl.java | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 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 5228c297..60dc295a 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 @@ -594,6 +594,9 @@ public class ICoreServiceImpl implements ICoreService { VoucherData.Voucher.Detail.Ass ass_D0003 = null; boolean flat_D0004=false; + AeConfVoucherTemplateAssistEntity templateAssistEntity_004=null; + String key_004=null; + String value_004=null; for (Map.Entry assByBdCodeEntry : AssByBdCodeMap.entrySet()) { @@ -607,12 +610,15 @@ public class ICoreServiceImpl implements ICoreService { //辅助核算取值 Map assValue = new HashMap<>(); - if("350499bebe41426eaf29c603ca54fd88".equals(createVoucherVO.getMdmId()) && "D0004".equals(value) && ass_D0003==null){ - flat_D0004=true; + if ("350499bebe41426eaf29c603ca54fd88".equals(createVoucherVO.getMdmId()) && "D0004".equals(value) && ass_D0003 == null) { + flat_D0004 = true; + key_004 = key; + value_004 = value; + templateAssistEntity_004=templateAssistEntity; continue; } - try{ + try { assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO); }catch (Exception e){ e.printStackTrace(); @@ -656,6 +662,27 @@ public class ICoreServiceImpl implements ICoreService { assEntity.setCheckvaluecode("17"); assEntity.setCheckvaluename("无"); assList.add(assEntity); + }else { + //不是06 07的查询辅助核算 + System.out.println(templateAssistEntity_004);//去单据辅助核算 + Map assValu_004 = getAssValue(templateAssistEntity_004, dataValue, orgBookVO); + + if (assValu_004.size() != 0) { + VoucherData.Voucher.Detail.Ass assEntity = new VoucherData.Voucher.Detail.Ass(); + assEntity.setChecktypecode(value_004); + assEntity.setCheckvalueid(assValu_004.get("pk")); + assEntity.setCheckvaluecode(assValu_004.get("code")); + assEntity.setCheckvaluename(assValu_004.get("name")); + //类型 + for (AeConfBdAccsubjEntity aeConfBdAccsubjEntity : aeConfBdAccsubjEntities) { + if (value_004.equals(aeConfBdAccsubjEntity.getBdcode())) { + assEntity.setChecktypename(aeConfBdAccsubjEntity.getBdname()); + break; + } + } + assList.add(assEntity); + } + } }