|
|
|
@ -792,12 +792,17 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
String qsjsrq = (String)map.get("qsjsrq"); |
|
|
|
|
String xfmc = (String)map.get("xfmc"); |
|
|
|
|
String maxTax = (String)map.get("maxTax"); |
|
|
|
|
String floatTax = (String)map.get("floatTax"); |
|
|
|
|
String yxsxfs = (String)map.get("yxsxfs"); |
|
|
|
|
String qsr = (String)map.get("qsr"); |
|
|
|
|
String invoiceNo = (String)map.get("invoiceNo"); |
|
|
|
|
String companyCode = (String) map.get("companyCode"); |
|
|
|
|
String bzdh = (String) map.get("bzdh"); |
|
|
|
|
String inAccountStatus = (String) map.get("inAccountStatus"); |
|
|
|
|
String postingTimeEnd = (String) map.get("postingTimeEnd"); |
|
|
|
|
String postingTimeStart = (String) map.get("postingTimeStart"); |
|
|
|
|
String snVoucherNumber = (String) map.get("snVoucherNumber"); |
|
|
|
|
String imageNumber = (String) map.get("imageNumber"); |
|
|
|
|
Map<String, Object> pramsMap = new HashMap<>(18); |
|
|
|
|
|
|
|
|
|
pramsMap.put("business", getUserInfo().getBusiness()); |
|
|
|
|
pramsMap.put("dbName", getUserInfo().getDbName()); |
|
|
|
|
List<Tax> taxList = getUserInfo().getOrg(); |
|
|
|
@ -808,11 +813,11 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
} else { |
|
|
|
|
return ResponseEntity.ok(R.error("税额上限不能为空!")); |
|
|
|
|
} |
|
|
|
|
if (StringUtils.isNotBlank(floatTax)) { |
|
|
|
|
pramsMap.put("floatTax", floatTax); |
|
|
|
|
} else { |
|
|
|
|
return ResponseEntity.ok(R.error("税额容差不能为空!")); |
|
|
|
|
} |
|
|
|
|
// if (StringUtils.isNotBlank(floatTax)) {
|
|
|
|
|
// pramsMap.put("floatTax", floatTax);
|
|
|
|
|
// } else {
|
|
|
|
|
// return ResponseEntity.ok(R.error("税额容差不能为空!"));
|
|
|
|
|
// }
|
|
|
|
|
if (StringUtils.isNotBlank(yxsxfs)) { |
|
|
|
|
pramsMap.put("yxsxfs", yxsxfs); |
|
|
|
|
} else { |
|
|
|
|