盘库巡检问题修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +9,11 @@ import lombok.Data;
 public class AppAdvanceInvoicePageVo implements Vo {
     private static final long serialVersionUID = 1414719057186977899L;
 
-    @ApiModelProperty("合同sid")
+    @ApiModelProperty("sid")
-    private String contractSid;
+    private String sid;
 
     @ApiModelProperty("合同状态")
-    private String contractType;
+    private String nodeState;
 
     @ApiModelProperty("合同编号")
     private String contractNo;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -72,8 +72,8 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ApiOperation("欠款提车单附件保存接口")
     @PostMapping("/saveArrearsAppendix")
     public ResultBean saveArrearsAppendix(@RequestBody List<ArrearsAppendixDto> dto);
-    
+
-    @ApiOperation("手机端-获取提前开票列表")
+    @ApiOperation("手机端-获取欠款提车列表")
     @PostMapping("/getArrearsTakeCarList")
     @ResponseBody
     ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml

@@ -43,16 +43,24 @@
 
     <select id="getAdvanceInvoiceList"
             resultType="com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo">
-        SELECT contractNo,
+        SELECT sid,
-               customerName,
+        if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
-               applyDate,
+        contractNo,
-               carModel,
+        arrearsMoney,
-               arrearsMoney,
+        returnedMoneyDate,
-               returnedMoneyDate,
+        applyName,
-               advGinReasonKey,
+        num,
-               advGinReasonValue,
+        otherReasons,
-               otherReasons,
+        applyDate,
-               remarks
+        customerName
         FROM bus_advance_ginvoiceapply
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and customerName,contractNo LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+        </where>
     </select>
 </mapper>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java

@@ -91,4 +91,9 @@ public interface ScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery);
 
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java

@@ -84,4 +84,10 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 	public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(String userSid) {
+		return null;
+	}
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java

@@ -74,9 +74,4 @@ public interface ScmVehicleStayPatrolinspectionFeign {
     @ResponseBody
     public ResultBean<ScmVehicleStayPatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
-
-    @ApiOperation("手机端-查询本分公司下代办数量")
-    @GetMapping("/getToDoNum/{userSid}")
-    @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java

@@ -71,10 +71,6 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt
 	}
 
 
-	@Override
-	public ResultBean<String> getToDoNum(String userSid) {
-		return null;
-	}
 
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -106,7 +106,10 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
     List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(@Param("sid") String sid, @Param("vin") String vin);
 
     @Update("update scm_vehicle_patrolinspection set isDelete = 1  where vinNo = #{vinNo} and id = #{id} ")
-    void deleteByVinNo(@Param("vinNo") String vinNo,@Param("id") String id);
+    void deleteByVinNo(@Param("vinNo") String vinNo, @Param("id") String id);
 
     List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
+
+    @Select("SELECT count(*) FROM scm_vehicle_patrolinspection  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 and (patrolInspectionStateKey = '000' or patrolInspectionStateKey = '001')")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java

@@ -125,4 +125,9 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
         PagerVo<AppScmVehiclePatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>>().success().setData(pagerVo);
     }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehiclePatrolinspectionService.getToDoNum(userSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -339,4 +339,11 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
     public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo, String useOrgSid) {
         return baseMapper.selectByVinNo(vinNo, useOrgSid);
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java

@@ -92,4 +92,7 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
 
     @Select("SELECT count(*) FROM scm_vehicle_patrolinspectionsheet WHERE mainSid = #{mainSid}")
     int selectByMainSidNum(@Param("mainSid") String mainSid);
+
+    @Select("SELECT count(*) FROM scm_vehicle_patrolinspectionsheet WHERE mainSid = #{mainSid} and vinNo=#{vinNo}")
+    int selectByMainSidAndVinNo(@Param("mainSid") String mainSid, @Param("vinNo") String vinNo);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -272,6 +272,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+        int counts = baseMapper.selectByMainSidAndVinNo(dto.getMainSid(), dto.getVinNo());
+        if (counts > 0) {
+            return rb.setMsg("请勿重复点击");
+        }
         Boolean newAdd = dto.getNewAdd();
         if (newAdd) {
             if (StringUtils.isBlank(dto.getVinNo())) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java

@@ -70,10 +70,6 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
 
     void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName);
 
-
-    @Select("SELECT count(*) FROM scm_vehicle_patrolinspection  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ")
-    int getToDoNum(@Param("useOrgSid") String useOrgSid);
-
     void updateByState(@Param("sid") String patrolInspectionSid, @Param("state") int i);
 
     @Update("update scm_vehicle_stay_patrolinspection set state = 2 where sid = #{stayInspSid}")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java

@@ -96,10 +96,4 @@ public class ScmVehicleStayPatrolinspectionRest implements ScmVehicleStayPatroli
     }
 
 
