diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java index a0b4f794..db8d1873 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptInvoiceView.java @@ -117,4 +117,6 @@ public class BaseReceiptInvoiceView implements Serializable { private String certDate; private String outBelongDate; + //转出来源 1 sap + private String outResource; } diff --git a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml index 4d937745..cc7ffb04 100644 --- a/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseInvoiceOutMapper.xml @@ -26,6 +26,7 @@ + @@ -90,7 +91,7 @@ SELECT , b.gf_tax_no,b.gf_name,b.xf_name,b.invoice_date,b.invoice_status,b.invoice_amount,b.tax_amount - , b.rzh_date,b.invoice_type + , b.rzh_date,b.invoice_type,b.out_resource FROM t_dx_record_invoice_out a LEFT JOIN t_dx_record_invoice b ON a.uuid = b.uuid diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java index 4ff4d863..82861c3f 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseTDxRecordInvoice.java @@ -475,5 +475,6 @@ public class BaseTDxRecordInvoice implements Serializable { * g公司id */ private String compCode; + private String outResource; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index fbcaf001..d741974a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -120,6 +120,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl