diff --git a/kas-admin/src/main/resources/application-pro.yml b/kas-admin/src/main/resources/application-pro.yml
index 575a8c2db55814dd7d53c42cfc097a675b7fd1ba..2110c7ae13bf4756866c34e5d96815b7bb995507 100644
--- a/kas-admin/src/main/resources/application-pro.yml
+++ b/kas-admin/src/main/resources/application-pro.yml
@@ -70,7 +70,7 @@ security.jwt:
securityconfig:
logoutsuccssurl: /
- permitall: /webjars/**,/swagger-resources/**,/v2/**,/,/*.html,favicon.ico,/**/*.html,/**/*.css,/**/*.js,/druid/**,/account/login,/api/order/orderSelect,/excel/getExcel,/otd/getWaybillCode
+ permitall: /webjars/**,/swagger-resources/**,/v2/**,/,/*.html,favicon.ico,/**/*.html,/**/*.css,/**/*.js,/druid/**,/account/login,/api/order/orderSelect,/excel/getExcel,/otd/getWaybillCode,/excel/getExceptionExcel,/order/exception/exceptionLine
baiduMap:
apiKey: Sfp9cEKmk0p7BzUl1NwQPCIgYrh1m83L
diff --git a/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml b/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml
index 48e03ba667809adc09f8fb2fe074451a14469011..a6057deddf51599ab5093fc4f02f9d88a250a097 100644
--- a/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml
+++ b/kas-dao/src/main/resources/mapper/order/OrderOtdMapper.xml
@@ -221,6 +221,16 @@
AND koo.shipto_time>=koo.returnOrder_time
+
+ and koo.transport_type <> '自提' and koo.pick_time >'2019-4-1'
+ AND koo.leave_time IS NOT NULL AND koo.shipto_time IS NULL
+ and not exists(select 1 from kas_order_otd_detail od where od.sys_order_no=koo.sys_order_no )
+
+
+ and koo.transport_type <>'自提' and koo.pick_time >'2019-4-1'
+ AND koo.leave_time IS NOT NULL AND koo.shipto_time IS NULL
+ and not exists(select 1 from kas_order_otd_detail od where od.sys_order_no=koo.sys_order_no and od.track_time >=date_sub(current_date(),interval 2 DAY))
+