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}, '%') - 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}) 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 @@ and a.send_date ]]> '2025-01-01 00:00:00' and a.send_date 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}