diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java index 8e3ead7e..6df45393 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java @@ -146,7 +146,7 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl queryRecord = new QueryWrapper<>(); queryRecord.eq("uuid", uuid); BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord); - if (rdxRecordInvoice.getDkTaxAmount() != null && StringHelper.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ + if (rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString()); } if (rdxRecordInvoice != null) { 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 da845da8..77a3d2cf 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 @@ -832,22 +832,32 @@ public class SDNYMainProcessController extends AbstractController { sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); if ("0".equals(snInvoiceDetail.getTaxRate())) { sapInvoiceDetail.setZTAX("0.00"); -// sapInvoiceDetail.setZSM(sapInvoiceDetail.getZTAX()); + sapInvoiceDetail.setZSM(sapInvoiceDetail.getZTAX()); } if (snInvoiceDetail.getTaxRate().contains(".")) { String getTaxRate = snInvoiceDetail.getTaxRate(); - if (snInvoiceDetail.getTaxRate().length() > 4) { - getTaxRate = getTaxRate.substring(0, 4); - } +// if (snInvoiceDetail.getTaxRate().length() > 4) { +// getTaxRate = getTaxRate.substring(0, 4); +// } BigDecimal tax = new BigDecimal(getTaxRate); sapInvoiceDetail.setZSM(getZSM(tax.toString())); BigDecimal tax1 = tax.multiply(new BigDecimal("100")); sapInvoiceDetail.setZTAX(tax1.toString()); + if (tax1.toPlainString().indexOf(".")>=3) { + sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); + }else if (tax1.toPlainString().length()-tax1.toPlainString().indexOf(".")>3){ + String substring = tax1.toPlainString().substring(0, tax1.toPlainString().indexOf(".") + 3); + sapInvoiceDetail.setZTAX(substring); + } + } if (snInvoiceDetail.getTaxRate().contains("%") && !snInvoiceDetail.getTaxRate().contains(".")) { String replace = snInvoiceDetail.getTaxRate().replace("%", ".00"); + String replaceZsm = snInvoiceDetail.getTaxRate().replace("%",""); + sapInvoiceDetail.setZSM(getZSM(replaceZsm)); sapInvoiceDetail.setZTAX(replace); } + } // if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) { // info.setZTAX(sapInvoiceDetail.getZTAX()); @@ -873,15 +883,16 @@ public class SDNYMainProcessController extends AbstractController { } } sapInvoiceDetail.setZSL(snInvoiceDetail.getQuantity()); - String zsmTax = snInvoiceDetail.getTaxRate(); - if (zsmTax != null && zsmTax != "" && zsmTax.length() > 4) { - zsmTax = zsmTax.substring(0, 4); - } - if (zsmTax != null && zsmTax.contains("%") && !zsmTax.contains(".")) { - zsmTax = (new BigDecimal(zsmTax.replace("%", ""))).divide(new BigDecimal("100")).toString(); - } -// sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); - sapInvoiceDetail.setZSM(getZSM(zsmTax)); + +// String zsmTax = snInvoiceDetail.getTaxRate(); +// if (zsmTax != null && zsmTax != "" && zsmTax.length() > 4) { +// zsmTax = zsmTax.substring(0, 4); +// } +// if (zsmTax != null && zsmTax.contains("%") && !zsmTax.contains(".")) { +// zsmTax = (new BigDecimal(zsmTax.replace("%", ""))).divide(new BigDecimal("100")).toString(); +// } +//// sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); +// sapInvoiceDetail.setZSM(getZSM(zsmTax)); sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel()); if (snInvoice.getInvoiceCode() != null) { sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx); @@ -1188,6 +1199,9 @@ public class SDNYMainProcessController extends AbstractController { case "1.5": sm = "JA"; break; + case "0.015": + sm = "JA"; + break; case "1": sm = "J9"; break;