diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
index 6222783318..509707182a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
@@ -204,4 +204,7 @@ public interface CommonContractFeign {
     @GetMapping(value = "/getContractBySalesOrderSid/{busSid}")
     ResultBean<CommonContractVo> getContractBySalesOrderSid(@PathVariable("busSid") String busSid);
 
+    @ApiOperation(value = "根据合同编号获取合同信息")
+    @GetMapping(value = "/selectByNo")
+    ResultBean<CommonContract> selectByNo(@RequestParam("contractNo") String contractNo);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
index 76ac4c6874..ca17822fcb 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
@@ -213,4 +213,9 @@ public class CommonContractFeignFallback implements CommonContractFeign {
     public ResultBean<CommonContractVo>  getContractBySalesOrderSid(String busSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<CommonContract> selectByNo(String contractNo) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
index 92434c133e..151c33d69e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
@@ -91,4 +91,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
 
     @Select("select * from common_contract where busSid = #{busSid}")
     CommonContractVo getContractBySalesOrderSid(@Param("busSid") String busSid);
+
+    CommonContract selectByNo(String contractNo);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
index 6d10d1a233..242b522434 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
@@ -154,4 +154,8 @@
         from common_contract
         where busSid = #{sid}
     </select>
+
+    <select id="selectByNo" resultType="com.yxt.anrui.base.api.commoncontract.CommonContract">
+        select * from common_contract where contractNo = #{contractNo}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
index ba5454ce19..37d9e29aaa 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
@@ -576,4 +576,9 @@ public class CommonContractRest implements CommonContractFeign {
     public ResultBean<CommonContractVo>  getContractBySalesOrderSid(String busSid) {
         return commonContractService.getContractBySalesOrderSid(busSid);
     }
+
+    @Override
+    public ResultBean<CommonContract> selectByNo(String contractNo) {
+        return commonContractService.selectByNo(contractNo);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 10d17e716a..ab311250a2 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1777,4 +1777,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return rb.success().setData(commonContractVo);
     }
 
+    public ResultBean<CommonContract> selectByNo(String contractNo) {
+        ResultBean<CommonContract> rb = ResultBean.fireFail();
+        CommonContract commonContract = baseMapper.selectByNo(contractNo);
+        return rb.success().setData(commonContract);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java
index 55c0677ea9..20a8686e60 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java
@@ -1,14 +1,10 @@
 package com.yxt.anrui.buscenter.api.bushandover;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandover.java <br/>
@@ -28,44 +24,4 @@ import java.util.Date;
 public class BusHandover extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
-	@ApiModelProperty("确认单编号（制定编号规则:单据类型编号+部门全编号+yyyyMMDD+0000）")
-    private String billNo;
-
-    @ApiModelProperty("销售单编号")
-    private String orderSid;
-    
-	@ApiModelProperty("贷款人sid")
-    private String borrowerSid;
-    
-	@ApiModelProperty("贷款名称")
-    private String borrowerName;
-    
-	@ApiModelProperty("业务员sid")
-    private String staffSid;
-    
-	@ApiModelProperty("交车人姓名")
-    private String staffName;
-    
-	@ApiModelProperty("部门sid")
-    private String orgSid;
-    
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-	@ApiModelProperty("交车日期")
-    private Date deliveryDate;
-    
-	@ApiModelProperty("交车地点")
-    private String deliveryAddress;
-    
-	@ApiModelProperty("确认结论")
-    private String conclusion;
-    
-	@ApiModelProperty("定位信息")
-    private String glsInfo;
-    
-	@ApiModelProperty("委托书照片（非本人提车）")
-    private String authorizationPhoto;
-    
-	@ApiModelProperty("签收人签字照片")
-    private String receiverSign;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java
index 276969daf2..8a8812881f 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java
@@ -1,14 +1,7 @@
 package com.yxt.anrui.buscenter.api.bushandover;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务中心) <br/>
@@ -31,7 +24,7 @@ import java.util.List;
         fallback = BusHandoverFeignFallback.class)
 public interface BusHandoverFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+ /*   @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusHandoverVo>> listPage(@RequestBody PagerQuery<BusHandoverQuery> pq);
 
@@ -70,6 +63,6 @@ public interface BusHandoverFeign {
 
     @ApiOperation("客户端信息初始化")
     @GetMapping("/initInsert/{sid}")
-    public ResultBean<BusHandoverWsVo> initInsert(@PathVariable("sid") String sid);
+    public ResultBean<BusHandoverWsVo> initInsert(@PathVariable("sid") String sid);*/
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java
index 7f7e6c5b48..21a50f13f4 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeignFallback.java
@@ -23,7 +23,7 @@ import java.util.List;
 @Component
 public class BusHandoverFeignFallback implements BusHandoverFeign {
 
-	@Override
+	/*@Override
 	public ResultBean<PagerVo<BusHandoverVo>> listPage(PagerQuery<BusHandoverQuery> pq){
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-buscenter/bushandover/listPage无法访问");
@@ -76,6 +76,6 @@ public class BusHandoverFeignFallback implements BusHandoverFeign {
 	@Override
 	public ResultBean<BusHandoverWsVo> initInsert(String sid) {
 		return null;
-	}
+	}*/
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java
new file mode 100644
index 0000000000..3207c9e3be
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoItemListVo.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bushandoveritems;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:19
+ * @Description
+ */
+@Data
+public class BusHandoItemListVo implements Vo {
+    private static final long serialVersionUID = -1010717413924813866L;
+
+    @ApiModelProperty("清单名称")
+    private String name;
+    @ApiModelProperty("默认true")
+    private boolean state;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java
index 2032f71ce1..700e8ce22e 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItems.java
@@ -3,7 +3,6 @@ package com.yxt.anrui.buscenter.api.bushandoveritems;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -25,34 +24,21 @@ import lombok.Data;
 public class BusHandoverItems extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
-	@ApiModelProperty("确认单sid")
     private String handoverSid;
-    
-	@ApiModelProperty("发票")
-    private Integer invoice;
-    
-	@ApiModelProperty("合格证")
-    private Integer certificate;
-    
-	@ApiModelProperty("一致性证书")
-    private Integer consistency;
-    
-	@ApiModelProperty("申请表")
-    private Integer applyForm;
-    
-	@ApiModelProperty("保修手册")
-    private Integer warrantManual;
-    
-	@ApiModelProperty("环保清单")
-    private Integer protectionList;
-    
-	@ApiModelProperty("驾驶员卡")
-    private Integer driverCard;
-    
-	@ApiModelProperty("GPS入网")
-    private Integer gpsInternet;
-    
-	@ApiModelProperty("其他工具")
-    private String otherTools;
+
+    private String modelSid;
+    private String modelName;
+
+    private String vinSid;
+
+    private String vinNo;
+    private String itemKey;
+
+    private String itemValue;
+
+    private String handoverPhoto;
+
+    private String policyPhoto;
+
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsDto.java
index 7d4b0d6e1c..0cfaf0e2f7 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsDto.java
@@ -24,33 +24,5 @@ import lombok.Data;
 public class BusHandoverItemsDto implements Dto {
 
     
-	@ApiModelProperty("确认单sid")
-    private String handoverSid;
-    
-	@ApiModelProperty("发票")
-    private Integer invoice;
-    
-	@ApiModelProperty("合格证")
-    private Integer certificate;
-    
-	@ApiModelProperty("一致性证书")
-    private Integer consistency;
-    
-	@ApiModelProperty("申请表")
-    private Integer applyForm;
-    
-	@ApiModelProperty("保修手册")
-    private Integer warrantManual;
-    
-	@ApiModelProperty("环保清单")
-    private Integer protectionList;
-    
-	@ApiModelProperty("驾驶员卡")
-    private Integer driverCard;
-    
-	@ApiModelProperty("GPS入网")
-    private Integer gpsInternet;
-    
-	@ApiModelProperty("其他工具")
-    private String otherTools;
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeign.java
index c194343216..001884182a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeign.java
@@ -1,13 +1,9 @@
 package com.yxt.anrui.buscenter.api.bushandoveritems;
 
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -32,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
         fallback = BusHandoverItemsFeignFallback.class)
 public interface BusHandoverItemsFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+   /* @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusHandoverItemsVo>> listPage(@RequestBody PagerQuery<BusHandoverItemsQuery> pq);
 
@@ -50,5 +46,9 @@ public interface BusHandoverItemsFeign {
 
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchSid/{sid}")
-    public ResultBean<BusHandoverItems> fetchBySid(@PathVariable("sid") String sid);
+    public ResultBean<BusHandoverItems> fetchBySid(@PathVariable("sid") String sid);*/
+
+    @ApiOperation("获取交车交付信息")
+    @PostMapping("/getDeliveryBill")
+    ResultBean<BusHandoverItemsVo> getDeliveryBill(@RequestBody BusHandoverItemsQuery query);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeignFallback.java
index 07af44434e..e11d76f2cf 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsFeignFallback.java
@@ -1,8 +1,6 @@
 package com.yxt.anrui.buscenter.api.bushandoveritems;
 
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 /**
@@ -22,6 +20,11 @@ import org.springframework.stereotype.Component;
 public class BusHandoverItemsFeignFallback implements BusHandoverItemsFeign {
 
     @Override
+    public ResultBean<BusHandoverItemsVo> getDeliveryBill(BusHandoverItemsQuery query) {
+        return null;
+    }
+
+   /* @Override
     public ResultBean<PagerVo<BusHandoverItemsVo>> listPage(PagerQuery<BusHandoverItemsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-buscenter/bushandoveritems/listPage无法访问");
@@ -47,5 +50,5 @@ public class BusHandoverItemsFeignFallback implements BusHandoverItemsFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-buscenter/bushandoveritems/fetch无法访问");
     }
-
+*/
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListQuery.java
new file mode 100644
index 0000000000..0bcc71a154
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListQuery.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bushandoveritems;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:21
+ * @Description
+ */
+@Data
+public class BusHandoverItemsListQuery implements Query {
+    private static final long serialVersionUID = -2469417654401015391L;
+
+    private String vin;
+
+    private String carSid;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java
new file mode 100644
index 0000000000..bdd22a96d6
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsListVo.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.buscenter.api.bushandoveritems;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:18
+ * @Description
+ */
+@Data
+public class BusHandoverItemsListVo implements Vo {
+    private static final long serialVersionUID = 6248282126372736711L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    private List<BusHandoItemListVo> mainfest;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java
index 5cb71ef5dd..3c29ec9554 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsQuery.java
@@ -3,9 +3,10 @@ package com.yxt.anrui.buscenter.api.bushandoveritems;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverItemsQuery.java <br/>
@@ -23,34 +24,13 @@ import lombok.Data;
 @Data
 public class BusHandoverItemsQuery implements Query {
 
-    
-	@ApiModelProperty("确认单sid")
-    private String handoverSid;
-    
-	@ApiModelProperty("发票")
-    private Integer invoice;
-    
-	@ApiModelProperty("合格证")
-    private Integer certificate;
-    
-	@ApiModelProperty("一致性证书")
-    private Integer consistency;
-    
-	@ApiModelProperty("申请表")
-    private Integer applyForm;
-    
-	@ApiModelProperty("保修手册")
-    private Integer warrantManual;
-    
-	@ApiModelProperty("环保清单")
-    private Integer protectionList;
-
-	@ApiModelProperty("驾驶员卡")
-    private Integer driverCard;
-    
-	@ApiModelProperty("GPS入网")
-    private Integer gpsInternet;
-    
-	@ApiModelProperty("其他工具")
-    private String otherTools;
+
+    private static final long serialVersionUID = 786084539963781118L;
+    private String userSid;
+
+    private List<BusHandoverItemsListQuery> list;
+
+    private String contractSid;
+
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java
index 58104687dc..781e042fa4 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoveritems/BusHandoverItemsVo.java
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverItemsVo.java <br/>
@@ -22,38 +24,19 @@ import lombok.Data;
 @ApiModel(value = "交车确认单-交接清单 视图数据对象", description = "交车确认单-交接清单 视图数据对象")
 @Data
 public class BusHandoverItemsVo implements Vo {
+    private static final long serialVersionUID = -2147801665880523508L;
 
-
-    @ApiModelProperty("sid")
-    private String sid;
-    
-	@ApiModelProperty("确认单sid")
-    private String handoverSid;
-    
-	@ApiModelProperty("发票")
-    private Integer invoice=0;
-    
-	@ApiModelProperty("合格证")
-    private Integer certificate=0;
-    
-	@ApiModelProperty("一致性证书")
-    private Integer consistency=0;
-    
-	@ApiModelProperty("申请表")
-    private Integer applyForm=0;
-    
-	@ApiModelProperty("保修手册")
-    private Integer warrantManual=0;
-    
-	@ApiModelProperty("环保清单")
-    private Integer protectionList=0;
-    
-	@ApiModelProperty("驾驶员卡")
-    private Integer driverCard=0;
-    
-	@ApiModelProperty("GPS入网")
-    private Integer gpsInternet=0;
-    
-	@ApiModelProperty("其他工具")
-    private String otherTools;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("接收人")
+    private String name;
+    @ApiModelProperty("身份证号")
+    private String idNumber;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("交付日期")
+    private String date;
+    @ApiModelProperty("交付地点")
+    private String address;
+    private List<BusHandoverItemsListVo> vinList;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java
new file mode 100644
index 0000000000..3806281783
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:21
+ * @Description
+ */
+@Data
+public class BusHandoverWait extends BaseEntity {
+    private static final long serialVersionUID = -5863390741808170820L;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+
+    @ApiModelProperty("付款方式value")
+    private String payTypeValue;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+
+    @ApiModelProperty("付款状态key")
+    private String payStateKey;
+
+    @ApiModelProperty("付款状态value")
+    private String payStateValue;
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java
new file mode 100644
index 0000000000..8c09bf8feb
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeign.java
@@ -0,0 +1,30 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:39
+ * @Description
+ */
+@Api(tags = "待交车车辆")
+@FeignClient(
+        contextId = "anrui-buscenter-BusHandoverWait",
+        name = "anrui-buscenter",
+        path = "v1/bushandoverwait",
+        fallback = BusHandoverWaitFeignFallback.class)
+public interface BusHandoverWaitFeign {
+
+    @ApiOperation("待交车车辆列表")
+    @PostMapping("/pagerList")
+    @ResponseBody
+    ResultBean<PagerVo<BusHandoverWaitVo>> pagerList(@RequestBody PagerQuery<BusHandoverWaitQuery> pagerQuery);
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeignFallback.java
new file mode 100644
index 0000000000..b71dead889
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitFeignFallback.java
@@ -0,0 +1,12 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:45
+ * @Description
+ */
+@Controller
+public class BusHandoverWaitFeignFallback {
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitListVo.java
new file mode 100644
index 0000000000..fd3926ff98
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitListVo.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 20:38
+ * @Description
+ */
+@Data
+public class BusHandoverWaitListVo implements Vo {
+    private static final long serialVersionUID = 4081821318088390025L;
+    private String vinNo;
+    private String vinSid;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitQuery.java
new file mode 100644
index 0000000000..5eea196c34
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitQuery.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:53
+ * @Description
+ */
+@Data
+public class BusHandoverWaitQuery implements Query {
+    private static final long serialVersionUID = 1785723361109634458L;
+
+    private String userSid;
+
+    private String name;
+
+    private String orgPath;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java
new file mode 100644
index 0000000000..b23f617a97
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitVo.java
@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.bushandoverwait;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:48
+ * @Description
+ */
+@Data
+public class BusHandoverWaitVo implements Vo {
+    private static final long serialVersionUID = 1901951619613827051L;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("合同状态")
+    private String contractState;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("付款方式")
+    private String payType;
+
+    private List<BusHandoverWaitListVo> list = new ArrayList<>();
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java
index 7f0c3e4908..43cdef91eb 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java
@@ -1,17 +1,8 @@
 package com.yxt.anrui.buscenter.biz.bushandover;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.buscenter.api.bushandover.BusHandoverWsVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.buscenter.api.bushandover.BusHandover;
-import com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo;
-
-import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * Project: anrui-buscenter(业务中心) <br/>
@@ -29,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface BusHandoverMapper extends BaseMapper<BusHandover> {
 
-	//@Update("update bus_handover set name=#{msg} where id=#{id}")
+	/*//@Update("update bus_handover set name=#{msg} where id=#{id}")
 	//IPage<BusHandoverVo> voPage(IPage<BusHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusHandover> qw);
 	
 	IPage<BusHandoverVo> selectPageVo(IPage<BusHandover> page, @Param(Constants.WRAPPER) Wrapper<BusHandover> qw);
@@ -41,5 +32,5 @@ public interface BusHandoverMapper extends BaseMapper<BusHandover> {
 
     BusHandoverWsVo selectByOrderSid(@Param("orderSid") String orderSid);
 
-	int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid);
+	int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid);*/
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml
index 7fa922b775..469247adb1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml
@@ -1,21 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bushandover.BusHandoverMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo">
-		SELECT * FROM bus_handover <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo">
-		SELECT * FROM bus_handover <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+   <!-- <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo">
+        SELECT *
+        FROM bus_handover
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverVo">
+        SELECT *
+        FROM bus_handover
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
     <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bushandover.BusHandoverWsVo">
-		SELECT * FROM bus_handover where orderSid=#{orderSid}
-	</select>
+        SELECT *
+        FROM bus_handover
+        where orderSid = #{orderSid}
+    </select>
 
-	<select id="selectCountByOrgSid" resultType="int">
-		SELECT count(*) FROM bus_handover
-		WHERE createDate=#{date} AND orgSid=#{orgSid} AND billNo LIKE concat( #{billsType}, '%')
-	</select>
+    <select id="selectCountByOrgSid" resultType="int">
+        SELECT count(*)
+        FROM bus_handover
+        WHERE createDate = #{date}
+          AND orgSid = #{orgSid}
+          AND billNo LIKE concat(#{billsType}, '%')
+    </select>-->
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java
index 2d0bad1a4c..47b3065e13 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverRest.java
@@ -1,38 +1,10 @@
 package com.yxt.anrui.buscenter.biz.bushandover;
 
-import com.yxt.anrui.buscenter.api.bushandover.*;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsDto;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo;
-import com.yxt.anrui.buscenter.api.bushandoverphoto.BusHandoverPhoto;
-import com.yxt.anrui.buscenter.api.bushandoverphoto.BusHandoverPhotoDto;
-import com.yxt.anrui.buscenter.api.bushandoverphoto.BusHandoverPhotoVo;
-import com.yxt.anrui.buscenter.api.busorder.BusOrder;
-import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleOneVo;
-import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService;
-import com.yxt.anrui.buscenter.biz.bushandoverphoto.BusHandoverPhotoService;
-import com.yxt.anrui.buscenter.biz.busorder.BusOrderService;
-import com.yxt.anrui.buscenter.biz.busordervehicle.BusOrderVehicleService;
-import com.yxt.anrui.crm.api.finborrower.FinBorrower;
-import com.yxt.anrui.crm.api.finborrower.FinBorrowerFeign;
-import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadpriceFeign;
-import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadpriceVo;
-import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.base.utils.DateUtils;
-import com.yxt.common.base.utils.StringUtils;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.buscenter.api.bushandover.BusHandoverFeign;
 import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverFeignFallback.java <br/>
@@ -50,7 +22,7 @@ import java.util.List;
 @RestController
 @RequestMapping("v1/bushandover")
 public class BusHandoverRest implements BusHandoverFeign {
-    @Autowired
+    /*@Autowired
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BusHandoverService busHandoverService;
@@ -147,7 +119,7 @@ public class BusHandoverRest implements BusHandoverFeign {
             busHandover.setDeliveryDate(d);
         }
         busHandoverService.updateById(busHandover);
-        /****************保存交接清单信息******************/
+        *//****************保存交接清单信息******************//*
         BusHandoverItems b = new BusHandoverItems();
         BusHandoverItemsVo busHandoverItemsVo = busHandoverItemsService.fetchByHandoverSid(sid);
         BusHandoverItemsDto bDto = dto.getBusHandoverItemsDto();
@@ -160,7 +132,7 @@ public class BusHandoverRest implements BusHandoverFeign {
             busHandoverItemsService.updateById(BusHandoverItems);
         }
 
-        /****************保存现场轿车拍照图片******************/
+        *//****************保存现场轿车拍照图片******************//*
         List<BusHandoverPhotoDto> carPhotos = dto.getCarPhoto();
         busHandoverPhotoService.delByHandoverSid(sid);
         if (carPhotos != null) {
@@ -266,5 +238,5 @@ public class BusHandoverRest implements BusHandoverFeign {
         }
         vo.setBusHandoverItemsVo(busHandoverItemsVo);
         return rb.success().setData(vo);
-    }
+    }*/
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index 0b7ad86b71..3c7b1b36b5 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -1,30 +1,9 @@
 package com.yxt.anrui.buscenter.biz.bushandover;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.bushandover.*;
-import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.buscenter.api.bushandover.BusHandover;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.DateUtils;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverService.java <br/>
@@ -40,7 +19,7 @@ import java.util.List;
  */
 @Service
 public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, BusHandover> {
-	@Autowired
+	/*@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 
 	@Autowired
@@ -209,14 +188,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 //		return "02"+orgCode+date.replaceAll("-","") + num;
 //	}
 
-	/**
+	*//**
 	 *	根据 单据类型编号+部门编码+日期 查询
 	 * @param billsType
 	 * @param date
 	 * @param orgSid
 	 * @return
-	 */
+	 *//*
 	public int selectCountByOrgSid(String billsType, String date, String orgSid) {
 		return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
-	}
+	}*/
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java
index 764df4fddb..ec2d8c7514 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.java
@@ -25,7 +25,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BusHandoverItemsMapper extends BaseMapper<BusHandoverItems> {
 
-    IPage<BusHandoverItemsVo> selectPageVo(IPage<BusHandoverItems> page, @Param(Constants.WRAPPER) Wrapper<BusHandoverItems> qw);
+    /*IPage<BusHandoverItemsVo> selectPageVo(IPage<BusHandoverItems> page, @Param(Constants.WRAPPER) Wrapper<BusHandoverItems> qw);
 
-    BusHandoverItemsVo fetchByHandoverSid(String handoverSid);
+    BusHandoverItemsVo fetchByHandoverSid(String handoverSid);*/
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.xml
index 9ecc70ee19..3202b59bc9 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsMapper.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo">
-		SELECT * FROM bus_handover_items <where> ${ew.sqlSegment} </where>
-	</select>
-	
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <!--<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo">
+        SELECT *
+        FROM bus_handover_items
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
 
     <select id="fetchByHandoverSid" resultType="com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo">
-		SELECT * FROM bus_handover_items where handoverSid=#{handoverSid}
-	</select>
+        SELECT *
+        FROM bus_handover_items
+        where handoverSid = #{handoverSid}
+    </select>-->
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsRest.java
index 204c5996b3..9ca0f70bd3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsRest.java
@@ -1,12 +1,11 @@
 package com.yxt.anrui.buscenter.biz.bushandoveritems;
 
-import com.yxt.anrui.buscenter.api.bushandoveritems.*;
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsFeign;
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsQuery;
+import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -32,6 +31,11 @@ public class BusHandoverItemsRest implements BusHandoverItemsFeign {
     private BusHandoverItemsService busHandoverItemsService;
 
     @Override
+    public ResultBean<BusHandoverItemsVo> getDeliveryBill(BusHandoverItemsQuery query) {
+        return busHandoverItemsService.getDeliveryBill(query);
+    }
+
+   /* @Override
     public ResultBean<PagerVo<BusHandoverItemsVo>> listPage(@RequestBody PagerQuery<BusHandoverItemsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BusHandoverItemsVo> pv = busHandoverItemsService.listPageVo(pq);
@@ -64,5 +68,5 @@ public class BusHandoverItemsRest implements BusHandoverItemsFeign {
         ResultBean rb = ResultBean.fireFail();
         BusHandoverItems vo = busHandoverItemsService.fetchBySid(sid);
         return rb.success().setData(vo);
-    }
+    }*/
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java
index c845ffc228..1012ef9552 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoveritems/BusHandoverItemsService.java
@@ -1,18 +1,16 @@
 package com.yxt.anrui.buscenter.biz.bushandoveritems;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsDto;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsQuery;
-import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo;
+import com.yxt.anrui.buscenter.api.bushandoveritems.*;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverItemsService.java <br/>
@@ -29,7 +27,37 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusHandoverItemsService extends MybatisBaseService<BusHandoverItemsMapper, BusHandoverItems> {
 
-    private QueryWrapper<BusHandoverItems> createQueryWrapper(BusHandoverItemsQuery query) {
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
+
+    public ResultBean<BusHandoverItemsVo> getDeliveryBill(BusHandoverItemsQuery query) {
+        ResultBean<BusHandoverItemsVo> rb = ResultBean.fireFail();
+        BusHandoverItemsVo vo = new BusHandoverItemsVo();
+        String contractSid = query.getContractSid();
+        List<BusHandoverItemsListQuery> list = query.getList();
+        List<BusHandoverItemsListVo> voList = new ArrayList<>();
+        for (BusHandoverItemsListQuery busHandoverItemsListQuery : list) {
+            BusHandoverItemsListVo busHandoverItemsListVo = new BusHandoverItemsListVo();
+            //查询车辆交接清单
+            ResultBean<List<DictCommonVo>> dictCommonVoResultBean = dictCommonFeign.getTypeValues("itemType", "0");
+            List<BusHandoItemListVo> listVos = new ArrayList<>();
+            for (DictCommonVo dictCommonVo : dictCommonVoResultBean.getData()) {
+                BusHandoItemListVo v = new BusHandoItemListVo();
+                String name = dictCommonVo.getDictValue();
+                v.setName(name);
+                v.setState(true);
+                listVos.add(v);
+            }
+            busHandoverItemsListVo.setMainfest(listVos);
+            busHandoverItemsListVo.setVin(busHandoverItemsListQuery.getVin());
+            voList.add(busHandoverItemsListVo);
+        }
+        vo.setVinList(voList);
+        vo.setContractSid(query.getContractSid());
+        return rb.success().setData(vo);
+    }
+
+   /* private QueryWrapper<BusHandoverItems> createQueryWrapper(BusHandoverItemsQuery query) {
         QueryWrapper<BusHandoverItems> qw = new QueryWrapper<>();
 
         return qw;
@@ -59,5 +87,5 @@ public class BusHandoverItemsService extends MybatisBaseService<BusHandoverItems
 
     public BusHandoverItemsVo fetchByHandoverSid(String handoverSid){
         return baseMapper.fetchByHandoverSid(handoverSid);
-    }
+    }*/
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.java
new file mode 100644
index 0000000000..f6851a427d
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.biz.bushandoverwait;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:40
+ * @Description
+ */
+@Mapper
+public interface BusHandoverWaitMapper extends BaseMapper<BusHandoverWait> {
+    IPage<BusHandoverWaitVo> selectPageVo(IPage<BusHandoverWait> page, @Param(Constants.WRAPPER) QueryWrapper<BusHandoverWait> qw, @Param("name") String name);
+
+    List<BusHandoverWaitListVo> selectByNo(String contractNo);
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
new file mode 100644
index 0000000000..407cb9ccc2
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitMapper">
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo">
+        select bh.contractNo,
+               bh.customerName,
+               bh.payTypeValue
+        from bus_handover_wait bh
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bh.contractNo
+                  , '')
+                  , ifnull(bh.customerName
+                  , '')) LIKE concat('%'
+                  , #{name}
+                  , '%')
+            </if>
+        </where>
+        group by bh.contractNo
+    </select>
+
+    <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo">
+        select vinNo, vinSid
+        from bus_handover_wait
+        where contractNo = #{contractNo}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java
new file mode 100644
index 0000000000..1adb7f34b9
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitRest.java
@@ -0,0 +1,35 @@
+package com.yxt.anrui.buscenter.biz.bushandoverwait;
+
+import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:40
+ * @Description
+ */
+@Api(tags = "待交车车辆")
+@Controller
+@RequestMapping("v1/bushandoverwait")
+public class BusHandoverWaitRest implements BusHandoverWaitFeign {
+
+    @Autowired
+    private BusHandoverWaitService busHandoverWaitService;
+
+
+    @Override
+    public ResultBean<PagerVo<BusHandoverWaitVo>> pagerList(PagerQuery<BusHandoverWaitQuery> pagerQuery) {
+        ResultBean<PagerVo<BusHandoverWaitVo>> rb = ResultBean.fireFail();
+        PagerVo<BusHandoverWaitVo> pv = busHandoverWaitService.pagerList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
new file mode 100644
index 0000000000..4cb8969d93
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
@@ -0,0 +1,67 @@
+package com.yxt.anrui.buscenter.biz.bushandoverwait;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 19:40
+ * @Description
+ */
+@Service
+public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMapper, BusHandoverWait> {
+
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private CommonContractFeign commonContractFeign;
+
+    public PagerVo<BusHandoverWaitVo> pagerList(PagerQuery<BusHandoverWaitQuery> pagerQuery) {
+        IPage<BusHandoverWait> page = PagerUtil.queryToPage(pagerQuery);
+        BusHandoverWaitQuery params = pagerQuery.getParams();
+        QueryWrapper<BusHandoverWait> qw = new QueryWrapper<>();
+        if (params != null) {
+            String orgPath = params.getOrgPath();
+            if (StringUtils.isNotBlank(orgPath)) {
+                orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
+                qw.eq("useOrgSid", orgPath);
+            }
+        }
+        IPage<BusHandoverWaitVo> pagging = baseMapper.selectPageVo(page, qw, params.getName());
+        List<BusHandoverWaitVo> records = pagging.getRecords();
+        records.removeAll(Collections.singleton(null));
+        for (BusHandoverWaitVo record : records) {
+            String contractNo = record.getContractNo();
+            //ToDo:是否欠款
+            //根据合同编号查询合同信息以及车辆
+            ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(contractNo);
+            CommonContract commonContract = commonContractResultBean.getData();
+            if (commonContract != null) {
+                record.setContractSid(commonContract.getSid());
+            }
+            //根据合同编号查询车辆列表
+            List<BusHandoverWaitListVo> busHandoverWaitListVoList = baseMapper.selectByNo(contractNo);
+            record.setList(busHandoverWaitListVoList);
+        }
+        PagerVo<BusHandoverWaitVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java
new file mode 100644
index 0000000000..ede8821f6c
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConItemVo.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:01
+ * @Description
+ */
+@Data
+public class DeliveryConItemVo implements Vo {
+    private static final long serialVersionUID = 4064971177601849740L;
+
+    @ApiModelProperty("清单名称")
+    private String name;
+    @ApiModelProperty("默认true")
+    private boolean state;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListQuery.java
new file mode 100644
index 0000000000..bdb6d58484
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListQuery.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:07
+ * @Description
+ */
+@Data
+public class DeliveryConListQuery implements Query {
+    private static final long serialVersionUID = 713117993834046847L;
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java
new file mode 100644
index 0000000000..4869a9b1d3
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConListVo.java
@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:00
+ * @Description
+ */
+@Data
+public class DeliveryConListVo implements Vo {
+    private static final long serialVersionUID = 5291687469668857721L;
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    private List<DeliveryConItemVo> mainfest;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java
new file mode 100644
index 0000000000..41de82384a
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConQuery.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 21:06
+ * @Description
+ */
+@Data
+public class DeliveryConQuery implements Query {
+    private static final long serialVersionUID = 2384354329522590526L;
+
+    private List<DeliveryConListQuery> list;
+
+    private String userSid;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java
new file mode 100644
index 0000000000..15a187df23
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConVo.java
@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 20:58
+ * @Description
+ */
+@Data
+public class DeliveryConVo implements Vo {
+    private static final long serialVersionUID = 3387249405937612233L;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("接收人")
+    private String name;
+    @ApiModelProperty("身份证号")
+    private String idNumber;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("交付日期")
+    private String date;
+    @ApiModelProperty("交付地点")
+    private String address;
+    private List<DeliveryConListVo> vinList;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java
new file mode 100644
index 0000000000..64a8dbe18b
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeign.java
@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 15:41
+ * @Description
+ */
+@Api(tags = "交车确认")
+@FeignClient(
+        contextId = "anrui-terminal-DeliveryConfirm",
+        name = "anrui-terminal",
+        path = "/autoservice/v1/deliveryConfirm",
+        fallback = DeliveryConfirmFeignFallback.class)
+public interface DeliveryConfirmFeign {
+
+    @ApiOperation("待交车列表")
+    @PostMapping("/getDeliveryConfirmNotList")
+    @ResponseBody
+    ResultBean<PagerVo<DeliveryConfirmVo>> getDeliveryConfirmNotList(@RequestBody PagerQuery<DeliveryConfirmQuery> pagerQuery);
+
+    @ApiOperation("获取确认交付信息")
+    @PostMapping("/getDeliveryBill")
+    @ResponseBody
+    ResultBean<DeliveryConVo> getDeliveryBill(@RequestBody DeliveryConQuery deliveryConQuery);
+
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeignFallback.java
new file mode 100644
index 0000000000..182941f267
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmFeignFallback.java
@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 15:42
+ * @Description
+ */
+@Component
+public class DeliveryConfirmFeignFallback {
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmQuery.java
new file mode 100644
index 0000000000..580dbc27cd
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmQuery.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 20:44
+ * @Description
+ */
+@Data
+public class DeliveryConfirmQuery implements Query {
+    private static final long serialVersionUID = -608379809128769606L;
+
+    private String userSid;
+
+    private String name;
+
+    private String orgPath;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java
new file mode 100644
index 0000000000..2a1be46b27
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryConfirmVo.java
@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 15:45
+ * @Description
+ */
+@Data
+public class DeliveryConfirmVo implements Vo {
+    private static final long serialVersionUID = 2889347824395603659L;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("合同状态")
+    private String contractStateKey;
+    @ApiModelProperty("合同状态")
+    private String contractStateValue;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("付款方式")
+    private String payTypeValue;
+
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+
+    private List<DeliveryVo> list = new ArrayList<>();
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java
new file mode 100644
index 0000000000..9d393ecfbd
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryConfirm/DeliveryVo.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryConfirm;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 18:54
+ * @Description
+ */
+@Data
+public class DeliveryVo implements Vo {
+    private static final long serialVersionUID = 1429737874187218432L;
+
+    private String vinNo;
+    private String vinSid;
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java
new file mode 100644
index 0000000000..f504cb6385
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmRest.java
@@ -0,0 +1,33 @@
+package com.yxt.anrui.terminal.biz.autoservice.deliveryConfirm;
+
+import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 15:43
+ * @Description
+ */
+@Api(tags = "交车确认")
+@Controller
+@RequestMapping("/autoservice/v1/deliveryConfirm")
+public class DeliveryConfirmRest implements DeliveryConfirmFeign {
+    @Autowired
+    private DeliveryConfirmService deliveryConfirmService;
+
+    @Override
+    public ResultBean<PagerVo<DeliveryConfirmVo>> getDeliveryConfirmNotList(PagerQuery<DeliveryConfirmQuery> pagerQuery) {
+        return deliveryConfirmService.getDeliveryConfirmNotList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<DeliveryConVo> getDeliveryBill(DeliveryConQuery deliveryConQuery) {
+        return deliveryConfirmService.getDeliveryBill(deliveryConQuery);
+    }
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java
new file mode 100644
index 0000000000..67c9ea5e62
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryConfirm/DeliveryConfirmService.java
@@ -0,0 +1,49 @@
+package com.yxt.anrui.terminal.biz.autoservice.deliveryConfirm;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo;
+import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConQuery;
+import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConVo;
+import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConfirmQuery;
+import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.DeliveryConfirmVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/10 20:46
+ * @Description
+ */
+@Service
+public class DeliveryConfirmService {
+
+    @Autowired
+    private BusHandoverWaitFeign busHandoverWaitFeign;
+
+    public ResultBean<PagerVo<DeliveryConfirmVo>> getDeliveryConfirmNotList(PagerQuery<DeliveryConfirmQuery> pagerQuery) {
+        ResultBean<PagerVo<DeliveryConfirmVo>> rb = ResultBean.fireFail();
+        PagerQuery<BusHandoverWaitQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<BusHandoverWaitVo>> resultBean = busHandoverWaitFeign.pagerList(pq);
+        List<DeliveryConfirmVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryConfirmVo.class)).collect(Collectors.toList());
+        PagerVo<DeliveryConfirmVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+    }
+
+    public ResultBean<DeliveryConVo> getDeliveryBill(DeliveryConQuery deliveryConQuery) {
+        return null;
+    }
+}
diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql
index 6447060fd4..e28380b9c5 100644
--- a/doc/databases/bus-center_tables.sql
+++ b/doc/databases/bus-center_tables.sql
@@ -596,7 +596,7 @@ CREATE TABLE `bus_handover_wait`
     `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
     `state`         int(32)              DEFAULT '1' COMMENT '状态',
     `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `contractNo`    VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
@@ -626,7 +626,7 @@ CREATE TABLE `bus_handover`
     `isEnable`           int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
     `state`              int(32)              DEFAULT '1' COMMENT '状态',
     `isDelete`           int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `contractNo`         VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
@@ -658,7 +658,7 @@ CREATE TABLE `bus_handover_items`
     `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
     `state`         int(32)              DEFAULT '1' COMMENT '状态',
     `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `handoverSid`   VARCHAR(64)          DEFAULT NULL COMMENT '交车确认单sid',
@@ -666,7 +666,9 @@ CREATE TABLE `bus_handover_items`
     `modelName`     varchar(500)         DEFAULT NULL COMMENT '车型别名',
     `vinSid`        varchar(64)          DEFAULT NULL COMMENT '车辆sid',
     `vinNo`         varchar(64)          DEFAULT NULL COMMENT '车架号',
-    `itemKey`       varchar(255)         DEFAULT NULL COMMENT '是否包含（发票、合格证、申请
+    `itemKey`       varchar(500)         DEFAULT NULL COMMENT '是否包含（发票、合格证、申请
+表、一致性证书、保修手册、说明书、环保清单、驾驶员卡、气瓶产品质量证明书、）',
+    `itemValue`     varchar(500)         DEFAULT NULL COMMENT '是否包含（发票、合格证、申请
 表、一致性证书、保修手册、说明书、环保清单、驾驶员卡、气瓶产品质量证明书、）',
     `handoverPhoto` text                 DEFAULT NULL COMMENT '车辆交车照片',
     `policyPhoto`   text                 DEFAULT NULL COMMENT '保单照片',
@@ -686,7 +688,7 @@ CREATE TABLE `buscenter_file`
     `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
     `state`       int(32)              DEFAULT '1' COMMENT '状态',
     `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `linkSid`     VARCHAR(64)          DEFAULT NULL COMMENT '关联业务的sid',