出库申请接口修改，库存移库修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -253,6 +253,10 @@ public interface BaseVehicleFeign {
     @PostMapping("/updateVehicleGressionByVin")
     ResultBean updateVehicleGressionByVin(@RequestBody VehicleGression vehicleGression);
 
+    @ApiOperation("根据车架号获取车辆sid")
+    @GetMapping("/selVehicleByVinNo/{vinNo}")
+    ResultBean<BaseVehicleVo> selVehicleByVinNo(@PathVariable("vinNo") String vinNo);
+
     /***************************************************** App接口 **********************************************************/
 
     @ApiOperation("手机端现车分页列表")
@@ -309,6 +313,10 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("Pc根据仓库sid 获取车架号")
+    @PostMapping("/getPcVinByWarehouseSid")
+    public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(@RequestBody PagerQuery<VinByWarehouseQuery> pagerQuery);
+
     @ApiOperation("根据用户sid 获取库存车辆信息")
     @GetMapping("/selectInventoryRecords/{userSid}")
     public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -171,6 +171,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseVehicleVo> selVehicleByVinNo(String vinNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppCurrentCarModelByPageListVo>> getAppCurrentCarByPageList(PagerQuery<AppCurrentCarByPageListQuery> pagerQuery) {
         return null;
@@ -231,6 +236,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VinByWarehouseQuery implements Query {
+    private static final long serialVersionUID = -4205300860994909841L;
+
+    @ApiModelProperty("仓库sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -16,6 +16,7 @@ public enum BillTypeEnum {
     CJTKSQ("CJTKSQ", "厂家退库申请"),
     FYSQ("FYSQ","费用申请"),
     FKSQ("FKSQ","付款申请"),
+    KCDDBGSQ("KCDDBGSQ","库存地点变更申请")
     ;
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -409,5 +411,9 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     IPage<BaseVehicleActualVo> vehiclePurchasePageList(IPage<BaseVehicleActualVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    Map<String,String> checkVinNo(@Param("vinNo") String vinNo,@Param("modelSid") String modelSid,@Param("configSid") String configSid,@Param("sellerOrgSid") String sellerOrgSid);
+    BaseVehicleVo selVehicleByVinNo(@Param("vinNo") String vinNo);
+
+    Map<String, String> checkVinNo(@Param("vinNo") String vinNo, @Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("sellerOrgSid") String sellerOrgSid);
+
+    IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(IPage<VinByWarehouseQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmWarehouseVinVo> qw, @Param("warehouseSid") String warehouseSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -891,4 +891,19 @@
           AND modelConfigSid = #{configSid}
           AND createOrgSid = #{sellerOrgSid}
     </select>
+
+    <select id="selVehicleByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
+        SELECT *
+        FROM base_vehicle bv
+        WHERE vinNo = #{vinNo}
+    </select>
+
+    <select id="getPcVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">
+        select vinNo as vin
+        from base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+            and bv.location = #{warehouseSid}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -13,6 +13,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -407,6 +408,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.updateVehicleGressionByVin(vehicleGression);
     }
 
+    @Override
+    public ResultBean<BaseVehicleVo> selVehicleByVinNo(String vinNo) {
+        return baseVehicleService.selVehicleByVinNo(vinNo);
+    }
+
     /**
      * 手机端现车列表
      *
@@ -641,6 +647,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid);
     }
 
+    @Override
+    public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            return rb.setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmWarehouseVinVo> page = new PagerVo<>();
+        IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery);
+        PagerVo<AppScmWarehouseVinVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmWarehouseVinVo>>().success().setData(pagerVo);
+    }
+
     @Override
     public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
         return baseVehicleService.selectInventoryRecords(userSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -21,6 +21,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
@@ -820,8 +821,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {
             qw.like("bvm.specifications", pagerQuery.getSpecifications());
         }
-        qw.like("bb.useOrg",pagerQuery.getUseOrg());
-        qw.eq("bvm.isDelete",0);
+        qw.like("bb.useOrg", pagerQuery.getUseOrg());
+        qw.eq("bvm.isDelete", 0);
         return qw;
     }
 
@@ -1032,7 +1033,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
 //            qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
-            qw.eq("bv.settlementStatus",VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
+            qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
         }
         return qw;
     }
@@ -1570,7 +1571,29 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success();
     }
 
-    public Map<String,String> checkVinNo(String vinNo, String modelSid, String configSid, String sellerOrgSid) {
-        return baseMapper.checkVinNo(vinNo,modelSid,configSid,sellerOrgSid);
+    public Map<String, String> checkVinNo(String vinNo, String modelSid, String configSid, String sellerOrgSid) {
+        return baseMapper.checkVinNo(vinNo, modelSid, configSid, sellerOrgSid);
+    }
+
+    public ResultBean<BaseVehicleVo> selVehicleByVinNo(String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleVo vo = baseMapper.selVehicleByVinNo(vinNo);
+        return rb.success().setData(vo);
+    }
+
+    public IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
+        IPage<VinByWarehouseQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppScmWarehouseVinVo> qw = new QueryWrapper();
+        VinByWarehouseQuery params = pagerQuery.getParams();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+        params.setUseOrgSid(useOrgSid);
+        if (StringUtils.isNotBlank(params.getVin())) {
+            qw.like("bv.vinNo", params.getVin());
+        }
+        if (StringUtils.isNotBlank(params.getUseOrgSid())) {
+            qw.eq("bv.createOrgSid", params.getUseOrgSid());
+        }
+        IPage<AppScmWarehouseVinVo> iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid());
+        return iPage;
     }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.busdelivered;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,13 +11,31 @@ import java.util.List;
 public class AppBusDeliveredPageVo implements Vo {
     private static final long serialVersionUID = 2366744572396819068L;
 
+    @ApiModelProperty("列表sid")
+    private String sid;
+
     @ApiModelProperty("合同编号")
+    @JsonProperty("contractId")
     private String contractNo;
 
     @ApiModelProperty("类型 1 已认款  2 未认款")
-    private String type;
+    @JsonProperty("subscription")
+    private String subscription;
+
+    @ApiModelProperty("类型 1 已认款  2 未认款")
+    @JsonProperty("subscriptionKey")
+    private String subscriptionKey;
+
+    @ApiModelProperty("付款方式 1 全款 2 贷款")
+    @JsonProperty("paymentMethod")
+    private String paymentMethod;
+
+    @ApiModelProperty("付款方式 1 全款 2 贷款")
+    @JsonProperty("paymentMethodKey")
+    private String paymentMethodKey;
 
     @ApiModelProperty("客户名称")
+    @JsonProperty("customerName")
     private String name;
 
     @ApiModelProperty("车架号集合")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -182,9 +182,9 @@ public interface BusDeliveredApplyFeign {
     public ResultBean<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<AppDeliveredApplyPageQuery> pagerQuery);
 
     @ApiOperation("手机端-初始化 出库申请")
-    @GetMapping("/getRetrievalApplyInfo/{sid}")
+    @GetMapping("/getRetrievalApplyInfoBySid/{sid}")
     @ResponseBody
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(@PathVariable("sid") String sid);
+    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -141,7 +141,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
+    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -79,7 +79,7 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
      * @param qw
      * @return
      */
-    IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, QueryWrapper<AppBusDeliveredPageQuery> qw);
+    IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw);
 
     /**
      * 查询车架号

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -158,7 +158,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
     public IPage<AppBusDeliveredPageVo> getRetrievalNotList(PagerQuery<AppBusDeliveredPageQuery> pq) {
         QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(pq.getParams().getName())) {
-            qw.eq("name", pq.getParams().getName());
+            qw.like("name", pq.getParams().getName());
         }
         IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
         IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotList(page, qw);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -100,5 +100,5 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
      * @param qw
      * @return
      */
-    IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, QueryWrapper<AppDeliveredApplyPageQuery> qw);
+    IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppDeliveredApplyPageQuery> qw);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -209,9 +209,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     }
 
     @Override
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
+    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean<AppDeliveredApplyInfoVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfo(sid);
+        ResultBean<AppDeliveredApplyInfoVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
         return rb.success().setData(retrievalApplyInfo.getData());
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -744,7 +744,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setData(dtoSid);
     }
 
