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 43874a81..15cd93ca 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 @@ -488,7 +488,7 @@ public class SDNYMainProcessController extends AbstractController { } - if ("免税".equals(detail.getString("taxRate"))) { + if ("免税".equals(detail.getString("taxRate")) || "不征税".equals(detail.getString("taxRate"))) { taxRateDetail = "0"; snDetailMap.put("taxRate", taxRateDetail); } else { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java index 4ce5f4a9..35a92aea 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java @@ -88,5 +88,15 @@ public class SalesInvoicePushInfos { private String buyerPhone; private String compCode; + /** + * 报账单号 + */ + private String bzdh; + + /** + * 报账人 + */ + private String bzr; + private List detailList; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java index 701d9348..84822a02 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java @@ -484,4 +484,14 @@ public class TdxSaleRecordInvoice implements Serializable { private String incentiveFlag; private String compCode; + + /** + * 报账单号 + */ + private String bzdh; + + /** + * 报账人 + */ + private String bzr; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index 5c18342e..0e575c41 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1662,6 +1662,10 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { update.setStatusUpdateDate(new Date()); } update.setCompCode(infos.getCompCode()); + // 报账单号 报账人 + update.setBzdh(infos.getBzdh()); + update.setBzr(infos.getBzr()); + TDxInvoiceSales tDxInvoiceSales = new TDxInvoiceSales(); tDxInvoiceSales.setQsDate(new Date()); DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); @@ -1813,6 +1817,10 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { invoice.setCheckCode(info.getCheckCode()); } + // 报账单号 报账人 + invoice.setBzdh(info.getBzdh()); + invoice.setBzr(info.getBzr()); + invoice.setSourceSystem("1"); invoice.setValid("1"); invoice.setQsDate(new Date());