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);