aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-03 09:24:00 +08:00
parent b93148ba8b
commit 70fb3607ad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -3075,9 +3075,9 @@ public class EmisBaseService {
if(emisWaybill!=null ) { if(emisWaybill!=null ) {
// 未接单不判断超时 // 未接单不判断超时
// if(OrderStatus.INIT.statusCode.equals(emisWaybill.getOrderStatus())){ if(OrderStatus.INIT.statusCode.equals(emisWaybill.getOrderStatus())){
// return; return;
// } }
if(OrderStatus.CANCEL.statusCode.equals(emisWaybill.getOrderStatus())){ if(OrderStatus.CANCEL.statusCode.equals(emisWaybill.getOrderStatus())){
throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "订单已取消，不允许修改"); throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "订单已取消，不允许修改");

2
emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
View File

@ -306,7 +306,7 @@
manager_phone as tel, manager_phone as tel,
address as address address as address
from emis_site a 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'
<if test="searchValue != null and searchValue != ''"> <if test="searchValue != null and searchValue != ''">
and site_name like concat('%', #{searchValue}, '%') and site_name like concat('%', #{searchValue}, '%')
</if> </if>