diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index f75e45f8..31cc8cac 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -508,6 +508,7 @@ public class BaseTDxRecordInvoice implements Serializable { //过账时间 private String postingTime; //影像号 + @TableField("image_id") private String imageNumber; //报账单号 private String bzdh; 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 55c0b287..4c6a9b22 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 @@ -563,7 +563,9 @@ public class SDNYMainProcessController extends AbstractController { info.setZSE(snInvoice.getTotalTax()); info.setZTXBZ(snInvoice.getTollSign()); - info.setZSKPH(snInvoice.getMachineCode()); + //机打代码 + info.setZJDDM(snInvoice.getMachineCode()); +// info.setZSKPH(snInvoice.getMachineCode()); info.setZGFZH(snInvoice.getPurchaserBank()); info.setZBZ(snInvoice.getRemarks()); diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml index 18941f74..880bcd20 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml @@ -406,9 +406,7 @@ p.confirm_user as confirmUser, p.rzh_belong_date as rzhBelongDate, p.cxrz_status as cxrzStatus, - p.cxbdk_status as cxbdkStatus, - p.bzdh as bzdh, - p.inaccount_status as inAccountStatus + p.cxbdk_status as cxbdkStatus FROM t_dx_export_customs p where