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-08 16:07:56 +08:00
parent 5e9a251797
commit 23398b405e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1424,6 +1424,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收，不允许取消"); throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收，不允许取消");
} }
// 非当前网点不允许接其他网点的运单
if(!emisWaybillOld.getSendSiteCode().equals(getCurrentUser().getOwnerSiteCode())){
throw new EmisBizError(EmisBizErrorType.FAIL,"非当前网点运单，不允许操作！");
}
emisWaybill.setBillCode(emisWaybillOld.getBillCode()); emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.cancelOrder(emisWaybill); return emisWaybillMapper.cancelOrder(emisWaybill);
} }
@ -1452,6 +1457,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收,不允许再接单"); throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收,不允许再接单");
} }
// 非当前网点不允许接其他网点的运单
if(!oldEmisWaybill.getSendSiteCode().equals(getCurrentUser().getOwnerSiteCode())){
throw new EmisBizError(EmisBizErrorType.FAIL,"非当前网点运单，请先指派到当前网点！");
}
// 子单号做扣减 // 子单号做扣减
if ("1".equals(emisWaybillSave.getBlGenSubbill())) { if ("1".equals(emisWaybillSave.getBlGenSubbill())) {
Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002"); Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");