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

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

@@ -481,8 +481,17 @@ public class NoCarServiceImpl implements NoCarService{
         }catch (Exception e){
             return new RespR(false,"有重复运单，请联系管理员删除");
         }
+        if(noCarWayBillDb == null){
+            try{
+                noCarWayBillDb = (NoCarWayBill)noCarWayBill.clone();
+            }catch (Exception e){
+                e.printStackTrace();
+                return new RespR(false,"系统异常，请重试");
+            }
+
+        }
         log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"开始");
-        if(noCarWayBillDb!=null && noCarWayBillDb.getBillwayStatus()>1){
+        if(noCarWayBillDb.getBillwayStatus()>1){
             return new RespR(false,"结束运单已经上传，无需再次上传");
         }
         noCarWayBillDb.setPreEndTime(noCarWayBillDb.getPredictEndTime());

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -325,6 +325,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         noCarWayBill.setHisFlag(0);
                         noCarWaybillMapperImprt.insertImport(noCarWayBill);
                         RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
+                        noCarWayBill.setBillNum(batchNumber);
                         if (respR.getCode() == 1){
                             noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                             stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");