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 6acec366..19e5961c 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 @@ -508,12 +508,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); - } +// 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 86f273a9..19aacbd8 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 @@ -106,14 +106,14 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { public String pushInvoiceToRecordInvoice(SNInvoice snInvoice, String taxNo, String company,String imageId,String compCode) throws Exception { TDxInvoiceReimburse recordInvoice = new TDxInvoiceReimburse(); - DynamicContextHolder.push(DbConstant.BASICS_READ); - - SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); - log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); - recordInvoice.setGfTaxNo(orgByCompCode.getTaxno()); - recordInvoice.setGfName(orgByCompCode.getTaxname()); - recordInvoice.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); - recordInvoice.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); +// DynamicContextHolder.push(DbConstant.BASICS_READ); +// +// SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); +// log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); +// recordInvoice.setGfTaxNo(orgByCompCode.getTaxno()); +// recordInvoice.setGfName(orgByCompCode.getTaxname()); +// recordInvoice.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); +// recordInvoice.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); QueryWrapper currentWrapper = new QueryWrapper<>(); currentWrapper.eq("taxno", taxNo); @@ -613,16 +613,16 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { log.info("价税分离失败:{}", invoiceResult.getMsg()); return invoiceResult.getMsg(); } - DynamicContextHolder.push(DbConstant.BASICS_READ); - - SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); - log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); - if(orgByCompCode != null) { - reimburse.setGfTaxNo(orgByCompCode.getTaxno()); - reimburse.setGfName(orgByCompCode.getTaxname()); - reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); - reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); - } +// DynamicContextHolder.push(DbConstant.BASICS_READ); +// +// SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); +// log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); +// if(orgByCompCode != null) { +// reimburse.setGfTaxNo(orgByCompCode.getTaxno()); +// reimburse.setGfName(orgByCompCode.getTaxname()); +// reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); +// reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); +// } reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);