diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 890952d3c..36eb33a55 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -3075,9 +3075,9 @@ public class EmisBaseService { if(emisWaybill!=null ) { // 未接单不判断超时 -// if(OrderStatus.INIT.statusCode.equals(emisWaybill.getOrderStatus())){ -// return; -// } + if(OrderStatus.INIT.statusCode.equals(emisWaybill.getOrderStatus())){ + return; + } if(OrderStatus.CANCEL.statusCode.equals(emisWaybill.getOrderStatus())){ throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "订单已取消,不允许修改"); diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml index b5886eeb0..fb16fb2d6 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml @@ -306,7 +306,7 @@ manager_phone as tel, address as address from emis_site a - where a.del_flag='0' and bl_warehouse_in='1' and status=0 + where a.del_flag='0' and bl_warehouse_in='1' and site_name like concat('%', #{searchValue}, '%')