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 8c8dd448..434e83c5 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 @@ -828,7 +828,7 @@ public class SDNYMainProcessController extends AbstractController { sapInvoiceDetail.setZJK(snInvoiceDetail.getAmount()); sapInvoiceDetail.setZHH(snInvoiceDetail.getRowNo()); //将类似于0.03数据格式转化为3.00 - if (snInvoiceDetail.getTaxRate() != null && snInvoiceDetail.getTaxRate() != "") { + if (snInvoiceDetail.getTaxRate() != null && "".equals(snInvoiceDetail.getTaxRate())) { sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); if ("0".equals(snInvoiceDetail.getTaxRate())) { sapInvoiceDetail.setZTAX("0.00"); @@ -843,7 +843,7 @@ public class SDNYMainProcessController extends AbstractController { sapInvoiceDetail.setZSM(getZSM(tax.toString())); BigDecimal tax1 = tax.multiply(new BigDecimal("100")); sapInvoiceDetail.setZTAX(tax1.toString()); - if (tax1.compareTo(new BigDecimal("100")) == 1) { + if (tax1.compareTo(new BigDecimal("100")) > 0) { sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); }else if (tax1.scale() > 2){ BigDecimal substring = tax1.setScale(2, RoundingMode.FLOOR); @@ -935,7 +935,7 @@ public class SDNYMainProcessController extends AbstractController { info.setZSM(getZSM(info.getZTAX())); } if (invoiceLineList == null || invoiceLineList.size() == 0) { - if (info.getZTAX() == null || info.getZTAX() == "") { + if (info.getZTAX() == null || "".equals(info.getZTAX())) { info.setZTAX("0.00"); info.setZSM(getZSM(info.getZTAX())); }