-    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
+    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
         AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
         BusDeliveredApply busDeliveredApply = fetchBySid(sid);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java

@@ -128,6 +128,10 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean pictureUpload(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file);
 
+    @ApiOperation("初始化临时出门证")
+    @GetMapping("/temporaryExitPermitInfo/{sid}/{userSid}")
+    @ResponseBody
+    public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
     /*************************************************PC移位审批流程***************************************************/
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java

@@ -116,6 +116,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
         return null;
     }
 
+    @Override
+    public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid, String userSid) {
+        return null;
+    }
+
     @Override
     public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
         return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TemporaryExitPermitInfo implements Vo {
+    private static final long serialVersionUID = -7815832719602641764L;
+
+    @ApiModelProperty("分公司名称")
+    private String orgName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("台数")
+    private String num;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("出门原因")
+    private String reason;
+    @ApiModelProperty("经办人")
+    private String creatName;
+    @ApiModelProperty("提车人")
+    private String carryCarName;
+
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java

@@ -111,4 +111,6 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
     int selectBySid(String list);
 
     void updateStateBySid(@Param("sid") String sid, @Param("state") String state);
+
+    int selectNum(String bill);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -90,6 +90,12 @@
           and find_in_set(sid, #{list})
     </select>
 
+    <select id="selectNum" resultType="java.lang.Integer">
+        select count(*)
+        from scm_vehicle_gression
+        where applicantNo LIKE concat(#{bill}, '%')
+    </select>
+
     <update id="updateFlowFiled">
         UPDATE scm_vehicle_gression
         SET nodeState=#{nodeState}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -200,6 +200,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
         return rb.success().setData(data).setMsg("上传成功");
     }
 
+    @Override
+    public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid,String userSid) {
+        return scmVehicleGressionService.temporaryExitPermitInfo(sid,userSid);
+    }
+
     @Override
     public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
         return scmVehicleGressionService.submitCarTransfer(dto);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -29,8 +29,14 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.VehicleGression;
+import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -39,6 +45,9 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -105,6 +114,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     @Autowired
     private FlowTaskFeign flowTaskFeign;
 
+    @Autowired
+    private BaseVehicleModelFeign baseVehicleModelFeign;
+
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
     private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -279,18 +294,23 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String userSid = dto.getUserSid();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
+        String vehicleSid = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData().getSid();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ScmVehicleGression scmVehicleGression = null;
         if (StringUtils.isBlank(dto.getSid())) {
             scmVehicleGression = new ScmVehicleGression();
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
             scmVehicleGression.setHandleState("1");
+            scmVehicleGression.setVehicleSid(vehicleSid);
             scmVehicleGression.setApplicantName(data.getStaffName());
             scmVehicleGression.setApplicantDate(simpleDateFormat.format(new Date()));
             scmVehicleGression.setOrgSid(data.getOrgSid());
             scmVehicleGression.setUseOrgSid(useOrgSid);
-            Map<String, String> stringStringMap = generateBillNo(userSid);
-            scmVehicleGression.setApplicantNo(stringStringMap.get("billNo_Num"));
+            //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
+            //获取单据名称大写首字母+分公司编码+年份+月份
+//            Map<String, String> stringStringMap = generateBillNo(userSid);
+            String billNo = getApplyCode(dto);
+            scmVehicleGression.setApplicantNo(billNo);
             save(scmVehicleGression);
             if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
                 List<String> factoryImage = dto.getPolicyImage();
@@ -456,48 +476,63 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return rb.success().setMsg("保存成功");
     }
 
-    /**
-     * 移位单生成编号
-     *
-     * @param userSid 用户sid
-     * @return
-     */
-    public Map<String, String> generateBillNo(String userSid) {
-        List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
-        String billsType = "";
-        if (commonVoList.size() > 0) {
-            for (int i = 0; i < commonVoList.size(); i++) {
-                if (commonVoList.get(i).getDictValue().contains("移位单")) {
-                    billsType = commonVoList.get(i).getDictKey();
-                }
-            }
-        }
-        AppUserOrgInfoVo userOrgInfo = null;
-        String orgCode = "";
-        String orgSid = "";
-        String orgName = "";
-        ResultBean<AppUserOrgInfoVo> resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid);
-        if (resultBean.getSuccess() && resultBean.getData() != null) {
-            userOrgInfo = resultBean.getData();
-            orgSid = userOrgInfo.getOrgSid();
-            orgName = userOrgInfo.getOrgName();
-            orgCode = userOrgInfo.getOrgCode();
-        }
-        String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd");
-        // 流水号
-        int i = selectCountByOrgSid(billsType, date, orgSid);
-        String num = String.format("%04d", i + 1); // 不足4位补0
-        Map<String, String> map = new HashMap<>();
-        map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num);
-        map.put("billNo", billsType + orgCode + date.replaceAll("-", ""));
-        map.put("staffSid", userOrgInfo.getStaffSid());
-        map.put("staffName", userOrgInfo.getStaffName());
-        map.put("orgSid", orgSid);
-        map.put("orgName", orgName);
-
-        return map;
+    public String getApplyCode(AppScmVehicleGressionDto dto) {
+        String userSid = dto.getUserSid();
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.KCDDBGSQ.getBillType());
+        String bill = Rule.getBill(b);
+        int i = baseMapper.selectNum(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
     }
 
