From 13b6dcbcc2fcfca367cae038bba9174f39f8bcb0 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 3 May 2023 11:22:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 284e7cce..e580e82a 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -325,7 +325,7 @@ invoice_no invoiceNo, DATE_FORMAT(invoice_date,'%Y-%m-%d') invoiceDate, DATE_FORMAT(create_date,'%Y-%m-%d') createDate, - total_amount invoiceAmount, + invoice_amount invoiceAmount, qs_status qszt, DATE_FORMAT(qs_date,'%Y-%m-%d') qsrq, qs_type qsfs, From 427e105de96e80ff85f82b6112575cebb3fe2be5 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 3 May 2023 14:41:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 8 ++++++++ .../com/dxhy/erp/service/SNPushCheckRecordService.java | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 4b8bb024..a84f03b8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -401,6 +401,7 @@ public class SDNYMainProcessController extends AbstractController { log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); String company = orgByCompCode.getCompany(); String taxno = orgByCompCode.getTaxno(); + String taxname = orgByCompCode.getTaxname(); String result = ""; @@ -414,6 +415,7 @@ public class SDNYMainProcessController extends AbstractController { TDxInvoiceReimburse reimburse = new TDxInvoiceReimburse(); reimburse.setImageId(imageId); reimburse.setCompCode(compCode); + reimburse.setGfName(taxname); SNSAPObject object = new SNSAPObject(); object.setSYSID("FPXT"); @@ -439,6 +441,12 @@ public class SDNYMainProcessController extends AbstractController { for (SNInvoice invoice : invoiceInfoList) { String fplxdm = ""; String snFplx = ""; + if (invoice.getPurchaserTaxNo() == null || "".equals(invoice.getPurchaserTaxNo())){ + invoice.setPurchaserTaxNo(taxno); + } + if (invoice.getPurchaserName() == null || "".equals(invoice.getPurchaserName())){ + invoice.setPurchaserName(taxname); + } result = snPushCheckRecordService.updateInvoicePoll(company, taxno, reimburse, invoice, fplxdm, imageId, compCode); //价税分离判断 diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 65278b6a..046eb4ba 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -165,8 +165,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } recordInvoice.setXfTaxNo(xfsh); - recordInvoice.setGfTaxNo(gfsbh); - recordInvoice.setGfName(gfmc); +// recordInvoice.setGfTaxNo(gfsbh); +// recordInvoice.setGfName(gfmc); recordInvoice.setRzlx("5"); recordInvoice.setYqsqStatus("1"); if(current != null) { @@ -206,6 +206,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); recordInvoice.setImageId(imageId); recordInvoice.setCompCode(compCode); + recordInvoice.setGfTaxNo(snInvoice.getPurchaserTaxNo()); + recordInvoice.setGfName(snInvoice.getPurchaserName()); update = baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); From 44622f73acf96a7ff94cbf1a9dd6d4c8bd31281b Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Wed, 3 May 2023 14:55:22 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0uid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/core/task/SnEmailGatherTask.java | 9 +++++++++ .../java/com/dxhy/core/task/SnEmailGatherTaskTest.java | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java index cf12afa9..3d8c9547 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java @@ -150,6 +150,10 @@ public class SnEmailGatherTask { String uid = inbox.getUID(msg); if(StringUtils.isBlank(maintainVo.getEmailUid()) && i+1 == messages.length){ emailMaintainVo.setEmailUid(uid); + buildEmailMaintainVo(emailMaintainVo); + } else if(i+1 == messages.length){ + emailMaintainVo.setEmailUid(uid); + buildEmailMaintainVo(emailMaintainVo); } //增量处理 等于之后就跳过本地循环 if(StringUtils.isNotBlank(maintainVo.getEmailUid()) && maintainVo.getEmailUid().equals(uid)){ @@ -223,6 +227,11 @@ public class SnEmailGatherTask { } } + public void buildEmailMaintainVo(EmailMaintainVo emailMaintainVo){ + emailMaintainService.update(emailMaintainVo); + } + + public void buildMsg(MailGatherLogVo gatherLogVo, String type, String msg){ gatherLogVo.setOcrType(type); gatherLogVo.setErrorMsg(msg); diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTaskTest.java b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTaskTest.java index 3c5b6fdb..b730a49a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTaskTest.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTaskTest.java @@ -39,8 +39,6 @@ class SnEmailGatherTaskTest { String mail_host = "mail.pop3.host"; String emailName = "745139984@qq.com"; String password = "ncmydeiilzyabfgb"; -// String emailName = "15201210373@163.com"; -// String password = "JKZATQTPHDDQTQSH"; String mailSuffix = emailName.split("@")[1]; //邮箱类型 String mailType = mailSuffix.split("\\.")[0]; From 72ac22848240661098d486ee60105aa2fc3c9922 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 3 May 2023 15:38:23 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/SNPushCheckRecordService.java | 7 ++++++- .../extend/service/pool/ExtInvoicePoolServiceImpl.java | 2 +- .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 046eb4ba..c6798d73 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -139,8 +139,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { String kprq = snInvoice.getBillingDate(); String je = snInvoice.getTotalAmount(); + String amountTax = snInvoice.getAmountTax(); String xfsh = snInvoice.getSalesTaxNo(); - String se = snInvoice.getAmountTax(); + String se = snInvoice.getTotalTax(); String gfsbh = snInvoice.getPurchaserTaxNo(); String gfmc = snInvoice.getPurchaserName(); String invoiceType = snInvoice.getInvoiceType(); @@ -163,6 +164,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if (se != null) { recordInvoice.setTaxAmount(new BigDecimal(se)); } + if (amountTax != null){ + recordInvoice.setTotalAmount(new BigDecimal(amountTax)); + } recordInvoice.setXfTaxNo(xfsh); // recordInvoice.setGfTaxNo(gfsbh); @@ -185,6 +189,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { recordInvoice.setImageId(imageId); recordInvoice.setCompCode(compCode); + if (baseTDxRecordInvoice != null) { baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); } else { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index ef4d937a..e44019c8 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -174,7 +174,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); +// log.info("入账状态====>{}",pageList.get(i).getInAccountStatus()); pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType())); pageList.get(i).setQsrq(pageList.get(i).getQsrq() == null ? "" : pageList.get(i).getQsrq()); pageList.get(i).setRzrq(pageList.get(i).getRzrq() == null ? "" : pageList.get(i).getRzrq()); diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index e580e82a..ebb19bf9 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -130,6 +130,7 @@ and t.invoice_source = #{invoiceSource} + and t.invoice_type != '101' + + From 08eca8ef9e0bc5ec1e0227ae72d4c7ce130b4b39 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 3 May 2023 15:56:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index ebb19bf9..b7ec8776 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -130,7 +130,7 @@ and t.invoice_source = #{invoiceSource} - and t.invoice_type != '101' + and t.invoice_type not in ('91','95','97','99','101','00')