1、上传原始运单改造

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

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

@@ -50,7 +50,6 @@ import com.jkcredit.invoice.service.lowerservice.vo.HcInvoiceQueryVo;
 import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.HcInvoiceService;
-import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.nocar.WayBillFileService;
 import com.jkcredit.invoice.service.upservice.NoCarInterface;
@@ -315,7 +314,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);
@@ -336,7 +335,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);
@@ -862,8 +861,19 @@ public class NoCarServiceImpl implements NoCarService {
         }
         log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}", noCarWayBill, isInterface);
         if (isaBoolean(noCarWayBill, isInterface)) {
+            //如果超时运单，直接用数据源的返回
+            if (noCarWayBill.getBillwayStatus() == FOR_NUM) {
+                //进行取票操作
+                WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
+                String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
+                waybillNumFindInvoiceRequest.setCompanyNum(companyNum);
+                waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBill.getBillNum());
+                RespR<WaybillNumFindInvoiceResponse> responseRespR = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
+                return new RespR(responseRespR.getData());
+            }
+
             if (isaBoolean(noCarWayBill)) {
-                //直接返回发票信息
+                //其余情况直接返回发票信息
                 List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
                 WaybillNumFindInvoiceResponse waybillNumFindInvoiceResponse = buildInterFaceVoiceData(noCarWayBill, billInvoices);
                 return new RespR(waybillNumFindInvoiceResponse);