+//    /**
+//     * 移位单生成编号
+//     *
+//     * @param userSid 用户sid
+//     * @return
+//     */
+//    public Map<String, String> generateBillNo(String userSid) {
+//        List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
+//        String billsType = "";
+//        if (commonVoList.size() > 0) {
+//            for (int i = 0; i < commonVoList.size(); i++) {
+//                if (commonVoList.get(i).getDictValue().contains("移位单")) {
+//                    billsType = commonVoList.get(i).getDictKey();
+//                }
+//            }
+//        }
+//        AppUserOrgInfoVo userOrgInfo = null;
+//        String orgCode = "";
+//        String orgSid = "";
+//        String orgName = "";
+//        ResultBean<AppUserOrgInfoVo> resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid);
+//        if (resultBean.getSuccess() && resultBean.getData() != null) {
+//            userOrgInfo = resultBean.getData();
+//            orgSid = userOrgInfo.getOrgSid();
+//            orgName = userOrgInfo.getOrgName();
+//            orgCode = userOrgInfo.getOrgCode();
+//        }
+//        String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd");
+//        // 流水号
+//        int i = selectCountByOrgSid(billsType, date, orgSid);
+//        String num = String.format("%04d", i + 1); // 不足4位补0
+//        Map<String, String> map = new HashMap<>();
+//        map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num);
+//        map.put("billNo", billsType + orgCode + date.replaceAll("-", ""));
+//        map.put("staffSid", userOrgInfo.getStaffSid());
+//        map.put("staffName", userOrgInfo.getStaffName());
+//        map.put("orgSid", orgSid);
+//        map.put("orgName", orgName);
+//
+//        return map;
+//    }
+
     public int selectCountByOrgSid(String billsType, String date, String orgSid) {
         return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
     }
