From 6c07edac49eeb118af17970ac39bd3f48b5fb6ba Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 2 Jan 2025 15:50:06 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 ++++++------ .../emis/service/impl/EmisWaybillServiceImpl.java | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) 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 090d92859..e4eb355c0 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 @@ -3071,18 +3071,18 @@ 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, "订单已取消，不允许修改"); } if(WaybillStatus.INIT.statusCode.equals(emisWaybill.getWaybillStatus())){ throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "未接单，不允许修改"); } - if(OrderStatus.CANCEL.statusCode.equals(emisWaybill.getOrderStatus())){ - throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "订单已取消，不允许修改"); - } - if( PaymentStatus.PAID.statusCode.equals(emisWaybill.getPaymentStatus()) || PaymentStatus.PAID_SOME.statusCode.equals(emisWaybill.getPaymentStatus()) ){ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index a75495b45..e9969b929 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1213,7 +1213,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } if(!WaybillStatus.INIT.statusCode.equals(oldEmisWaybill.getWaybillStatus())){ - throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收"); + throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收,不允许再接单"); } // 子单号做扣减 @@ -1291,9 +1291,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } } - - - // 占用进仓单号 if(!StringUtils.isEmpty(emisWaybillSave.getWarehouseInNo())) { String warehouseInNo = WaybillHelper.formatQueryValue(emisWaybillSave.getWarehouseInNo());