From 38773ef16a390ef48097dc8f22e8158a568de262 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 29 May 2025 16:18:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E7=BB=93=E6=9E=9C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/invoice/entity/InvoiceEntity.java | 8 ++++ .../seeyon/invoice/entity/InvoiceEntity.xml | 11 ++++- .../invoice/entity/InvoiceImportState.java | 45 +++++++++++++++++++ .../service/impl/InvoiceServiceImpl.java | 14 +++--- 4 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceImportState.java 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 a9c4d534..ae52df6d 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 @@ -80,7 +80,15 @@ public class InvoiceEntity extends BaseEntity { private String yd_res_field;//进项发票批量导入返回流水号字段 private String import_result_field;//进项发票批量导入返回结果字段 private String import_result;//进项发票批量导入返回结果 + private String bill_code;//发票批量导入单号 + public String getBill_code() { + return bill_code; + } + + public void setBill_code(String bill_code) { + this.bill_code = bill_code; + } public String getTab_name() { return tab_name; 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 aa51a2b7..3bfe03ed 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 @@ -70,6 +70,15 @@ + + + + + + + + + @@ -90,7 +99,7 @@ diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceImportState.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceImportState.java new file mode 100644 index 00000000..f732abea --- /dev/null +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/invoice/entity/InvoiceImportState.java @@ -0,0 +1,45 @@ +package com.hzya.frame.seeyon.invoice.entity; + +public enum InvoiceImportState { + inputZero("0","进行中"), + inputOne("1","全部成功"), + inputTwo("2","部分失败"), + inputThree("3","全部失败"); + + + + + private String type; + //值 + private String value; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + InvoiceImportState(String type, String value){ + this.type=type; + this.value=value; + } + + public static String invoiceStateGetValue(String type){ + for (InvoiceImportState invoiceState : InvoiceImportState.values()){ + if(invoiceState.getType()==type||invoiceState.getType().equals(type)){ + return invoiceState.getValue().toString(); + } + } + return null; + } +} 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 a86943c2..f83258a9 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 @@ -16,6 +16,7 @@ import com.hzya.frame.seeyon.entity.CtpFileEntity; import com.hzya.frame.seeyon.invoice.dao.IInvoiceDao; import com.hzya.frame.seeyon.invoice.dao.IInvoiceDetailsDao; import com.hzya.frame.seeyon.invoice.entity.InvoiceEntity; +import com.hzya.frame.seeyon.invoice.entity.InvoiceImportState; import com.hzya.frame.seeyon.invoice.entity.InvoiceState; import com.hzya.frame.seeyon.invoice.service.IInvoiceService; import com.hzya.frame.seeyon.util.OARestUtil; @@ -179,7 +180,7 @@ public class InvoiceServiceImpl extends BaseService imple logger.info("=====调用杭泰税务查询申请单详情的返回参数为:{}===========", result); JSONObject resultJson = JSONObject.parseObject(result); if (!resultJson.getBoolean("flag")) { - saveTaskLivingDetails(entity.getId(), entity.getBusiness_no(), jsonObject.toJSONString(), resultJson.toJSONString(), false, ""); + saveTaskLivingDetails(entity.getSerial_number(), entity.getBusiness_no(), jsonObject.toJSONString(), resultJson.toJSONString(), false, "QueryInvoiceResultPluginInitializer"); } else { JSONObject attribute = resultJson.getJSONObject("attribute"); if ("0".equals(attribute.getString("code"))) { @@ -231,6 +232,7 @@ public class InvoiceServiceImpl extends BaseService imple ManyfileUpload(fileOfd, entity, sub_reference, att_reference, jsonObject); logger.info("========ofd文件上传OA完成========"); } + saveTaskLivingDetails(entity.getSerial_number(), entity.getBusiness_no(), jsonObject.toJSONString(), resultJson.toJSONString(), true, "QueryInvoiceResultPluginInitializer"); } } }else{ @@ -240,6 +242,7 @@ public class InvoiceServiceImpl extends BaseService imple entity.setId(entity.getSerial_number()); invoiceDao.updateInvoiceResult(entity); logger.info("=======将开票结果回写OA完毕======"); + saveTaskLivingDetails(entity.getSerial_number(), entity.getBusiness_no(), jsonObject.toJSONString(), resultJson.toJSONString(), false, "QueryInvoiceResultPluginInitializer"); } } } @@ -268,6 +271,7 @@ public class InvoiceServiceImpl extends BaseService imple entity.setDataSourceCode("HT-OA"); JSONObject jsonObject=new JSONObject(); jsonObject.put("serialNumber",entity.getYd_result()); + logger.info("=====调用杭泰税务查询发票批量录入结果的请求参数为:{}===========",jsonObject.toJSONString()); //发送数据 String result = HttpRequest.post(url). header("appId", "800060"). @@ -280,7 +284,7 @@ public class InvoiceServiceImpl extends BaseService imple logger.info("=====调用杭泰税务查询发票批量录入结果的返回参数为:{}===========",result); JSONObject resultJson = JSONObject.parseObject(result); if (!resultJson.getBoolean("flag")) { - saveTaskLivingDetails(entity.getSerial_number(), entity.getBusiness_no(), jsonObject.toJSONString(), resultJson.toJSONString(), false,""); + saveTaskLivingDetails(entity.getId(), entity.getBill_code(), jsonObject.toJSONString(), resultJson.toJSONString(), false,"QueryInputInvoiceResultPluginInitializer"); } else { JSONObject attribute = resultJson.getJSONObject("attribute"); if("0".equals(attribute.getString("code"))) { @@ -291,11 +295,11 @@ public class InvoiceServiceImpl extends BaseService imple if(serialNumber.equals(entity.getYd_result())){ //修改发票批量录入结果状态 logger.info("=========开始更新进项发票的结果=========="); - entity.setImport_result(InvoiceState.invoiceStateGetValue(status)); + entity.setImport_result(InvoiceImportState.invoiceStateGetValue(status)); entity.setDataSourceCode("HT-OA"); invoiceDao.updateInputInvoiceResult(entity); logger.info("=========更新进项发票的结果完成=========="); - saveTaskLivingDetails(entity.getId(),entity.getBusiness_no(),jsonObject.toJSONString(), resultJson.toJSONString(), true,""); + saveTaskLivingDetails(entity.getId(),entity.getBill_code(),jsonObject.toJSONString(), resultJson.toJSONString(), true,"QueryInputInvoiceResultPluginInitializer"); } } } @@ -577,7 +581,7 @@ public class InvoiceServiceImpl extends BaseService imple taskLivingDetailsService.saveLogToFail(integrationTaskLivingDetailsEntity); } }catch (Exception e){ - logger.info("抽取杭泰付款单保存日志到集成任务日志明细中失败:{}",e.getMessage()); + logger.info("发票保存日志到集成任务日志明细中失败:{}",e.getMessage()); e.printStackTrace(); } } From 84e388124c39927715752b2d3442ce4a6e718897 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Fri, 30 May 2025 14:57:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AF=B9=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IncomeInvoiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java index 53914c8b..5321d84b 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java @@ -190,7 +190,7 @@ public class IncomeInvoiceServiceImpl extends BaseService 0){