From 8b0de54cdbb03074ddfe57e2ad4e837ce008337d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 4 Dec 2024 12:41:24 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/apiweb/WaybillController.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
index 3305a1e..27b0419 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
@@ -27,6 +27,7 @@ import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.ServletUtils;
 import com.xdadan.erp.common.utils.idgen.UUID;
 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.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.FeeItem;
@@ -276,7 +277,14 @@ public class WaybillController extends BaseController
         try {
 
             if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){
+                try {
                     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();