-    @Override
-    public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleStayPatrolinspectionService.getToDoNum(userSid);
-    }
-
-
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@@ -128,13 +128,6 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
         baseMapper.updateByStaySid(patrolInspectionSid, newTime, userName);
     }
 
-    public ResultBean<String> getToDoNum(String userSid) {
-        ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid);
-        return rb.success().setData(String.valueOf(count));
-    }
-
     public void updateByState(String patrolInspectionSid, int i) {
         baseMapper.updateByState(patrolInspectionSid, i);
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -223,6 +223,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
                 scmVehicleInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
                 scmVehicleInventory.setInventoryState("无");
                 scmVehicleInventory.setInventoryStateKey("");
+                scmVehicleInventory.setCreateBySid(userSid);
                 scmVehicleInventory.setCreateOrgSid(useOrgSid);
                 scmVehicleInventory.setUseOrgSid(useOrgSid);
                 scmVehicleInventoryService.save(scmVehicleInventory);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -235,6 +235,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 scmVehiclePatrolinspection.setPatrolInspectionState("待巡检");
                 scmVehiclePatrolinspection.setPatrolInspectionStateKey("000");
                 scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setCreateBySid(userSid);
                 scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
                 scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
             }
@@ -252,6 +253,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspection.setPatrolInspectionStateKey("001");
                     scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
                     scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setCreateBySid(userSid);
                     scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
                     ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
                     scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,24 +9,32 @@ import lombok.Data;
 public class AdvanceInvoicePageVo implements Vo {
     private static final long serialVersionUID = -8631337422991366458L;
 
-    @ApiModelProperty("合同sid")
+    @ApiModelProperty("sid")
-    private String contractSid;
+    @JsonProperty("contractSid")
+    private String sid;
     @ApiModelProperty("合同状态")
-    private String contractType;
+    @JsonProperty("contractType")
+    private String nodeState;
     @ApiModelProperty("合同编号")
-    private String contractId;
+    @JsonProperty("contractId")
+    private String contractNo;
     @ApiModelProperty("欠款金额")
     private String arrearsMoney;
     @ApiModelProperty("承诺汇款日期")
-    private String paymentDate;
+    @JsonProperty("paymentDate")
+    private String returnedMoneyDate;
     @ApiModelProperty("申请人")
-    private String applicant;
+    @JsonProperty("applicant")
+    private String applyName;
     @ApiModelProperty("数量")
-    private String number;
+    @JsonProperty("number")
+    private String num;
     @ApiModelProperty("原因")
-    private String reason;
+    @JsonProperty("reason")
+    private String otherReasons;
     @ApiModelProperty("创建日期")
-    private String date;
+    @JsonProperty("date")
+    private String applyDate;
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("是否显示办理按钮")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
+
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
+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.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: bus(bus) <br/>
+ * File: BusArrearsCarryVehicleApplyFeign.java <br/>
+ * Class: bus.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign <br/>
+ * Description: 欠款提车申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 15:29:26 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "欠款提车申请")
+@FeignClient(
+        contextId = "bus-BusArrearsCarryVehicleApply",
+        name = "bus",
+        path = "v1/busarrearscarryvehicleapply",
+        fallback = AppBusArrearsCarryVehicleApplyFeignFallback.class)
+public interface AppBusArrearsCarryVehicleApplyFeign {
+
+    @ApiOperation("手机端-获取提前开票列表")
+    @PostMapping("/getArrearsTakeCarList")
+    @ResponseBody
+    ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pagerQuery);
+
+    @ApiOperation("手机端-删除欠款提车")
+    @GetMapping("/deleteArrearsTakeCar/{contractSid}")
+    @ResponseBody
+    public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
+
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
+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;
+
+import java.util.List;
+
+/**
+ * Project: bus(bus) <br/>
+ * File: BusArrearsCarryVehicleApplyFeignFallback.java <br/>
+ * Class: bus.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeignFallback <br/>
+ * Description: 欠款提车申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 15:29:26 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrearsCarryVehicleApplyFeign {
+
+    @Override
+    public ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<ArrearsCarryVehicleQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ArrearsCarryVehiclePageVo implements Vo {
+    private static final long serialVersionUID = 1607000479637135351L;
+
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+
+    @ApiModelProperty("车架号")
+    @JsonProperty("VINNo")
+    private String VINNo;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+
+    @ApiModelProperty("成交价")
+    private BigDecimal dealMoney;
+
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String applyDate;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehicleQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ArrearsCarryVehicleQuery implements Query {
+    private static final long serialVersionUID = -6057398801276376804L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("客户名称 合同编号")
+    private String name;
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.terminal.biz.arrearsTakeCar;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.AppBusArrearsCarryVehicleApplyFeign;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
+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 io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * Project: bus(bus) <br/>
+ * File: BusArrearsCarryVehicleApplyFeignFallback.java <br/>
+ * Class: bus.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyRest <br/>
+ * Description: 欠款提车申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 15:29:26 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "欠款提车申请")
+@RestController
+@RequestMapping("v1/busarrearscarryvehicleapply")
+public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVehicleApplyFeign {
+
+    @Autowired
+    private AppBusArrearsCarryVehicleApplyService appBusArrearsCarryVehicleApplyService;
+
+
+    @Override
+    public ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<ArrearsCarryVehicleQuery> pagerQuery) {
+        return appBusArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -0,0 +1,53 @@
+package com.yxt.anrui.terminal.biz.arrearsTakeCar;
+
+
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
+import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehicleQuery;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
+import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AppBusAdvanceGinvoiceapplyFeign;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo;
+import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
+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;
+
+
+/**
+ * Project: bus(bus) <br/>
+ * File: BusArrearsCarryVehicleApplyService.java <br/>
+ * Class: bus.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService <br/>
+ * Description: 欠款提车申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-03-17 15:29:26 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppBusArrearsCarryVehicleApplyService {
+
+
+    @Autowired
+    BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
+
+    public ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<ArrearsCarryVehicleQuery> pagerQuery) {
+        ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppArrearsCarryVehicleQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> advanceInvoiceList = busArrearsCarryVehicleApplyFeign.getArrearsTakeCarList(pq);
+        PagerVo<ArrearsCarryVehiclePageVo> vo = CoverUtils.selectPagerVo(advanceInvoiceList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean deleteArrearsTakeCar(String contractSid) {
+        ResultBean resultBean = busArrearsCarryVehicleApplyFeign.deleteArrearsTakeCar(contractSid);
+        return resultBean;
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java

@@ -5,6 +5,7 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
@@ -24,7 +25,7 @@ public class AppScmBaseInfoService {
     @Autowired
     ScmVehicleInventoryFeign scmVehicleInventoryFeign;
     @Autowired
-    ScmVehicleStayPatrolinspectionFeign scmVehicleStayPatrolinspectionFeign;
+    ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign;
 
 
     public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
@@ -34,7 +35,7 @@ public class AppScmBaseInfoService {
         String storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData();
         String moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData();
         String inventoryCarNum = scmVehicleInventoryFeign.getToDoNum(userSid).getData();
-        String inspectinoCarNum = scmVehicleStayPatrolinspectionFeign.getToDoNum(userSid).getData();
+        String inspectinoCarNum = scmVehiclePatrolinspectionFeign.getToDoNum(userSid).getData();
         appScmBaseInfoVo.setInspectedCarNum(inspectedCarNum);
         appScmBaseInfoVo.setStorageCarNum(storageCarNum);
         appScmBaseInfoVo.setMoveCarNum(moveCarNum);