From 6b46d54e73eb7387d63d3d3d69f244a1e564c321 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 6 Feb 2025 14:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmSpecialRebateService.java              | 32 +++++++-------
 .../biz/scmvehrebate/ScmVehRebateMapper.java  |  4 +-
 .../biz/scmvehrebate/ScmVehRebateMapper.xml   | 13 +++++-
 .../biz/scmvehrebate/ScmVehRebateService.java | 44 +++++++++----------
 4 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index ae517d30f4..5b26477c8b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
@@ -719,7 +719,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -732,7 +732,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
                     String expectCost = excelInfo.getExpectCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -781,7 +781,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -794,7 +794,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -807,7 +807,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceItureCost())) {
                     String onceItureCost = excelInfo.getOnceItureCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceItureCost).matches();
                     if (!matches) {
                         checkWord.add("其中支出费用必须为数字");
@@ -820,7 +820,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
                     String onceTreatCost = excelInfo.getOnceTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceTreatCost).matches();
                     if (!matches) {
                         checkWord.add("其中待支付费用必须为数字");
@@ -833,7 +833,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
                     String onceSuppCost = excelInfo.getOnceSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceSuppCost).matches();
                     if (!matches) {
                         checkWord.add("其中抵顶费用必须为数字");
@@ -1211,7 +1211,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -1224,7 +1224,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
                     String expectCost = excelInfo.getExpectCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -1273,7 +1273,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -1286,7 +1286,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getMoney())) {
                     String money = excelInfo.getMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(money).matches();
                     if (!matches) {
                         checkWord.add("其中费用必须为数字");
@@ -1299,7 +1299,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -1333,7 +1333,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondaryUploadMoney).matches();
                     if (!matches) {
                         checkWord.add("二次上传金额必须为数字");
@@ -1342,7 +1342,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondItureCost())) {
                     String secondItureCost = excelInfo.getSecondItureCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondItureCost).matches();
                     if (!matches) {
                         checkWord.add("其中支出费用必须为数字");
@@ -1355,7 +1355,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
                     String secondTreatCost = excelInfo.getSecondTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondTreatCost).matches();
                     if (!matches) {
                         checkWord.add("其中待支付费用必须为数字");
@@ -1368,7 +1368,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
                     String secondSuppCost = excelInfo.getSecondSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondSuppCost).matches();
                     if (!matches) {
                         checkWord.add("其中抵顶费用必须为数字");
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
index 89f1996707..3b53f2e0a1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
@@ -69,7 +69,9 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 
     void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("secondTreatCost") String secondTreatCost, @Param("secondSuppCost") String secondSuppCost, @Param("secondSuppRemark") String secondSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("isAdjustment") String isAdjustment, @Param("adjustmentMoney") String adjustmentMoney, @Param("diffAmount") String diffAmount, @Param("sid") String sid);
 
-    ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("calculationModeValue") String calculationModeValue, @Param("useOrgSid") String useOrgSid);
+    ScmVehRebateVo selectByVinNoAndOrgSidDr(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("calculationModeValue") String calculationModeValue, @Param("useOrgSid") String useOrgSid);
+
+    ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("estimateRebate") String estimateRebate, @Param("useOrgSid") String useOrgSid);
 
     @Update("update scm_veh_rebate set adjustmentState = #{adjustmentState} where sid = #{vehRebateSid}")
     void updateAdjustmentState(@Param("vehRebateSid") String vehRebateSid, @Param("adjustmentState") int adjustmentState);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
index 6459d46950..7de9a00552 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
@@ -39,7 +39,7 @@
         ))
     </select>
 
-    <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
+    <select id="selectByVinNoAndOrgSidDr" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
         SELECT *
         FROM scm_veh_rebate
         WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
@@ -50,6 +50,17 @@
           AND createOrgSid = #{useOrgSid}
     </select>
 
