diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java index 1414bcba..e567c59a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java @@ -477,7 +477,7 @@ public class SysCustomerQuoteController extends BaseController sysCustomerQuoteHistory.setMaterialCode(materialNo); sysCustomerQuoteHistory.setCustomerCode(customerCode); List sysCustomerQuoteHistories = quoteHistoryService.selectSysCustomerQuoteHistoryList(sysCustomerQuoteHistory); - List filterCustomerQuoteHistories = sysCustomerQuoteHistories.stream().filter(item -> item.getIsLatest().equals("1")).collect(Collectors.toList()); + List filterCustomerQuoteHistories = sysCustomerQuoteHistories.stream().filter(item -> "1".equals(item.getIsLatest())).collect(Collectors.toList()); if (filterCustomerQuoteHistories.size() == 0) { SysCustomerQuoteHistory temp = new SysCustomerQuoteHistory(); diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html index fb49ea0e..14f9bb40 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html @@ -328,7 +328,10 @@ $.modal.alertWarning("请先选择供应商ID"); return; } - + if ($("#taxRate").val() == null || $("#taxRate").val() == '') { + $.modal.alertWarning("请先填写税率"); + return; + } var url = ctx + "erp/material/select";