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 f554eb4f..f0f2be9d 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 @@ -551,7 +551,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } - if ("免税".equals(detail.getString("sl"))) { + if ("免税".equals(detail.getString("sl")) || "不征税".equals(detail.getString("sl")) || "***".equals(detail.getString("sl"))) { taxRateDetail = "0"; snDetailMap.put("taxRate", taxRateDetail); } else { @@ -559,18 +559,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { taxRateDetail = detail.get("sl").toString(); if (!"0".equals(taxRateDetail)) { if (StringUtils.isNoneBlank(taxRateDetail)) { - int index = taxRateDetail.indexOf("%"); -// if (index > 0) { -// taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); -// Float num = Float.parseFloat(taxRateDetail); -// if (num > 9) { -// taxRateDetail = "0." + taxRateDetail; -// } else { -// if (!taxRateDetail.startsWith("0")) { -// taxRateDetail = "0.0" + taxRateDetail; -// } -// } -// } + if(taxRateDetail.contains("%")){ + taxRateDetail = taxRateDetail.replace("%",""); + } } }