From 9f0e0f044c6e3ab35a07b080a06db0aa2e55f55b Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Fri, 26 Jul 2024 17:14:23 +0800
Subject: [PATCH] '1111'

---
 .idea/workspace.xml                           | 79 +++++--------------
 .../web/controller/quot/QuotController.java   | 18 +----
 2 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 405e07e..2fe3cf8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,50 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0792c5b5-6584-435e-b687-895386b6c4de" name="Default Changelist" comment="11">
-      <change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" afterPath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordAspect.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordLog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/DefaultContentParse.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/DefaultContentParse.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordAspect.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordAspect.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordLog.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordLog.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/DefaultContentParse.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/DefaultContentParse.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysChangeRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysChangeRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/system/SysChangeRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/system/SysChangeRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/system/domain/SysChangeRecord.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/system/domain/SysChangeRecord.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/bid/BidMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysChangeRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysChangeRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/bid/bid.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/bid/bid.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/assets/styles/ruoyi.scss" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/assets/styles/ruoyi.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/main.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -261,7 +218,7 @@
       <workItem from="1721800088839" duration="12061000" />
       <workItem from="1721866002818" duration="24322000" />
       <workItem from="1721951870703" duration="19853000" />
-      <workItem from="1721978213485" duration="5350000" />
+      <workItem from="1721978213485" duration="6980000" />
     </task>
     <task id="LOCAL-00001" summary="11">
       <created>1709259560561</created>
@@ -348,45 +305,45 @@
     </state>
     <state x="854" y="153" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1717652588812" />
     <state x="2561" y="132" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1719207686863" />
-    <state width="1876" height="198" key="GridCell.Tab.0.bottom" timestamp="1721983363774">
+    <state width="1876" height="198" key="GridCell.Tab.0.bottom" timestamp="1721983937525">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983363774" />
+    <state width="1876" height="198" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937525" />
     <state width="962" height="173" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.0.center" timestamp="1721983363774">
+    <state width="1876" height="198" key="GridCell.Tab.0.center" timestamp="1721983937524">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983363774" />
+    <state width="1876" height="198" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937524" />
     <state width="962" height="173" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.0.left" timestamp="1721983363774">
+    <state width="1876" height="198" key="GridCell.Tab.0.left" timestamp="1721983937524">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983363774" />
+    <state width="1876" height="198" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937524" />
     <state width="962" height="173" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.0.right" timestamp="1721983363774">
+    <state width="1876" height="198" key="GridCell.Tab.0.right" timestamp="1721983937525">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983363774" />
+    <state width="1876" height="198" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937525" />
     <state width="962" height="173" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.1.bottom" timestamp="1721983310877">
+    <state width="1876" height="198" key="GridCell.Tab.1.bottom" timestamp="1721983937525">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983310877" />
+    <state width="1876" height="198" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937525" />
     <state width="962" height="173" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.1.center" timestamp="1721983310877">
+    <state width="1876" height="198" key="GridCell.Tab.1.center" timestamp="1721983937525">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983310877" />
+    <state width="1876" height="198" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937525" />
     <state width="962" height="173" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.1.left" timestamp="1721983310877">
+    <state width="1876" height="198" key="GridCell.Tab.1.left" timestamp="1721983937525">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983310877" />
+    <state width="1876" height="198" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937525" />
     <state width="962" height="173" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
-    <state width="1876" height="198" key="GridCell.Tab.1.right" timestamp="1721983310877">
+    <state width="1876" height="198" key="GridCell.Tab.1.right" timestamp="1721983937525">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="198" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983310877" />
+    <state width="1876" height="198" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721983937525" />
     <state width="962" height="173" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721970095676" />
     <state width="1876" height="251" key="GridCell.Tab.2.bottom" timestamp="1721982338360">
       <screen x="0" y="0" width="1920" height="1040" />
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index f91693e..1956f16 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -763,24 +763,14 @@ public class QuotController extends BaseController
         }
 
         //厂价金额小于10万 不走OA审批
-        BigDecimal tpxd = BigDecimal.ONE;
-        List<QuotMaterial> materials = quot.getQuotMaterialList();
-        if(materials!=null&&materials.size()>0){
-            BigDecimal matQuotTp = materials.get(0).getMatQuotTp();
-            if(matQuotTp == null || BigDecimal.ZERO.compareTo(matQuotTp)==0){
-                matQuotTp = BigDecimal.ONE;
-            }
-            tpxd = matQuotTp;
-        }
+        String quotTotalPrice = quot.getQuotTotalPrice();//报价金额
+        BigDecimal totalPrice = new BigDecimal(quotTotalPrice);
 
         String allowFactoryPrice = configService.selectConfigByKey("quot:allow.factoryPrice");
         BigDecimal factoryPrice = new BigDecimal(allowFactoryPrice);
 
-        String quotTotalPrice = quot.getQuotTotalPrice();//报价金额
-        BigDecimal changj = new BigDecimal(quotTotalPrice).divide(tpxd,2,RoundingMode.HALF_UP);//厂价金额
-
-        if(changj.compareTo(factoryPrice)<0){
-            return error("厂价金额不超过"+allowFactoryPrice+",无法提交OA审批");
+        if(totalPrice.compareTo(factoryPrice)<0){
+            return error("总金额不超过"+allowFactoryPrice+",无法提交OA审批");
         }
 
         // 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material