From eeb26e0a9be7121de04d8ae4cc2248aa06a45f76 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 22 Nov 2024 17:16:04 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E6=8A=A5=E4=BB=B7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B9=8B=E5=89=8D=E5=8A=A0=E4=B8=8A=E5=AF=B9=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86ID=E5=92=8C=E7=A8=8E=E7=8E=87=E7=9A=84?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E7=A9=BA=E6=8C=87=E9=92=88=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/controller/SysCustomerQuoteController.java  | 2 +-
 .../main/resources/templates/purchase/purchaseQuote/add.html | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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<SysCustomerQuoteHistory> sysCustomerQuoteHistories = quoteHistoryService.selectSysCustomerQuoteHistoryList(sysCustomerQuoteHistory);
-        List<SysCustomerQuoteHistory> filterCustomerQuoteHistories = sysCustomerQuoteHistories.stream().filter(item -> item.getIsLatest().equals("1")).collect(Collectors.toList());
+        List<SysCustomerQuoteHistory> 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";