demand: TMS系统-大客户管理-大客户单独报价-报价批量录入 漏组批次订单查询各网点能查询到自己网点相关的漏组信息

committer: heyu

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 {

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}

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}