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

md

Browse Source
This commit is contained in:
linfso 2024-12-04 12:41:24 +08:00
parent 71e079f19b
commit 8b0de54cdb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
View File

@ -27,6 +27,7 @@ import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.ServletUtils; import com.xdadan.erp.common.utils.ServletUtils;
import com.xdadan.erp.common.utils.idgen.UUID; import com.xdadan.erp.common.utils.idgen.UUID;
import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.FeeItem; import com.xdadan.erp.emis.domain.vo.FeeItem;
@ -276,7 +277,14 @@ public class WaybillController extends BaseController
try { try {
if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){ if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){
try {
waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(), "T7080")); waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(), "T7080"));
}catch(EmisBizError ex){
// 如果网点单号不足使用总部单号
if(EmisBizErrorType.NOT_ENOUGH_PAG.errorCode.equals(ex.getErrorCode()) ){
waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill("88888", "T7080"));
}
}
} }
EmisWaybill emisWaybillSave = waybillOrder.toDb(); EmisWaybill emisWaybillSave = waybillOrder.toDb();