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 4553f83f..30873607 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 @@ -764,6 +764,10 @@ public class SDNYMainProcessController extends AbstractController { BigDecimal tax1 = tax.multiply(new BigDecimal("100")); sapInvoiceDetail.setZTAX(tax1.toString()); } + if (snInvoiceDetail.getTaxRate().contains("%") && !snInvoiceDetail.getTaxRate().contains(".")){ + String replace = snInvoiceDetail.getTaxRate().replace("%", ".00"); + sapInvoiceDetail.setZTAX(replace); + } } // if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) { // info.setZTAX(sapInvoiceDetail.getZTAX()); @@ -782,6 +786,9 @@ public class SDNYMainProcessController extends AbstractController { 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());