From a4833d5cfc225a1da9fbb76b48a42141e1c9da9e Mon Sep 17 00:00:00 2001 From: xiangerlin <251481237@qq.com> Date: Sun, 29 Jun 2025 13:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/ht/entity/ApplyInvoiceEntity.xml | 2 +- .../seeyon/invoice/entity/InvoiceEntity.java | 9 +++++++ .../seeyon/invoice/entity/InvoiceEntity.xml | 1 + .../service/impl/InvoiceServiceImpl.java | 24 ++++++++++++------- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/fw-oa/src/main/java/com/hzya/frame/plugin/ht/entity/ApplyInvoiceEntity.xml b/fw-oa/src/main/java/com/hzya/frame/plugin/ht/entity/ApplyInvoiceEntity.xml index 2f312035..38f78f3a 100644 --- a/fw-oa/src/main/java/com/hzya/frame/plugin/ht/entity/ApplyInvoiceEntity.xml +++ b/fw-oa/src/main/java/com/hzya/frame/plugin/ht/entity/ApplyInvoiceEntity.xml @@ -36,7 +36,7 @@ from formmain_0331 LEFT JOIN COL_SUMMARY on COL_SUMMARY.FORM_RECORDID = formmain_0331.id - LEFT JOIN CTP_AFFAIR on CTP_AFFAIR.OBJECT_ID = COL_SUMMARY.id and CTP_AFFAIR.MEMBER_ID = '' and CTP_AFFAIR.STATE = '3' + LEFT JOIN CTP_AFFAIR on CTP_AFFAIR.OBJECT_ID = COL_SUMMARY.id and CTP_AFFAIR.MEMBER_ID = '8802902519613178734' and CTP_AFFAIR.STATE = '3' where formmain_0331.id = #{id} and CTP_AFFAIR.SUB_OBJECT_ID is not null diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.java index ae52df6d..2326bae5 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.java @@ -72,6 +72,7 @@ public class InvoiceEntity extends BaseEntity { private String url;// 发票文件 private String result_status;// 开票结果 + private String failure_reason; //失败原因 private String summaryId;// private String input_result_status_filed;//进项发票结果字段 private String input_result_status;//进项发票结果 @@ -697,4 +698,12 @@ public class InvoiceEntity extends BaseEntity { public void setOriginal_invoice_check_ode(String original_invoice_check_ode) { this.original_invoice_check_ode = original_invoice_check_ode; } + + public String getFailure_reason() { + return failure_reason; + } + + public void setFailure_reason(String failure_reason) { + this.failure_reason = failure_reason; + } } diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.xml b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.xml index 3bfe03ed..fa6aac72 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.xml +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceEntity.xml @@ -120,6 +120,7 @@ ${invoice_code_field} = #{invoice_code}, ${invoice_number_field} = #{invoice_number}, ${result_status_field} = #{result_status}, + field0225 = #{failure_reason}, where id=#{id} 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 e34e855d..30a20daa 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 @@ -10,6 +10,8 @@ import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.plugin.ht.entity.ApplyInvoiceEntity; +import com.hzya.frame.plugin.ht.service.IApplyInvoiceService; import com.hzya.frame.seeyon.dao.ICtpAttachmentDao; import com.hzya.frame.seeyon.dao.ICtpFileDao; import com.hzya.frame.seeyon.entity.CtpAttachmentEntity; @@ -68,7 +70,7 @@ public class InvoiceServiceImpl extends BaseService imple @Autowired private ICtpFileDao ctpFileDao; - + private IApplyInvoiceService applyInvoiceService; @Value("${zt.url}") private String url; @@ -273,14 +275,18 @@ public class InvoiceServiceImpl extends BaseService imple }else { //开票失败，流程回退 //查询待办，退回流程用，这里只处理退回的情况，如果要处理提交，要等开票成功后才能提交，去定时查开票结果的定时任务里做 -// 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(), attribute.getString("resultMsg")); -// applyInvoiceService.process(stepBack,"8000590006"); -// } + ApplyInvoiceEntity applyInvoice = new ApplyInvoiceEntity(); + applyInvoice.setId(entity.getSerial_number()); + applyInvoice.setDataSourceCode("HT-OA"); + ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice); + if (null != applyInvoiceEntity){ + String resultMsg = attribute.getString("resultMsg"); + if (StrUtil.isEmpty(resultMsg)){ + resultMsg = "开票失败"; + } + String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), resultMsg); + applyInvoiceService.process(stepBack,"8000590006","ZZZH"); + } } } }