无车优化，自有车接口返回

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

@@ -525,6 +525,7 @@ public class NoCarServiceImpl implements NoCarService {
             insertOrUpdateBillStart(noCarWayBill);
             return respR;
         }
+        String orgBillNum = noCarWayBill.getBillNum();
         if(noCarWayBill.getSplitFlag() == NoCarWayBill.SPLIT_FALG_TRUE){
             //TODO 拆分运单特殊处理
             List<String> startAndEndTimes = DateUtil.getSplitTimeOver96(noCarWayBill.getStartTime(),noCarWayBill.getPredictEndTime());
@@ -536,7 +537,7 @@ public class NoCarServiceImpl implements NoCarService {
                     noCarWayBillClone.setStartTime(startAndEndTimeStr[0]);
                     noCarWayBillClone.setPredictEndTime(startAndEndTimeStr[1]);
                     noCarWayBillClone.setBillNum(noCarWayBill.getBillNum()+"-jk0"+i);
-                    WaybillHistoryStartRequest waybillHistoryStartRequest = buildNoCarHisWaybill(noCarWayBillClone);
+                    WaybillHistoryStartRequest waybillHistoryStartRequest = buildNoCarHisWaybill(orgBillNum,noCarWayBillClone);
                     RespR<WaybillHistoryStartResponse> responseRespR = noCarInterface.waybillHistoryStart(waybillHistoryStartRequest);
                     if (responseRespR.getCode() == 1) {
                         log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}", noCarWayBillClone, responseRespR.getMsg());
@@ -560,7 +561,7 @@ public class NoCarServiceImpl implements NoCarService {
             insertOrUpdateBillStart(noCarWayBill);
             return new RespR(true);
         }else{
-            WaybillHistoryStartRequest waybillHistoryStartRequest = buildNoCarHisWaybill(noCarWayBill);
+            WaybillHistoryStartRequest waybillHistoryStartRequest = buildNoCarHisWaybill(orgBillNum,noCarWayBill);
             RespR<WaybillHistoryStartResponse> responseRespR = noCarInterface.waybillHistoryStart(waybillHistoryStartRequest);
 
             if (responseRespR.getCode() == 1) {
@@ -579,7 +580,7 @@ public class NoCarServiceImpl implements NoCarService {
         }
     }
 
-    public WaybillHistoryStartRequest buildNoCarHisWaybill(NoCarWayBill noCarWayBill) {
+    public WaybillHistoryStartRequest buildNoCarHisWaybill(String orgBillNum,NoCarWayBill noCarWayBill) {
         WaybillHistoryStartRequest waybillStartRequest = new WaybillHistoryStartRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         waybillStartRequest.setCompanyNum(companyNum);
@@ -599,7 +600,7 @@ public class NoCarServiceImpl implements NoCarService {
         waybillStartRequest.setBank(noCarWayBill.getCompanyBank());
         waybillStartRequest.setBankAccount(noCarWayBill.getCompanyBankAcc());
         if(noCarWayBill.getBase64Str() == null){
-            NoCarWayBillFileInfo noCarWayBillFileInfo =  wayBillFileMapper.selectFileInfo(noCarWayBill.getFileBatchNum(),noCarWayBill.getBillNum());
+            NoCarWayBillFileInfo noCarWayBillFileInfo =  wayBillFileMapper.selectFileInfo(noCarWayBill.getFileBatchNum(),orgBillNum);
             if(noCarWayBillFileInfo!=null){
                 waybillStartRequest.setWaybillFileName(noCarWayBillFileInfo.getFileName());
                 waybillStartRequest.setBase64Str(noCarWayBillFileInfo.getBase64Str());