+    <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
+        SELECT *
+        FROM scm_veh_rebate
+        WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
+          AND rebateTypeValue = #{rebateTypeValue}
+          AND rebateName = #{rebateName}
+          AND palceGenDate = #{palceGenDate}
+          AND estimateRebate = #{estimateRebate}
+          AND createOrgSid = #{useOrgSid}
+    </select>
+
     <select id="excelListOne" resultType="com.yxt.anrui.scm.api.scmvehrebate.OneExcelVo">
         SELECT
         *,
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index d5bbf2ff77..43e1a91f53 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -820,7 +820,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         if (!importVoList.isEmpty()) {
             for (ScmVehRebateExcelInfo excelInfo : importVoList) {
-                ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getCalculationModeValue(), useOrgSid);
+                ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSidDr(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getCalculationModeValue(), useOrgSid);
                 if (scmVehRebateVo != null) {
                     checkWord.add("车架号为" + excelInfo.getVinNo() + "的单车返利信息已存在");
                     break;
@@ -877,7 +877,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
 //                }
 //                if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
 //                    String estimateRebate = excelInfo.getEstimateRebate();
-//                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+//                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
 //                    boolean matches = pattern.matcher(estimateRebate).matches();
 //                    if (!matches) {
 //                        checkWord.add("返利金额必须为数字");
@@ -890,7 +890,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectTreatCost())) {
                     String expectTreatCost = excelInfo.getExpectTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectTreatCost).matches();
                     if (!matches) {
                         checkWord.add("其中待支付费用必须为数字");
@@ -903,7 +903,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectSuppCost())) {
                     String expectSuppCost = excelInfo.getExpectSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectSuppCost).matches();
                     if (!matches) {
                         checkWord.add("其中抵顶费用必须为数字");
@@ -1233,7 +1233,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) {
                     String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(manufactorSettlementPrice).matches();
                     if (!matches) {
                         checkWord.add("厂家结算价必须为数字");
@@ -1246,7 +1246,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getFreight())) {
                     String freight = excelInfo.getFreight();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(freight).matches();
                     if (!matches) {
                         checkWord.add("其中运费金额必须为数字");
@@ -1295,7 +1295,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -1308,7 +1308,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
                     String withholdCost = excelInfo.getWithholdCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(withholdCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -1357,7 +1357,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -1370,7 +1370,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -1383,7 +1383,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
                     String onceTreatCost = excelInfo.getOnceTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceTreatCost).matches();
                     if (!matches) {
                         checkWord.add("待支付费用必须为数字");
@@ -1396,7 +1396,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
                     String onceSuppCost = excelInfo.getOnceSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceSuppCost).matches();
                     if (!matches) {
                         checkWord.add("抵顶费用必须为数字");
@@ -1691,7 +1691,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) {
                     String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(manufactorSettlementPrice).matches();
                     if (!matches) {
                         checkWord.add("厂家结算价必须为数字");
@@ -1704,7 +1704,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getFreight())) {
                     String freight = excelInfo.getFreight();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(freight).matches();
                     if (!matches) {
                         checkWord.add("其中运费金额必须为数字");
@@ -1747,7 +1747,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -1760,7 +1760,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
                     String withholdCost = excelInfo.getWithholdCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(withholdCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -1809,7 +1809,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -1822,7 +1822,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -1835,7 +1835,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getQzMoney())) {
                     String qzMoney = excelInfo.getQzMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(qzMoney).matches();
                     if (!matches) {
                         checkWord.add("其中费用必须为数字");
@@ -1869,7 +1869,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondaryUploadMoney).matches();
                     if (!matches) {
                         checkWord.add("二次上传金额必须为数字");
@@ -1882,7 +1882,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
                     String secondTreatCost = excelInfo.getSecondTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondTreatCost).matches();
                     if (!matches) {
                         checkWord.add("待支付费用必须为数字");
@@ -1895,7 +1895,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
                     String secondSuppCost = excelInfo.getSecondSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondSuppCost).matches();
                     if (!matches) {
                         checkWord.add("抵顶费费用必须为数字");