From 9bda9783b26302ab73152ca14806cc9d3cb03c64 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Tue, 27 May 2025 15:26:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E5=85=88=E6=8A=8A=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml index 9b0fb4c8..c7794078 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml @@ -19,7 +19,7 @@ f.id = #{id} and f.bill_code = #{bill_code} and push_status is null - and start_date >= '2025-05-26' + -- and start_date >= '2025-05-26' From 2bb2866d5483c5205b24fb6640bc9d73bb310cb8 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 28 May 2025 18:50:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assembler/ElecFlightInvoiceAssembler.java | 12 +++++++++++- .../lexmis/entity/LexmiscivPlaneticketEntity.java | 6 +++--- .../impl/CInvoiceImportPluginServiceImpl.java | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java index de8aaa1e..17d0e2ba 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/assembler/ElecFlightInvoiceAssembler.java @@ -1,5 +1,6 @@ package com.hzya.frame.plugin.cinvoice.assembler; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -8,6 +9,7 @@ import com.hzya.frame.plugin.cinvoice.lexmis.entity.LexmiscivPlaneticketEntity; import com.hzya.frame.plugin.cinvoice.lexmis.entity.LexmiscivPlaneticketsEntity; import org.apache.commons.collections.CollectionUtils; +import java.math.BigDecimal; import java.util.LinkedList; import java.util.List; @@ -109,7 +111,10 @@ public class ElecFlightInvoiceAssembler implements ParamAssembler{ flightItem.setSl("");//数量 flightItem.setDj("");//单价 flightItem.setJe(planeticketH.getPT_PRICE());//金额 - flightItem.setSlv(planeticketH.getPT_TAXRATE());//税率 + if (StrUtil.isEmpty(planeticketH.getPT_TAXRATE())){ + planeticketH.setPT_TAXRATE(null); + } + flightItem.setSlv(Convert.toBigDecimal(planeticketH.getPT_TAXRATE()));//税率 flightItem.setSe(planeticketH.getPT_TAXAMOUNT());//税额 } filightItemList.add(flightItem); @@ -118,4 +123,9 @@ public class ElecFlightInvoiceAssembler implements ParamAssembler{ } return param; } + + public static void main(String[] args) { + BigDecimal bigDecimal = Convert.toBigDecimal(null); + System.out.println(bigDecimal); + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java index c0457b9b..c69364ce 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/lexmis/entity/LexmiscivPlaneticketEntity.java @@ -77,7 +77,7 @@ public class LexmiscivPlaneticketEntity extends BaseEntity { /** * 无备注 */ - private BigDecimal PT_TAXRATE; + private String PT_TAXRATE; /** * 无备注 */ @@ -387,11 +387,11 @@ public class LexmiscivPlaneticketEntity extends BaseEntity { return PT_AMOUNT; } - public BigDecimal getPT_TAXRATE() { + public String getPT_TAXRATE() { return PT_TAXRATE; } - public void setPT_TAXRATE(BigDecimal PT_TAXRATE) { + public void setPT_TAXRATE(String PT_TAXRATE) { this.PT_TAXRATE = PT_TAXRATE; } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java index a591d4dc..a5d4a45c 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java @@ -88,6 +88,7 @@ public class CInvoiceImportPluginServiceImpl implements ICInvoiceImportPluginSer //2、 查OA明细表 //3、 查迈瑞思发票表 //迈锐思发票公共信息表 + logger.info("开始查迈锐思发票公共表信息:{},{}",cInvoiceH.getId(),cInvoiceH.getBill_code()); LexmisPublicinfoEntity lexmisPublicinfoEntity = new LexmisPublicinfoEntity(cInvoiceH.getId(), dataSourceCode); //lexmisPublicinfoEntity.setPI_ID("6952494198841691018"); List lexmisPublicinfoEntityList = lexmisPublicinfoService.query(lexmisPublicinfoEntity); From 255a8d14f4130dcf0ce05dd4995db63434730cf3 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 30 May 2025 17:35:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0xml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-ht.yml | 2 ++ .../invoice/service/impl/InvoiceServiceImpl.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/base-buildpackage/src/main/resources/application-ht.yml b/base-buildpackage/src/main/resources/application-ht.yml index afbc5086..f1199cb5 100644 --- a/base-buildpackage/src/main/resources/application-ht.yml +++ b/base-buildpackage/src/main/resources/application-ht.yml @@ -48,6 +48,8 @@ invoice_pdf: #税务ofd附件下载存放路径 invoice_ofd: url: D:\yongansystem\invoice\ofd\ +invoice_xml: + url: D:\yongansystem\invoice\xml\ zx: # 生产用这个 这个是银行给的 privateKey: MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgOHOzaKWBWOAbslvtYtS8tcQiJ9W9DT2cGQM3KSgXpfygCgYIKoEcz1UBgi2hRANCAAQNPct0MHOuDrVJBIy0RI7JKx9/PTlFHZlkIJr0EqpC+b/+N+z3JKbCMZ/wcP1V36Q+DlfDJCY9Ai/Uk2PZ9ZaF 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 f83258a9..4d91ad4f 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 @@ -75,6 +75,8 @@ public class InvoiceServiceImpl extends BaseService imple private String invoicePdfUrl; @Value("${invoice_ofd.url:}") private String invoiceOfdUrl; + @Value("${invoice_xml.url:}") + private String invoiceXmlUrl; @Override public JsonResultEntity queryArchives(JSONObject json) { @@ -232,6 +234,18 @@ public class InvoiceServiceImpl extends BaseService imple ManyfileUpload(fileOfd, entity, sub_reference, att_reference, jsonObject); logger.info("========ofd文件上传OA完成========"); } + //获取xml文件到本地 并为xml取名，否则会报无法访问错误 + logger.info("========开始将xml文件保存到本地========"); + String xmlFileName = generateFileName(xmlUrl, "XML"); + String xmlSavePath = invoiceXmlUrl + xmlFileName; + downloadPdf(xmlUrl, xmlSavePath); + logger.info("========pdf文件保存到本地完成========"); + File fileXml = new File(xmlSavePath); + if(null !=fileXml){ + logger.info("========开始将xml文件上传OA========"); + ManyfileUpload(fileXml, entity, sub_reference, att_reference, jsonObject); + logger.info("========xml文件上传OA完成========"); + } saveTaskLivingDetails(entity.getSerial_number(), entity.getBusiness_no(), jsonObject.toJSONString(), resultJson.toJSONString(), true, "QueryInvoiceResultPluginInitializer"); } }