From c9b230e95e5c4f345c80adcda56d439c3d6045d5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 25 May 2024 17:31:18 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/IEmisSpecialCalcWeightService.java   | 2 +-
 .../service/impl/EmisSpecialCalcWeightServiceImpl.java    | 8 ++++++--
 .../main/resources/mapper/EmisSpecialCalcWeightMapper.xml | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java
index a8f132920..e343ecbf5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSpecialCalcWeightService.java
@@ -50,7 +50,7 @@ public interface IEmisSpecialCalcWeightService
      * @param emisSpecialCalcWeight 特殊取重
      * @return 结果
      */
-    public int updateEmisSpecialCalcWeight(EmisSpecialCalcWeight emisSpecialCalcWeight);
+    public int updateEmisSpecialCalcWeight(EmisSpecialCalcWeight emisSpecialCalcWeight) throws EmisBizError;
 
     /**
      * 批量删除特殊取重
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java
index f86e70b2f..c197c31ba 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java
@@ -81,8 +81,12 @@ public class EmisSpecialCalcWeightServiceImpl implements IEmisSpecialCalcWeightS
      * @return 结果
      */
     @Override
-    public int updateEmisSpecialCalcWeight(EmisSpecialCalcWeight emisSpecialCalcWeight)
-    {
+    public int updateEmisSpecialCalcWeight(EmisSpecialCalcWeight emisSpecialCalcWeight) throws EmisBizError {
+        int cnt=emisSpecialCalcWeightMapper.checkUnique(emisSpecialCalcWeight);
+        if(cnt>0){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"区间重复");
+        }
+
         return emisSpecialCalcWeightMapper.updateEmisSpecialCalcWeight(emisSpecialCalcWeight);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
index 9bed05cff..bdb83d857 100644
--- a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
@@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkUnique" parameterType="EmisSpecialCalcWeight"  resultType="int">
 		select count(1) from  emis_special_calc_weight
 		where del_flag='0'
+            <if test="id != null">id!=#{id}</if>
            and prod_code = #{prodCode}
            and
              (