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'