From 0bc471ab23c9900486c3056a20b69495a061d6c9 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 4 Jul 2025 18:09:20 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=96=B0=E5=A2=9E/=E5=AF=BC=E5=85=A5/?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=97=B6=E9=97=B4=E6=98=AF=E5=90=A6=E4=BA=A4?=
 =?UTF-8?q?=E5=8F=89=E3=80=82=20=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E9=AA=8C=E9=87=8D=E5=8E=BB=E9=99=A4=E8=87=AA?=
 =?UTF-8?q?=E8=BA=AB=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisQuotePriceServiceImpl.java    | 2 ++
 .../erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java | 6 ++----
 .../src/main/resources/mapper/EmisTransPlanRuleMapper.xml   | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
index be9ae884d..0f83b20c1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
@@ -208,6 +208,8 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
 
                 // 检查是否重复
                 List<EmisQuotePrice> listOld = emisQuotePriceMapper.checkUnique(emisQuotePrice);
+                // 排除自身
+                listOld.removeIf(i -> i.getQuoteId().equals(emisQuotePrice.getQuoteId()));
                 if (!CollectionUtil.isEmpty(listOld)) {
                     String estNameStr = "";
                     for (EmisQuotePrice item : listOld) {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java
index 6106b43f5..149021d12 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java
@@ -284,11 +284,9 @@ public class EmisTransPlanRuleServiceImpl extends EmisBaseService implements IEm
         for (EmisTransPlanRule existingRule : allRules) {
             // 检查产品类型是否有交集
             boolean productTypeOverlap = hasOverlap(newProductType, existingRule.getProductType());
-            // 检查供应商编码是否有交集
-            boolean supplierCodeOverlap = hasOverlap(newSupplierCode, existingRule.getSupplierCode());
 
-            // 如果产品类型和供应商编码都有交集，则认为重复
-            if (productTypeOverlap && supplierCodeOverlap) {
+            // 如果产品类型有交集且供应商编码相同，则认为重复
+            if (productTypeOverlap && compareSupplierCodes(newSupplierCode, existingRule.getSupplierCode())) {
                 return Arrays.asList(existingRule);
             }
         }
diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index 2d1de704c..816a663b8 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -172,8 +172,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lineCode != null  and lineCode != ''">and r.line_code = #{lineCode}</if>
             <if test="startSiteCode != null  and startSiteCode != ''">and r.start_site_code = #{startSiteCode}</if>
             <if test="nextSiteCode != null  and nextSiteCode != ''">and r.next_site_code = #{nextSiteCode}</if>
-            <if test="startDate != null">and r.start_date = #{startDate}</if>
-            <if test="endDate != null">and r.end_date = #{endDate}</if>
+            <if test="startDate != null and endDate != null">
+                and r.start_date &lt;= #{endDate} and r.end_date &gt;= #{startDate}
+            </if>
         </where>
         order by id desc
     </select>