@@ -535,9 +570,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
-        String state = "2";
-        baseMapper.updateStateBySid(dto.getSid(), state);
         String businessSid = resultBean.getData();
+        String state = "2";
+        baseMapper.updateStateBySid(businessSid, state);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
@@ -625,19 +660,19 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean rb = ResultBean.fireFail();
         ScmVehicleGression scmVehicleGression = fetchBySid(bv.getBusinessSid());
         if (bv.getTaskId().equals(scmVehicleGression.getTaskId())) {
-            boolean isTrue = false;
-            if (StringUtils.isNotBlank(scmVehicleGression.getApplicantFunds())) {
-                if ("0".equals(scmVehicleGression.getApplicantFunds())) {
-                    isTrue = false;
-                } else {
-                    isTrue = true;
-                }
-            } else {
-                isTrue = false;
-            }
-            Map<String, Object> map = new HashMap<>();
-            map.put("isTrue", isTrue);
-            bv.setFormVariables(map);
+//            boolean isTrue = false;
+//            if (StringUtils.isNotBlank(scmVehicleGression.getApplicantFunds())) {
+//                if ("0".equals(scmVehicleGression.getApplicantFunds())) {
+//                    isTrue = false;
+//                } else {
+//                    isTrue = true;
+//                }
+//            } else {
+//                isTrue = false;
+//            }
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("isTrue", isTrue);
+//            bv.setFormVariables(map);
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -667,10 +702,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-        Map<String, Object> formVariables = query.getFormVariables();
+//        Map<String, Object> formVariables = query.getFormVariables();
         //判断流程分支
-        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-        bv.setFormVariables(map);
+//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
+//        bv.setFormVariables(map);
         bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -688,10 +723,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-        Map<String, Object> formVariables = query.getFormVariables();
+//        Map<String, Object> formVariables = query.getFormVariables();
         //判断流程分支
-        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-        bv.setFormVariables(map);
+//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
+//        bv.setFormVariables(map);
         bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -816,7 +851,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     }
 
     /**
-     * 根据业务sid查询，判断流程分支
+     * 根据业务sid查询，判断流程分支(“暂时不用”)
      *
      * @param businessSid
      * @return
@@ -837,4 +872,24 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         map.put("isTrue", isTrue);
         return map;
     }
+
+    public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid, String userSid) {
+        ResultBean<TemporaryExitPermitInfo> rb = ResultBean.fireFail();
+        TemporaryExitPermitInfo temporaryExitPermitInfo = new TemporaryExitPermitInfo();
+        ScmVehicleGression scmVehicleGression = fetchBySid(sid);
+        SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(scmVehicleGression.getUseOrgSid()).getData();
+        temporaryExitPermitInfo.setCustomerName("-");
+        temporaryExitPermitInfo.setOrgName(sysOrganization.getName());
+        temporaryExitPermitInfo.setDate(new Date());
+        temporaryExitPermitInfo.setContractNo("-");
+        BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
+        ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), userSid).getData();
+        temporaryExitPermitInfo.setModelName(exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor());
+        temporaryExitPermitInfo.setNum("1");
+        temporaryExitPermitInfo.setVinNo(scmVehicleGression.getVinNo());
+        temporaryExitPermitInfo.setReason("存放地点变更");
+        temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator());
+        temporaryExitPermitInfo.setCarryCarName("-");
+        return rb.success().setData(temporaryExitPermitInfo);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -69,7 +69,7 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("移动端-获取待出库列表")
     @PostMapping("/getRetrievalNotList")
     @ResponseBody
-    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(@RequestBody PagerQuery<DeliveredPageQuery> pq);
+    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(@RequestBody PagerQuery<DeliveredPageQuery> pagerQuery);
 
     @ApiOperation("移动端-初始化 出库申请 待出库进入")
     @PostMapping("/getRetrievalApplyInfo")
@@ -82,9 +82,9 @@ public interface AppBusDeliveredApplyFeign {
     public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<DeliveredApplyPageQuery> pagerQuery);
 
     @ApiOperation("手机端-初始化 出库申请")
-    @GetMapping("/getRetrievalApplyInfo/{sid}")
+    @GetMapping("/getRetrievalApplyInfoBySid/{sid}")
     @ResponseBody
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(@PathVariable("sid") String sid);
+    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("手机端-保存 出库申请")
     @PostMapping("/saveRetrievalApplyInfo")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -52,7 +52,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
 
 
     @Override
-    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pq) {
+    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) {
         return null;
     }
 
@@ -67,7 +67,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     }
 
     @Override
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
+    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
         return null;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.retrieval;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,11 +12,23 @@ import java.util.List;
 public class DeliveredPageVo implements Vo {
     private static final long serialVersionUID = 5016267000560011865L;
 
+    @ApiModelProperty("列表sid")
+    private String sid;
+
     @ApiModelProperty("合同编号")
     private String contractNo;
 
     @ApiModelProperty("类型 1 已认款  2 未认款")
-    private String type;
+    private String subscription;
+
+    @ApiModelProperty("类型 1 已认款  2 未认款")
+    private String subscriptionKey;
+
+    @ApiModelProperty("付款方式 1 全款 2 贷款")
+    private String paymentMethod;
+
+    @ApiModelProperty("付款方式 1 全款 2 贷款")
+    private String paymentMethodKey;
 
     @ApiModelProperty("客户名称")
     private String name;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -57,34 +57,36 @@ import java.util.List;
 @RequestMapping("/autoservice/v1/retrieval")
 public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
 
+    @Autowired
+    AppBusDeliveredApplyService appBusDeliveredApplyService;
 
     @Override
-    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pq) {
-        return null;
+    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) {
+        return appBusDeliveredApplyService.getRetrievalNotList(pagerQuery);
     }
 
     @Override
     public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
-        return null;
+        return appBusDeliveredApplyService.getRetrievalApplyInfo(query);
     }
 
     @Override
     public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<DeliveredApplyPageQuery> pagerQuery) {
-        return null;
+        return appBusDeliveredApplyService.getRetrievalApplyList(pagerQuery);
     }
 
     @Override
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
-        return null;
+    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+        return appBusDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
     }
 
     @Override
     public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
-        return null;
+        return appBusDeliveredApplyService.saveRetrievalApplyInfo(deliveredApplyDto);
     }
 
     @Override
     public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
-        return null;
+        return appBusDeliveredApplyService.getRetrievalCarVin(sid);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -25,12 +25,26 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.retrieval;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.busdelivered.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
+import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
+import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.*;
+import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionPageVo;
+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.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -48,16 +62,59 @@ import org.springframework.stereotype.Service;
 @Service
 public class AppBusDeliveredApplyService {
 
+    @Autowired
+    BusDeliveredFeign busDeliveredFeign;
+
+    @Autowired
+    BusDeliveredApplyFeign busDeliveredApplyFeign;
+
+    public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) {
+        ResultBean<PagerVo<DeliveredPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppBusDeliveredPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppBusDeliveredPageVo>> retrievalNotList = busDeliveredFeign.getRetrievalNotList(pq);
+        PagerVo<DeliveredPageVo> vo = CoverUtils.selectPagerVo(retrievalNotList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
+        ResultBean<DeliveredDetailsVo> rb = ResultBean.fireFail();
+        AppDeliveredDetailsQuery appDeliveredDetailsQuery = new AppDeliveredDetailsQuery();
+        BeanUtils.copyProperties(query, appDeliveredDetailsQuery);
+        ResultBean<AppDeliveredDetailsVo> retrievalApplyInfo = busDeliveredFeign.getRetrievalApplyInfo(appDeliveredDetailsQuery);
+        AppDeliveredDetailsVo appDeliveredDetailsVo = retrievalApplyInfo.getData();
+        DeliveredDetailsVo vo = new DeliveredDetailsVo();
+        BeanUtils.copyProperties(appDeliveredDetailsVo, vo);
+        return rb.success().setData(vo);
+    }
+
     public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<DeliveredApplyPageQuery> pagerQuery) {
-        return null;
+        ResultBean<PagerVo<DeliveredApplyPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppDeliveredApplyPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppDeliveredApplyPageVo>> retrievalApplyList = busDeliveredApplyFeign.getRetrievalApplyList(pq);
+        PagerVo<DeliveredApplyPageVo> vo = CoverUtils.selectPagerVo(retrievalApplyList.getData());
+        return rb.success().setData(vo);
     }
 
-    public ResultBean<PagerVo<StayDeliveredApplyPageVo>> getRetrievalNotList(PagerQuery<StayDeliveredApplyPageQuery> pagerQuery) {
-        return null;
+    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
+        ResultBean<DeliveredApplyInfoVo> rb = ResultBean.fireFail();
+        DeliveredApplyInfoVo vo = new DeliveredApplyInfoVo();
+        ResultBean<AppDeliveredApplyInfoVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
+        return rb.success().setData(vo);
     }
 
+    public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
+        AppDeliveredApplyDto dto = new AppDeliveredApplyDto();
+        BeanUtil.copyProperties(deliveredApplyDto, dto);
+        ResultBean resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto);
+        return resultBean;
+    }
 
-    public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(DeliveredApplyInfoQuery query) {
+    public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
         return null;
     }
 }