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-02 15:50:06 +08:00
parent 8d585c86e1
commit 6c07edac49
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3071,18 +3071,18 @@ 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())){
throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "订单已取消，不允许修改");
} }
if(WaybillStatus.INIT.statusCode.equals(emisWaybill.getWaybillStatus())){ if(WaybillStatus.INIT.statusCode.equals(emisWaybill.getWaybillStatus())){
throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "未接单，不允许修改"); 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()) if( PaymentStatus.PAID.statusCode.equals(emisWaybill.getPaymentStatus())
|| PaymentStatus.PAID_SOME.statusCode.equals(emisWaybill.getPaymentStatus()) || PaymentStatus.PAID_SOME.statusCode.equals(emisWaybill.getPaymentStatus())
){ ){

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1213,7 +1213,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
if(!WaybillStatus.INIT.statusCode.equals(oldEmisWaybill.getWaybillStatus())){ 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())) { if(!StringUtils.isEmpty(emisWaybillSave.getWarehouseInNo())) {
String warehouseInNo = WaybillHelper.formatQueryValue(emisWaybillSave.getWarehouseInNo()); String warehouseInNo = WaybillHelper.formatQueryValue(emisWaybillSave.getWarehouseInNo());