From d8d7f98e6dc5ae7e86170e9eab285a7bf01d1ffc Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 8 Jul 2025 14:22:45 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F-=E5=A4=A7?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86-=E5=A4=A7=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=8D=95=E7=8B=AC=E6=8A=A5=E4=BB=B7-=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=20=20=E6=BC=8F?=
 =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=90=84=E7=BD=91=E7=82=B9=E8=83=BD=E6=9F=A5=E8=AF=A2=E5=88=B0?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=BD=91=E7=82=B9=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E6=BC=8F=E7=BB=84=E4=BF=A1=E6=81=AF=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisQuotePriceServiceImpl.java       | 2 +-
 .../src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml   | 3 ++-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml       | 2 +-
 3 files changed, 4 insertions(+), 3 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 0f83b20c1..fbf461894 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
@@ -414,7 +414,7 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
             emisQuotePrice.setDispAreaSiteCode(dispArea.getAreaSiteCode());
             emisQuotePrice.setDispAreaSite(dispArea.getAreaSite());
         }
-        emisQuotePrice.setQuoteType("1");
+//        emisQuotePrice.setQuoteType("1");
     }
 
     private static void checkDate(EmisQuotePrice emisQuotePrice) throws EmisBizError {
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
index ef6032fa0..563332b62 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
@@ -252,7 +252,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND k.trans_manager like concat('%', #{transManager}, '%')
                     </if>
                     <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-                        and (r.manager=#{params.privEmpName} or k.trans_manager=#{params.privEmpName})
+                        and (m.start_site_code=#{params.privSiteCode} or m.next_site_code=#{params.privSiteCode} or
+                        r.manager=#{params.privEmpName} or k.trans_manager=#{params.privEmpName})
                     </if>
                     <if test="lineCode != null and lineCode != ''">
                         AND m.line_code = #{lineCode}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 32a967513..6126a94a9 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -3822,7 +3822,7 @@
         </if>
           and a.send_date <![CDATA[ > ]]> '2025-01-01 00:00:00'
         and a.send_date <![CDATA[ <= ]]> DATE_SUB(CURDATE(), INTERVAL 7 DAY)
-        and a.problem_type != 151
+        and (a.problem_type is null or a.problem_type != 151)
         and a.order_status not in ('0','2')
         order by a.create_time desc
         limit #{offset}, #{pageSize}