From 3cf56761e5d133a2835733b7485f7bc7719d3580 Mon Sep 17 00:00:00 2001 From: xiangerlin <251481237@qq.com> Date: Sun, 13 Jul 2025 16:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=88=90=E5=8A=9F=EF=BC=8C?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InvoiceServiceImpl.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/service/impl/InvoiceServiceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/service/impl/InvoiceServiceImpl.java index 6bb12694..5e56dd39 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/service/impl/InvoiceServiceImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/service/impl/InvoiceServiceImpl.java @@ -263,18 +263,23 @@ public class InvoiceServiceImpl extends BaseService imple } } //开票成功，提交流程 - //查询待办，退回流程用，这里只处理退回的情况，如果要处理提交，要等开票成功后才能提交，去定时查开票结果的定时任务里做 -// ApplyInvoiceEntity applyInvoice = new ApplyInvoiceEntity(); -// applyInvoice.setId(entity.getSerial_number()); -// applyInvoice.setDataSourceCode("HT-OA"); -// ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice); -// if (null != applyInvoiceEntity){ -// String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), InvoiceState.invoiceStateGetValue(jsonResult.getString("resultStatus")); -// applyInvoiceService.process(stepBack,"8000590007"); -// } + if (StrUtil.isNotEmpty(entity.getSerial_number())){ + try { + ApplyInvoiceEntity applyInvoice = new ApplyInvoiceEntity(); + applyInvoice.setId(entity.getSerial_number()); + applyInvoice.setDataSourceCode("HT-OA"); + ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice); + if (null != applyInvoiceEntity){ + String finish = applyInvoiceService.finishValueOf(applyInvoiceEntity.getWorkitem_id(), InvoiceState.invoiceStateGetValue(jsonResult.getString("resultStatus"))); + applyInvoiceService.process(finish,"8000590007","ZZZH"); + } + }catch (Exception e){ + logger.error("开票成功，流程提交报错:{}}",e); + } + } }else { - //开票失败，流程回退 - //查询待办，退回流程用，这里只处理退回的情况，如果要处理提交，要等开票成功后才能提交，去定时查开票结果的定时任务里做 + //开票失败，流程回退 暂时先不回退 还不稳定，等稳定了再说 + //查询待办，退回流程用，这里只处理退回的情况，如果要处理提交，要等开票成功后才能提交， ApplyInvoiceEntity applyInvoice = new ApplyInvoiceEntity(); applyInvoice.setId(entity.getSerial_number()); applyInvoice.setDataSourceCode("HT-OA"); @@ -284,8 +289,8 @@ public class InvoiceServiceImpl extends BaseService imple if (StrUtil.isEmpty(resultMsg)){ resultMsg = "开票失败"; } - String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), resultMsg); - applyInvoiceService.process(stepBack,"8000590006","ZZZH"); + // String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), resultMsg); + // applyInvoiceService.process(stepBack,"8000590006","ZZZH"); } } }