1、上传原始运单改造

2、超时运单按照数据源返回

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -452,6 +452,10 @@ public class NoCarServiceImpl implements NoCarService {
             }
 
         }
+        if (noCarWayBillDb.getBillwayStatus() == 0) {
+            return new RespR(false, "未上传原始运单，请联系管理员确认");
+        }
+
         if (noCarWayBillDb.getBillwayStatus() > 1) {
             return new RespR(false, "运单已经结束或者是历史已结束运单，请联系管理员确认");
         }
@@ -609,7 +613,7 @@ public class NoCarServiceImpl implements NoCarService {
                     noCarWayBill.setBillwayStatus(0);
                     noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                     insertOrUpdateBillStart(noCarWayBill);
-                    return new RespR(false, responseRespR1.getMsg());
+                    return new RespR(false, "原始运单上传失败:" + responseRespR1.getMsg());
                 }else{
                     noCarWayBill.setBillwayStatus(1);
                     insertOrUpdateBillStart(noCarWayBill);
@@ -636,7 +640,7 @@ public class NoCarServiceImpl implements NoCarService {
                 if(responseRespR1.getCode() == 1){
                     noCarWayBill.setFailReason("ysyd:"+responseRespR1.getMsg());
                     insertOrUpdateBillStart(noCarWayBill);
-                    return new RespR(false, responseRespR1.getMsg());
+                    return new RespR(false, "原始运单上传失败:" + responseRespR1.getMsg());
                 } else {
                     noCarWayBill.setBillwayStatus(1);
                     insertOrUpdateBillStart(noCarWayBill);
@@ -754,6 +758,11 @@ public class NoCarServiceImpl implements NoCarService {
 
         }
         log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}", noCarWayBill, "开始");
+
+        if (noCarWayBillDb.getBillwayStatus() == 0) {
+            return new RespR(false, "原始运单未上传，请联系管理员确认");
+        }
+
         if (noCarWayBillDb.getBillwayStatus() > 1) {
             return new RespR(false, "结束运单已经上传，无需再次上传");
         }