Merge remote-tracking branch 'origin/master'

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

@@ -520,5 +520,8 @@ public interface BaseVehicleFeign {
     @ResponseBody
     ResultBean updateLockedState(@RequestParam("vehSid") String vehSid);
 
+    @ApiOperation("退车申请后修改状态")
+    @PostMapping("/updateStateForReturnVeh")
+    public ResultBean updateStateForReturnVeh(@RequestParam("vehSid") String vehSid);
 
 }

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

@@ -417,6 +417,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateStateForReturnVeh(String vehSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
         return null;

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

@@ -501,4 +501,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     List<BaseVehicleExportVo> selByExcel(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleExportVo> qw);
 
     IPage<BaseVehicleQKKPVo> vehicleQKKPPageList(IPage<BaseVehicleQKKPVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    void updateStateForReturnVeh(String vehSid);
 }

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

@@ -301,7 +301,7 @@
     <select id="namesDown" resultType="java.util.Map">
         SELECT bv.vinNo, bv.sid
         FROM base_vehicle bv
-                ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
     <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         select bv.sid,
@@ -398,8 +398,8 @@
                bvm.insideCode,
                bmc.packingCase
         FROM base_vehicle bv
-                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
-                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
         WHERE bv.modelSid = #{modelSid}
         GROUP BY bvm.sid
     </select>
@@ -416,8 +416,8 @@
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo">
         SELECT bv.guidedPrice AS price
         FROM base_vehicle bv
-                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
         WHERE bvm.sid = #{modelSid}
         ORDER BY bv.guidedPrice ASC
     </select>
@@ -425,14 +425,14 @@
     <select id="getModelNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehicle bv
-                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
 
     <select id="getConfigNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
     </select>
 
@@ -456,8 +456,8 @@
                bvm.insideCode,
                bmc.rearAxleValue
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -542,8 +542,8 @@
                          bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`,
                          bvm.`department`) as vehModelInfor
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid} LIMIT 1
     </select>
@@ -600,8 +600,8 @@
                          bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`,
                          bvm.`department`) as vehModelInfor
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1
     </select>
 
@@ -727,11 +727,11 @@
                (select SUM(cast((cast(bo.platformNo as signed) -
                                  IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
                 from bus_vehicle_order bo
-                             LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
+                         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
                 where bo.useOrgSid = bvc.useOrgSid
                   AND bd.vehicleSid = bvm.sid)      AS produceCarNum
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.useOrgSid != #{useOrg}
         group by bvc.useOrgSid
@@ -753,17 +753,17 @@
                         WHERE bv.modelSid = bvm.sid
                           AND bv.modelConfigSid = bvc.configurationItemsSid
                           AND lockedState = '03')
-                               +
+                       +
                        (SELECT count(*)
                         FROM bus_vehicle_apply_detail bvad
                         WHERE bvad.vehicleSid = bvm.sid
                           AND bvad.configSid = bvc.configurationItemsSid)
-                       )                                         AS num,
+                   )                                             AS num,
                bvm.vehicleTypeCode,
                bmc.configCode
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -993,8 +993,8 @@
                carColor          AS color,
                locationName      AS address
         FROM base_vehicle bv
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-                ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectVehicleCount" resultType="java.lang.Integer">
@@ -1032,16 +1032,16 @@
                bmc.configName                                   AS commonlyConfig,
                (SELECT GROUP_CONCAT(bvl.labelName)
                 FROM base_vehmodel_label bvl
-                             LEFT JOIN base_vehmodelconfig_label bvcl
+                         LEFT JOIN base_vehmodelconfig_label bvcl
-                        ON bvcl.labelSid = bvl.sid
+                                   ON bvcl.labelSid = bvl.sid
-                             LEFT JOIN base_vehmodel_config bvc
+                         LEFT JOIN base_vehmodel_config bvc
-                        ON bvc.`sid` = bvcl.`vehmodelConfigSid`
+                                   ON bvc.`sid` = bvcl.`vehmodelConfigSid`
                 WHERE bvc.modelSid = bvm.sid
                   AND bvc.`configurationItemsSid` = bmc.sid
                   AND bvc.`useOrgSid` = #{useOrg})              AS labelName
         FROM base_vehmodel_config bc
-                     LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
         where bc.modelSid = #{modelSid}
           AND bc.configurationItemsSid = #{configSid}
           AND bc.useOrgSid = #{useOrg}
@@ -1053,8 +1053,8 @@
                convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
                bmc.configName                                    AS commonlyConfig
         from base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         where bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -1079,7 +1079,7 @@
                bv.locationName address,
                bv.sid          carSid,
                if(bv.lockedState = '01', 1, 0)
-                       as      isFictitious
+                   as          isFictitious
         from base_vehicle bv
         where bv.modelSid = #{modelSid}
           and bv.modelConfigSid = #{configSid}
@@ -1087,9 +1087,9 @@
           and bv.lockedState = #{state}
           AND (
                 bv.vehicleStateValue = '库存'
-                        or bv.vehicleStateValue = '在途'
+                or bv.vehicleStateValue = '在途'
-                        or bv.vehicleStateValue = '调入'
+                or bv.vehicleStateValue = '调入'
-                )
+            )
           and bv.isDelete = 0
         order by isFictitious, bv.locationName, bv.vinNo desc
     </select>
@@ -1214,7 +1214,7 @@
 
     <update id="updateVehicleOutLibrary">
         UPDATE
-                base_vehicle
+            base_vehicle
         SET vehicleState      = #{vehicleState},
             vehicleStateValue = #{vehicleStateValue},
             salesDate         = #{salesDate},
@@ -1225,7 +1225,7 @@
 
     <update id="updateVehicleBuyBreak">
         UPDATE
-                base_vehicle
+            base_vehicle
         SET solidDate             = #{solidDate},
             settlementStatus      = #{settlementStatus},
             settlementStatusValue = #{settlementStatusValue}
@@ -1350,12 +1350,12 @@
                bv.`salesDate`,
                bv.`solidDate`
         FROM anrui_scm.`scm_specialrebate_vehs` ssv
-                     LEFT JOIN anrui_base.`base_vehicle` bv
+                 LEFT JOIN anrui_base.`base_vehicle` bv
-                ON ssv.`vehSid` = bv.`sid`
+                           ON ssv.`vehSid` = bv.`sid`
-                     LEFT JOIN base_vehicle_model bvm
+                 LEFT JOIN base_vehicle_model bvm
-                ON bv.`modelSid` = bvm.`sid`
+                           ON bv.`modelSid` = bvm.`sid`
-                        AND bv.`createOrgSid` = bvm.`createOrg`
+                               AND bv.`createOrgSid` = bvm.`createOrg`
-                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         WHERE ssv.`specialRebateSid` = #{specialRebateSid}
     </select>
 
@@ -1576,12 +1576,12 @@
                bd.salesPolicy       AS label,
                bdv.guidedQKPrice    AS promotionPrice
         FROM base_vehicle bv
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-                     LEFT JOIN base_discountpackage_veh bdv
+                 LEFT JOIN base_discountpackage_veh bdv
-                ON bdv.vehSid = bv.sid
+                           ON bdv.vehSid = bv.sid
-                     LEFT JOIN base_discountpackage bd
+                 LEFT JOIN base_discountpackage bd
-                ON bdv.mainSid = bd.sid
+                           ON bdv.mainSid = bd.sid
-                ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="getStockModelSidAndConfigSid" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
@@ -1590,16 +1590,16 @@
                bmc.configName                                    AS commonlyConfig,
                (SELECT GROUP_CONCAT(bvl.labelName)
                 FROM base_vehmodel_label bvl
-                             LEFT JOIN base_vehmodelconfig_label bvcl
+                         LEFT JOIN base_vehmodelconfig_label bvcl
-                        ON bvcl.labelSid = bvl.sid
+                                   ON bvcl.labelSid = bvl.sid
-                             LEFT JOIN base_vehmodel_config bvc
+                         LEFT JOIN base_vehmodel_config bvc
-                        ON bvc.`sid` = bvcl.`vehmodelConfigSid`
+                                   ON bvc.`sid` = bvcl.`vehmodelConfigSid`
                 WHERE bvc.modelSid = bvm.sid
                   AND bvc.`configurationItemsSid` = bmc.sid
                   AND bvc.`useOrgSid` = #{useOrg})               AS labelName
         from base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         where bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -1621,12 +1621,21 @@
 
     <update id="updateVehicleStateAndSaleDate">
         UPDATE
-                base_vehicle
+            base_vehicle
         SET vehicleState      = "0001",
             vehicleStateValue = "库存",
             salesDate         = null
         WHERE sid = #{sid}
     </update>
+    <update id="updateStateForReturnVeh">
+        UPDATE
+            base_vehicle
+        SET vehicleState      = "0001",
+            vehicleStateValue = "库存",
+            salesDate         = null,
+            salePrice         = null
+        WHERE sid = #{vehSid}
+    </update>
 
 
     <!--  导出车辆台账信息列表-->

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

@@ -1489,6 +1489,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.updateLockedState(vehSid);
     }
 
+    @Override
+    public ResultBean updateStateForReturnVeh(String vehSid) {
+        return baseVehicleService.updateStateForReturnVeh(vehSid);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

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

@@ -592,11 +592,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 //            if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) {
 //                qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
 //            }
-            if (StringUtils.isNotBlank(pagerQuery.getOrgName())){
+            if (StringUtils.isNotBlank(pagerQuery.getOrgName())) {
-                qw.like("bv.createOrgName",pagerQuery.getOrgName());
+                qw.like("bv.createOrgName", pagerQuery.getOrgName());
             }
-            if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){
+            if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())) {
-                qw.like("bv.purchaseSystemName",pagerQuery.getPurchaseSystemName());
+                qw.like("bv.purchaseSystemName", pagerQuery.getPurchaseSystemName());
             }
             if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
                 qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
@@ -1074,7 +1074,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 long time = date1.getTime();
                 configDetailVo.setDateLong(time);
             }
-        }else{
+        } else {
             return rb.setMsg("该分公司下无此车型配置");
         }
         configDetailVo.setVehicleTypeCode("车型信息（" + configDetailVo.getVehicleTypeCode() + "）");
@@ -3497,8 +3497,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //锁定状态为未锁定
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
             List<String> list = params.getList();
-            if(!list.isEmpty()){
+            if (!list.isEmpty()) {
-                qw.notIn("bv.sid",list);
+                qw.notIn("bv.sid", list);
             }
         }
         IPage<InputVinListVo> pagging = baseMapper.saleOrderVin(page, qw, params.getNames());
@@ -4085,11 +4085,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getOrderingNo())) {//排产订单编号
             qw.like("bv.orderingNo", pagerQuery.getOrderingNo());
         }
-        if (StringUtils.isNotBlank(pagerQuery.getOrgName())){
+        if (StringUtils.isNotBlank(pagerQuery.getOrgName())) {
-            qw.like("bv.createOrgName",pagerQuery.getOrgName());
+            qw.like("bv.createOrgName", pagerQuery.getOrgName());
         }
-        if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){
+        if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())) {
-            qw.like("bv.purchaseSystemName",pagerQuery.getPurchaseSystemName());
+            qw.like("bv.purchaseSystemName", pagerQuery.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
             qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
@@ -4240,19 +4240,19 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
             qw.eq("bmc.configName", pagerQuery.getConfigName());
         }
-        if (StringUtils.isNotBlank(pagerQuery.getOtherConfigOne()) || StringUtils.isNotBlank(pagerQuery.getOtherConfigTwo()) || StringUtils.isNotBlank(pagerQuery.getOtherConfigThree())){
+        if (StringUtils.isNotBlank(pagerQuery.getOtherConfigOne()) || StringUtils.isNotBlank(pagerQuery.getOtherConfigTwo()) || StringUtils.isNotBlank(pagerQuery.getOtherConfigThree())) {
-            qw.and(wrapper -> wrapper.like("bmc.otherConfig", pagerQuery.getOtherConfigOne()).like("bmc.otherConfig", pagerQuery.getOtherConfigTwo()).like("bmc.otherConfig",pagerQuery.getOtherConfigThree()));
+            qw.and(wrapper -> wrapper.like("bmc.otherConfig", pagerQuery.getOtherConfigOne()).like("bmc.otherConfig", pagerQuery.getOtherConfigTwo()).like("bmc.otherConfig", pagerQuery.getOtherConfigThree()));
         }
         qw.orderByDesc("bv.createOrgSid");
         qw.orderByDesc("bv.priceDate");
-        if (StringUtils.isNotBlank(pagerQuery.getLibraryAge())){
+        if (StringUtils.isNotBlank(pagerQuery.getLibraryAge())) {
-            qw.having("libraryAge = {0}",pagerQuery.getLibraryAge());
+            qw.having("libraryAge = {0}", pagerQuery.getLibraryAge());
         }
-        if (StringUtils.isNotBlank(pagerQuery.getOrgLibraryAge())){
+        if (StringUtils.isNotBlank(pagerQuery.getOrgLibraryAge())) {
-            qw.having("orgLibraryAge = {0}",pagerQuery.getOrgLibraryAge());
+            qw.having("orgLibraryAge = {0}", pagerQuery.getOrgLibraryAge());
         }
-        if (StringUtils.isNotBlank(pagerQuery.getSettlementLibraryAge())){
+        if (StringUtils.isNotBlank(pagerQuery.getSettlementLibraryAge())) {
-            qw.having("settlementLibraryAge = {0}",pagerQuery.getSettlementLibraryAge());
+            qw.having("settlementLibraryAge = {0}", pagerQuery.getSettlementLibraryAge());
         }
         IPage<BaseVehicleQuery> page = PagerUtil.queryToPage(pq);
         IPage<BaseVehicleVo> pagging = baseMapper.pagerList(page, qw);
@@ -4359,4 +4359,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         PagerVo<BaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean updateStateForReturnVeh(String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicle baseVehicle = fetchBySid(vehSid);
+        if (null != baseVehicle) {
+            baseMapper.updateStateForReturnVeh(vehSid);
+        }
+        return rb.success();
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -41,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
@@ -115,6 +116,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private BusDeliveredApplyFeign busDeliveredApplyFeign;
     @Autowired
     private LoanSolutionsFeign loanSolutionsFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@@ -1005,6 +1008,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 }
             }
         }
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(appDto.getContractNo()).getData();
+        if ("2".equals(busSalesOrder.getFinancePlan())){
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(appDto.getContractNo(), baseVehicle.getSid()).getData();
+            String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
+            if (StringUtils.isNotBlank(otherReceivableMoney)){
+                note = note + "贴息抵车款" + otherReceivableMoney + "元。";
+            }
+        }
         if (StringUtils.isNotBlank(note)) {
             fEntity.setFEntrynote(note);
         }
@@ -1845,6 +1856,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     }
                 }
             }
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
+            if ("2".equals(busSalesOrder.getFinancePlan())){
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicle.getSid()).getData();
+                String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
+                if (StringUtils.isNotBlank(otherReceivableMoney)){
+                    note = note + "贴息抵车款" + otherReceivableMoney + "元。";
+                }
+            }
             if (StringUtils.isNotBlank(note)) {
                 fEntity.setFEntrynote(note);
             }

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

@@ -216,4 +216,14 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     ResultBean<DeliveredFinVo> deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
 
+    @ApiOperation("退车申请查看车辆的款票情况PC")
+    @GetMapping("/deliveredFinSelecByBusVinSidPC")
+    @ResponseBody
+    ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSidPC(@RequestParam("contractNo") String contractNo, @RequestParam("busVinSid") String busVinSid);
+
+    @ApiOperation("退车申请查看车辆的款票情况APP")
+    @GetMapping("/deliveredFinSelecByBusVinSid")
+    @ResponseBody
+    ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
+
 }

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

@@ -116,6 +116,16 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSidPC(String contractNo, String busVinSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSid(String contractNo, String vinSid) {
+        return null;
+    }
+
     @Override
     public ResultBean complete(BusDeliveredApplyCompleteDto query) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVeh.java

@@ -28,7 +28,9 @@ package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,32 +53,33 @@ import lombok.Data;
 @TableName("bus_sales_order_return_veh")
 public class BusSalesOrderReturnVeh extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty("销售订单车辆业务sid")
-	@ApiModelProperty("主表sid")
+    private String busVinSid;
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("车辆sid")
+    @ApiModelProperty("车辆sid")
     private String vehSid; // 车辆sid
-	@ApiModelProperty("车身颜色key")
+    @ApiModelProperty("车身颜色key")
     private String carColorKey; // 车身颜色key
-	@ApiModelProperty("车身颜色value")
+    @ApiModelProperty("车身颜色value")
     private String carColorValue; // 车身颜色value
-	@ApiModelProperty("合格证状态key")
+    @ApiModelProperty("合格证状态key")
     private String certificateStateKey; // 合格证状态key
-	@ApiModelProperty("合格证状态value")
+    @ApiModelProperty("合格证状态value")
     private String certificateStateValue; // 合格证状态value
-	@ApiModelProperty("开票状态key")
+    @ApiModelProperty("开票状态key")
     private String invoicingStateKey; // 开票状态key
-	@ApiModelProperty("开票状态value")
+    @ApiModelProperty("开票状态value")
     private String invoicingStateValue; // 开票状态value
-	@ApiModelProperty("投保状态key")
+    @ApiModelProperty("投保状态key")
     private String insureStateKey; // 投保状态key
-	@ApiModelProperty("投保状态value")
+    @ApiModelProperty("投保状态value")
     private String insureStateValue; // 投保状态value
-	@ApiModelProperty("库存状态key")
+    @ApiModelProperty("库存状态key")
     private String stockStateKey; // 库存状态key
-	@ApiModelProperty("库存状态value")
+    @ApiModelProperty("库存状态value")
     private String stockStateValue; // 库存状态value
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehDetailsVo.java

@@ -29,7 +29,9 @@ package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
 import com.yxt.common.core.vo.Vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,32 +54,35 @@ import lombok.Data;
 public class BusSalesOrderReturnVehDetailsVo implements Vo {
 
     private String sid; // sid
-
+    @ApiModelProperty("销售订单车辆业务sid")
-	@ApiModelProperty("主表sid")
+    private String busVinSid;
+    @ApiModelProperty("合同号")
+    private String contractNo;
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("车辆sid")
+    @ApiModelProperty("车辆sid")
     private String vehSid; // 车辆sid
-	@ApiModelProperty("车身颜色key")
+    @ApiModelProperty("车身颜色key")
     private String carColorKey; // 车身颜色key
-	@ApiModelProperty("车身颜色value")
+    @ApiModelProperty("车身颜色value")
     private String carColorValue; // 车身颜色value
-	@ApiModelProperty("合格证状态key")
+    @ApiModelProperty("合格证状态key")
     private String certificateStateKey; // 合格证状态key
-	@ApiModelProperty("合格证状态value")
+    @ApiModelProperty("合格证状态value")
     private String certificateStateValue; // 合格证状态value
-	@ApiModelProperty("开票状态key")
+    @ApiModelProperty("开票状态key")
     private String invoicingStateKey; // 开票状态key
-	@ApiModelProperty("开票状态value")
+    @ApiModelProperty("开票状态value")
     private String invoicingStateValue; // 开票状态value
-	@ApiModelProperty("投保状态key")
+    @ApiModelProperty("投保状态key")
     private String insureStateKey; // 投保状态key
-	@ApiModelProperty("投保状态value")
+    @ApiModelProperty("投保状态value")
     private String insureStateValue; // 投保状态value
     @ApiModelProperty("库存状态key")
     private String stockStateKey; // 库存状态key
-	@ApiModelProperty("库存状态value")
+    @ApiModelProperty("库存状态value")
     private String stockStateValue; // 库存状态value
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehDto.java

@@ -29,7 +29,9 @@ package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
 import com.yxt.common.core.dto.Dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,32 +54,33 @@ import lombok.Data;
 public class BusSalesOrderReturnVehDto implements Dto {
 
     private String sid; // sid
-
+    @ApiModelProperty("销售订单车辆sid")
-	@ApiModelProperty("主表sid")
+    private String busVinSid; // 销售订单车辆sid
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("车辆sid")
+    @ApiModelProperty("车辆sid")
     private String vehSid; // 车辆sid
-	@ApiModelProperty("车身颜色key")
+    @ApiModelProperty("车身颜色key")
     private String carColorKey; // 车身颜色key
-	@ApiModelProperty("车身颜色value")
+    @ApiModelProperty("车身颜色value")
     private String carColorValue; // 车身颜色value
-	@ApiModelProperty("合格证状态key")
+    @ApiModelProperty("合格证状态key")
     private String certificateStateKey; // 合格证状态key
-	@ApiModelProperty("合格证状态value")
+    @ApiModelProperty("合格证状态value")
     private String certificateStateValue; // 合格证状态value
-	@ApiModelProperty("开票状态key")
+    @ApiModelProperty("开票状态key")
     private String invoicingStateKey; // 开票状态key
-	@ApiModelProperty("开票状态value")
+    @ApiModelProperty("开票状态value")
     private String invoicingStateValue; // 开票状态value
-	@ApiModelProperty("投保状态key")
+    @ApiModelProperty("投保状态key")
     private String insureStateKey; // 投保状态key
-	@ApiModelProperty("投保状态value")
+    @ApiModelProperty("投保状态value")
     private String insureStateValue; // 投保状态value
     @ApiModelProperty("库存状态key")
     private String stockStateKey; // 库存状态key
-	@ApiModelProperty("库存状态value")
+    @ApiModelProperty("库存状态value")
     private String stockStateValue; // 库存状态value
 
 }

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

@@ -178,6 +178,16 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return busDeliveredApplyService.deliveredFinSelect(contractNo,vinSid);
     }
 
+    @Override
+    public ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSidPC(String contractNo, String busVinSid) {
+        return busDeliveredApplyService.deliveredFinSelectByBusVinSid(contractNo,busVinSid);
+    }
+
+    @Override
+    public ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSid(String contractNo, String vinSid) {
+        return busDeliveredApplyService.deliveredFinSelectByBusVinSid(contractNo,vinSid);
+    }
+
     @Override
     public ResultBean complete(BusDeliveredApplyCompleteDto query) {
         BusinessVariables bv = new BusinessVariables();

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

@@ -74,6 +74,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto;
 import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
@@ -2718,4 +2719,47 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         return rb.success().setData(deliveredFinVo);
     }
+
+    /**
+     * 退车申请查看款票情况
+     *
+     * @param contractNo
+     * @param busVinSid
+     * @return
+     */
+    public ResultBean<DeliveredFinVo> deliveredFinSelectByBusVinSid(String contractNo, String busVinSid) {
+        ResultBean<DeliveredFinVo> rb = ResultBean.fireFail();
+        DeliveredFinVo deliveredFinVo = new DeliveredFinVo();
+        //查询销售订单
+        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);
+        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        //根据合同号和车辆sid查询车辆
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
+        if (busSalesOrderVehicle != null) {
+            BusSalesOrderVehicleDetailsVo busSalesOrderVehicleDetailsVo = busSalesOrderVehicleService.selectVinNoBySid(busVinSid);
+            deliveredFinVo.setVinNo(busSalesOrderVehicleDetailsVo.getLinkNo());
+            deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType());
+            deliveredFinVo.setContractNo(contractNo);
+            deliveredFinVo.setCustomerName(appOrderDetailsVo.getName());
+            deliveredFinVo.setModelName(appOrderDetailsVo.getModelInfo().getModelName());
+            String vehSid = "";
+            if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                vehSid = busSalesOrderVehicle.getLinkSid();
+            }
+            //根据销售订单车辆查询款项情况
+            ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedFeign.receivedSelect(busSalesOrderVehicle.getSid(), vehSid);
+            if (receiveInvoiceVoResultBean.getData() != null) {
+                List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList();
+                List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList());
+                deliveredFinVo.setFinSelectVoList(voList);
+                InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
+                if (invoiceVo != null) {
+                    VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();
+                    BeanUtil.copyProperties(invoiceVo, vinInvoiceVo);
+                    deliveredFinVo.setVinInvoiceVo(vinInvoiceVo);
+                }
+            }
+        }
+        return rb.success().setData(deliveredFinVo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2004,7 +2004,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     record.setShowStopBtn(false);
                 }
             } else {
-                record.setShowStopBtn(false);
+                if (record.isShowStopBtn()) {
+                    record.setShowStopBtn(true);
+                } else {
+                    record.setShowStopBtn(false);
+                }
             }
             if (StringUtils.isNotBlank(record.getCustomerImage())) {
                 record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
@@ -41,6 +42,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
@@ -57,6 +59,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeQuery
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.SubmitBusSalesOrderReturnVehApplyDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
@@ -67,6 +70,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
@@ -152,6 +156,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
     private BusSalesOrderVehicleService busSalesOrderVehicleService;
     @Autowired
     private BaseVehicleStateFeign baseVehicleStateFeign;
+    @Autowired
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 
     public PagerVo<BusSalesOrderReturnVehApplyVo> listPageVo(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) {
         BusSalesOrderReturnVehApplyQuery query = pq.getParams();
@@ -290,38 +296,84 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) {
                 List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid());
                 for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
-                    spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
+                    //------------------ 8.30优化退车申请注释--------------------------
+//                    spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
+                    spVehSids.add(busSalesOrderReturnVehDetailsVo.getBusVinSid());
+                    //-------------------------------------------------------------------
                 }
             }
         }
         for (VinListsVo vinListsVo : vinListsVos) {
-            if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
+            //--------------------------------8.30优化退车申请注释----------------------------------
+            if (StringUtils.isNotBlank(vinListsVo.getSid())) {
                 BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
-                String vinSid = vinListsVo.getVinSid();
+                // String vinSid = vinListsVo.getVinSid();
-                if (spVehSids.contains(vinSid)) {
+                if (spVehSids.contains(vinListsVo.getSid())) {
                     continue;
                 }
-                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+                busSalesOrderReturnVehDetailsVo.setBusVinSid(vinListsVo.getSid());
-                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+                if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
-                busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+                    BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinListsVo.getVinSid()).getData();
-                busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+                    BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
-                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+                    busSalesOrderReturnVehDetailsVo.setVehSid(vinListsVo.getVinSid());
-                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+                    busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
-                if (baseVehicleCertificateVo != null) {
+                    busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
-                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+                    if (baseVehicleCertificateVo != null) {
-                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                    } else {
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+                    }
                 } else {
                     busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
                     busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
                 }
+                // ------------查询车架号---------------
+                //   busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+                BusSalesOrderVehicleDetailsVo busSalesOrderVehicleDetailsVo = busSalesOrderVehicleService.selectVinNoBySid(vinListsVo.getSid());
+                if (null != busSalesOrderVehicleDetailsVo) {
+                    if (StringUtils.isNotBlank(busSalesOrderVehicleDetailsVo.getLinkNo())) {
+                        busSalesOrderReturnVehDetailsVo.setVinNo(busSalesOrderVehicleDetailsVo.getLinkNo());
+                    }
+                }
+                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
                 busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
                 busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
                 busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
                 busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
-                busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+
-                busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
                 busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
             }
+            //-------------------------------------------------------------------------------------
+//            if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
+//                BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
+//                String vinSid = vinListsVo.getVinSid();
+//                if (spVehSids.contains(vinSid)) {
+//                    continue;
+//                }
+//                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+//                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+//                busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+//                busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+//                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+//                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+//                if (baseVehicleCertificateVo != null) {
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+//                } else {
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+//                }
+//                busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
+//                busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
+//                busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
+//                busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
+//                busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+//                busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
+//                busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
+//            }
         }
         if (busSalesOrderReturnVehApplyECTJ != null) {
             if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")) {
@@ -443,7 +495,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             return rb.setMsg("当前所在的组织机构不存在");
         }
         if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
-         //   return rb.setMsg("当前所在的组织机构未设置主管人员");
+            //   return rb.setMsg("当前所在的组织机构未设置主管人员");
             sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
         }
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dto.getSid());
@@ -574,6 +626,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+
                 List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(businessSid);
                 //---------------------修改车辆持久状态-------------------------
                 String orderSid = busSalesOrderReturnVehApply.getOrderSid();
@@ -582,10 +635,17 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 BusSalesOrder finalBusSalesOrderOne = busSalesOrderService.fetchBySid(orderSid);
                 //---------------------修改车辆持久状态-------------------------
                 for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
-                    String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid();
+                    //8.30优化退车申请---如果车辆sid不为空-----
-                    baseVehicleFeign.updateLockedState(vehSid);
+                    if (StringUtils.isNotBlank(busSalesOrderReturnVehDetailsVo.getVehSid())) {
+                        String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid();
+                        baseVehicleFeign.updateLockedState(vehSid);
+                        //------修改车辆台账库存状态为库存、销售日期清空、成交价清空、锁定状态未锁定
+                        baseVehicleFeign.updateStateForReturnVeh(vehSid);
+                        //对应车辆开票作废
+                        finVehicleInvoiceFeign.updateBillingState(busSalesOrderReturnVehApply.getContractNo(), vehSid);
+                    }
                     //------------------------修改车辆持久状态--------------------------
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vehSid, orderSid);
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());
                     vehicleList.add(busSalesOrderVehicle);
                 }
                 //------------------------修改车辆持久状态--------------------------
@@ -895,38 +955,82 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) {
                 List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid());
                 for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
-                    spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
+                    // spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
+                    spVehSids.add(busSalesOrderReturnVehDetailsVo.getBusVinSid());
                 }
             }
         }
         for (VinListsVo vinListsVo : vinListsVos) {
-            if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
+            //--------------------------------8.30优化退车申请注释----------------------------------
+            if (StringUtils.isNotBlank(vinListsVo.getSid())) {
                 BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
-                String vinSid = vinListsVo.getVinSid();
+                // String vinSid = vinListsVo.getVinSid();
-                if (spVehSids.contains(vinSid)) {
+                if (spVehSids.contains(vinListsVo.getSid())) {
                     continue;
                 }
-                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+                busSalesOrderReturnVehDetailsVo.setBusVinSid(vinListsVo.getSid());
-                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+                busSalesOrderReturnVehDetailsVo.setContractNo(appOrderDetailsVo.getContractId());
-                busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+                if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
-                busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+                    BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinListsVo.getVinSid()).getData();
-                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+                    BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
-                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+                    busSalesOrderReturnVehDetailsVo.setVehSid(vinListsVo.getVinSid());
-                if (baseVehicleCertificateVo != null) {
+                    busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
-                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+                    busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
-                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                    if (baseVehicleCertificateVo != null) {
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                    } else {
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
+                        busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+                    }
                 } else {
                     busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
                     busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
                 }
+                // ------------查询车架号---------------
+                //   busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+                BusSalesOrderVehicleDetailsVo busSalesOrderVehicleDetailsVo = busSalesOrderVehicleService.selectVinNoBySid(vinListsVo.getSid());
+                if (null != busSalesOrderVehicleDetailsVo) {
+                    if (StringUtils.isNotBlank(busSalesOrderVehicleDetailsVo.getLinkNo())) {
+                        busSalesOrderReturnVehDetailsVo.setVinNo(busSalesOrderVehicleDetailsVo.getLinkNo());
+                    }
+                }
+                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
                 busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
                 busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
                 busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
                 busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
-                busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+
-                busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
                 busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
             }
+//            if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
+//                BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
+//                String vinSid = vinListsVo.getVinSid();
+//                if (spVehSids.contains(vinSid)) {
+//                    continue;
+//                }
+//                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+//                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+//                busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+//                busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+//                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+//                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+//                if (baseVehicleCertificateVo != null) {
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+//                } else {
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
+//                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+//                }
+//                busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
+//                busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
+//                busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
+//                busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
+//                busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+//                busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
+//                busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
+//            }
         }
         if (busSalesOrderReturnVehApplyECTJ != null) {
             if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")) {
@@ -1005,6 +1109,11 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         vo.setModelImage(fileUploadComponent.getUrlPrefix() + modelInfo.getModelImage());
         vo.setConfigSid(modelInfo.getConfigSid());
         List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(sid);
+        if (!busSalesOrderReturnVehDetailsVos.isEmpty()) {
+            for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
+                busSalesOrderReturnVehDetailsVo.setContractNo(appOrderDetailsVo.getContractId());
+            }
+        }
         vo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVos);
         return rb.success().setData(vo);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -147,4 +147,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     @Update("update bus_sales_order_vehicle set borrowerSid = #{borrowerSid},loanContractSid = #{loanContractSid} where sid = #{sid}")
     void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
+
+    BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -83,7 +83,7 @@
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_sales_order_vehicle bv
-                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractNo}
           and bv.linkSid = #{vinSid}
     </select>
@@ -92,7 +92,7 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_delivered bd
-                     left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
+                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
         where bd.contractNo = #{contractNo}
           and bd.state = 1
           and length(bv.linkSid) > 0
@@ -105,8 +105,8 @@
               from anrui_base.base_vehicle_state
               where busState = '401'
                 and (finState = '1' or carryVehicleState = 1)) as bs
-                     left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
+                 left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
-                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where length(bv.linkSid) > 0
           and bo.contractNo = #{contractNo}
     </select>
@@ -125,19 +125,19 @@
     </select>
 
     <select id="getCanUseCars" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo">
-       <!-- select bv.linkNo as vin,
+        <!-- select bv.linkNo as vin,
-        bv.linkSid carSid,
+         bv.linkSid carSid,
-        bm.finalPrice as price,
+         bm.finalPrice as price,
-        bv.sid busVinSid,
+         bv.sid busVinSid,
-        bo.contractNo,
+         bo.contractNo,
-        bo.customerName
+         bo.customerName
-        from bus_sales_order_vehicle bv
+         from bus_sales_order_vehicle bv
-        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+         left join bus_sales_order bo on bo.sid = bv.salesOrderSid
-        left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid
+         left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid
-        <where>
+         <where>
-            ${ew.sqlSegment}
+             ${ew.sqlSegment}
-            and length(bv.linkSid)>0
+             and length(bv.linkSid)>0
-        </where>-->
+         </where>-->
         SELECT
         bv.linkNo AS vin,
         bv.linkSid carSid,
@@ -152,11 +152,11 @@
         LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
         <where>
             ${ew.sqlSegment}
-        AND bs.finSourceKey = '2'
+            AND bs.finSourceKey = '2'
-        AND length( bv.linkSid )> 0
+            AND length( bv.linkSid )> 0
-        AND bs.finState = '0'
+            AND bs.finState = '0'
-        AND bs.carryVehicleState = '0'
+            AND bs.carryVehicleState = '0'
-        AND bs.busState = '401'
+            AND bs.busState = '401'
         </where>
     </select>
 
@@ -218,6 +218,21 @@
     </select>
 
     <select id="selectBySalesOrderSid" resultType="java.lang.String">
-        select linkSid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} and length(linkSid)>0
+        select linkSid
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{saleOrderSid}
+          and length(linkSid) > 0
+    </select>
+    <select id="selectVinNoBySid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo">
+        SELECT bv.sid                   as sid,
+               bv.linkSid               as linkSid,
+               if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
+                  if(bso.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
+                   RIGHT(bv.linkNo, 8)) as linkNo,
+               bv.linkText              as linkText
+        FROM bus_sales_order_vehicle AS bv
+                 LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid
+        WHERE bv.sid = #{sid}
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -567,4 +567,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<String> selectBySalesOrderSid(String saleOrderSid) {
         return baseMapper.selectBySalesOrderSid(saleOrderSid);
     }
+
+    public BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid) {
+        return baseMapper.selectVinNoBySid(sid);
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -409,6 +409,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     solutionsDto.setSaleOrderSid(sid);
                     solutionsDto.setShowMore(false);
                     ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                    if(!resultBean.getSuccess()){
+                        return rb.setMsg(resultBean.getMsg());
+                    }
                     entity.setTypeKey("1");
                     entity.setType("资方常规");
                 } else {//金融定制
@@ -423,6 +426,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                 solutionsDto.setSaleOrderSid(sid);
                 solutionsDto.setShowMore(true);
                 ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                if(!resultBean.getSuccess()){
+                    return rb.setMsg(resultBean.getMsg());
+                }
                 entity.setTypeKey("1");
                 entity.setType("资方常规");
                 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
@@ -614,6 +620,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                                 solutionsDto.setShowMore(false);
                             }
                             ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                            if(!resultBean.getSuccess()){
+                                return rb.setMsg(resultBean.getMsg());
+                            }
                         }
                         crmVehicledemand.setTypeKey("1");
                         crmVehicledemand.setType("资方常规");
@@ -629,6 +638,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                         solutionsDto.setSaleOrderSid(sid);
                         solutionsDto.setShowMore(true);
                         ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        if(!resultBean.getSuccess()){
+                            return rb.setMsg(resultBean.getMsg());
+                        }
                     }
                     crmVehicledemand.setTypeKey("1");
                     crmVehicledemand.setType("资方常规");
@@ -666,6 +678,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                                 solutionsDto.setShowMore(false);
                             }
                             ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                            if(!resultBean.getSuccess()){
+                                return rb.setMsg(resultBean.getMsg());
+                            }
                         }
                         crmVehicledemand.setTypeKey("1");
                         crmVehicledemand.setType("资方常规");
@@ -685,6 +700,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                         solutionsDto.setSaleOrderSid(sid);
                         solutionsDto.setShowMore(true);
                         ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        if(!resultBean.getSuccess()){
+                            return rb.setMsg(resultBean.getMsg());
+                        }
                     }else{
                         loanSolutionsFeign.deleteByOrderSid(sid);
                     }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -127,4 +127,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("应收款项状态修改")
     @PostMapping("/updateKxState")
     ResultBean updateKxState(@RequestBody StateQuery stateQuery);
+
+    @ApiOperation("根据销售订单车辆sid查询")
+    @PostMapping("/selectByBusVinSid")
+    ResultBean<String> selectByBusVinSid(@RequestParam("busVinSid") String busVinSid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@@ -123,5 +123,8 @@ public interface FinVehicleInvoiceFeign {
     @ResponseBody
     ResultBean<FinDeliveredFinVo> deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
 
+    @ApiOperation("退车时发票作废")
+    @PostMapping("/updateBillingState")
+    ResultBean updateBillingState(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@@ -134,4 +134,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean updateBillingState(String contractNo, String vinSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -115,4 +115,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
      * @return
      */
     int updateKxState(@Param("list") List<String> busVinSid, @Param("kxState") String kxState);
+
+    String selectOtherReceivableMoneyByBusVinSid(String busVinSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -333,4 +333,10 @@
             #{item}
         </foreach>
     </update>
+
+    <select id="selectOtherReceivableMoneyByBusVinSid" resultType="java.lang.String">
+        SELECT SUM(otherReceivableMoney) AS otherReceivableMoney
+        FROM fin_uncollected_receivables_detailed
+        WHERE busVinSid = #{busVinSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -166,6 +166,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return finUncollectedReceivablesDetailedService.updateKxState(stateQuery);
     }
 
+    @Override
+    public ResultBean<String> selectByBusVinSid(String busVinSid) {
+        return finUncollectedReceivablesDetailedService.selectOtherReceivableMoneyByBusVinSid(busVinSid);
+    }
+
 
     @Override
     public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -993,4 +993,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         }
         return rb.success();
     }
+
+    public ResultBean<String> selectOtherReceivableMoneyByBusVinSid(String busVinSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String otherReceivableMoney = baseMapper.selectOtherReceivableMoneyByBusVinSid(busVinSid);
+        return rb.success().setData(otherReceivableMoney);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@@ -254,4 +254,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
         return finVehicleInvoiceService.deliveredFinSelect(contractNo,vinSid);
     }
 
+    @Override
+    public ResultBean updateBillingState(String contractNo, String vinSid) {
+        return finVehicleInvoiceService.updateBillingState(contractNo,vinSid);
+    }
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -647,4 +647,22 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         }
         return rb.success().setData(deliveredFinVo);
     }
+
+    /**
+     * 根据合同号和车辆sid作废开票记录
+     *
+     * @param contractNo
+     * @param vinSid
+     * @return
+     */
+    public ResultBean updateBillingState(String contractNo, String vinSid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinVehicleInvoice finVehicleInvoice = selectByVinAndContractNo(vinSid, contractNo).getData();
+        if (null != finVehicleInvoice) {
+            finVehicleInvoice.setBillingState("作废");
+            finVehicleInvoice.setBillingStateKey("003");
+            baseMapper.updateById(finVehicleInvoice);
+        }
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -2187,11 +2187,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
 
     public ResultBean<SolutionssVo> selectDetails3(String busSid) {
         ResultBean<SolutionssVo> rb = ResultBean.fireFail();
-        SolutionssVo solutionssVo = new SolutionssVo();
+        SolutionssVo solutionssVo = null;
         //根据关联sid查询是否存在金融方案
         LoanSolutions loanSolutions = baseMapper.selectByApplySid(busSid);
         boolean isTrue = false;
         if (loanSolutions != null) {
+            solutionssVo = new SolutionssVo();
             BeanUtil.copyProperties(loanSolutions, solutionssVo);
             if (loanSolutions.getTrailerAmount() != null) {
                 solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString());
@@ -2205,37 +2206,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
             }
             isTrue = true;
-        }
+            //全款且为三方金融
-        //全款且为三方金融
+            if(StringUtils.isBlank(loanSolutions.getTypeKey())){
-        if(StringUtils.isBlank(loanSolutions.getTypeKey())){
-            solutionssVo.setShowMore(true);
-            solutionssVo.setFactoryDiscountUse("抵利息");
-            if (isTrue) {
-                if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
-                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
-                    if (loanFinOtherPolicy != null) {
-                        solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
-                        solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
-                        solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
-                        solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
-                        solutionssVo.setOtherPolicyIsMain(true);
-                    }
-                } else {
-                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
-                    if (loanFinOtherPolicy != null) {
-                        solutionssVo.setOtherPolicyIsMain(true);
-                    }
-                }
-            }
-        }else{
-            if ("02".equals(loanSolutions.getTypeKey())) {
-                solutionssVo.setFactoryDiscountUse("抵车款");
-                if (isTrue) {
-                    solutionssVo.setShowMore(false);
-                } else {
-                    solutionssVo.setShowMore(false);
-                }
-            }else{
                 solutionssVo.setShowMore(true);
                 solutionssVo.setFactoryDiscountUse("抵利息");
                 if (isTrue) {
@@ -2255,13 +2227,42 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         }
                     }
                 }
+            }else{
+                if ("02".equals(loanSolutions.getTypeKey())) {
+                    solutionssVo.setFactoryDiscountUse("抵车款");
+                    if (isTrue) {
+                        solutionssVo.setShowMore(false);
+                    } else {
+                        solutionssVo.setShowMore(false);
+                    }
+                }else{
+                    solutionssVo.setShowMore(true);
+                    solutionssVo.setFactoryDiscountUse("抵利息");
+                    if (isTrue) {
+                        if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
+                            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                            if (loanFinOtherPolicy != null) {
+                                solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
+                                solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
+                                solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
+                                solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
+                                solutionssVo.setOtherPolicyIsMain(true);
+                            }
+                        } else {
+                            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                            if (loanFinOtherPolicy != null) {
+                                solutionssVo.setOtherPolicyIsMain(true);
+                            }
+                        }
+                    }
+                }
             }
+            if (isTrue) {
+                List<SolutionListVo> formList = getFormList(solutionssVo);
+                solutionssVo.setFinanceForms(formList);
+            }
+            solutionssVo.setBusSid(busSid);
         }
-        if (isTrue) {
-            List<SolutionListVo> formList = getFormList(solutionssVo);
-            solutionssVo.setFinanceForms(formList);
-        }
-        solutionssVo.setBusSid(busSid);
         return rb.success().setData(solutionssVo);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java

@@ -49,32 +49,33 @@ import lombok.Data;
 public class AppBusSalesOrderReturnVehDto implements Dto {
 
     private String sid; // sid
-
+    @ApiModelProperty
-	@ApiModelProperty("主表sid")
+    private String busVinSid;
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("车辆sid")
+    @ApiModelProperty("车辆sid")
     private String vehSid; // 车辆sid
-	@ApiModelProperty("车身颜色key")
+    @ApiModelProperty("车身颜色key")
     private String carColorKey; // 车身颜色key
-	@ApiModelProperty("车身颜色value")
+    @ApiModelProperty("车身颜色value")
     private String carColorValue; // 车身颜色value
-	@ApiModelProperty("合格证状态key")
+    @ApiModelProperty("合格证状态key")
     private String certificateStateKey; // 合格证状态key
-	@ApiModelProperty("合格证状态value")
+    @ApiModelProperty("合格证状态value")
     private String certificateStateValue; // 合格证状态value
-	@ApiModelProperty("开票状态key")
+    @ApiModelProperty("开票状态key")
     private String invoicingStateKey; // 开票状态key
-	@ApiModelProperty("开票状态value")
+    @ApiModelProperty("开票状态value")
     private String invoicingStateValue; // 开票状态value
-	@ApiModelProperty("投保状态key")
+    @ApiModelProperty("投保状态key")
     private String insureStateKey; // 投保状态key
-	@ApiModelProperty("投保状态value")
+    @ApiModelProperty("投保状态value")
     private String insureStateValue; // 投保状态value
     @ApiModelProperty("库存状态key")
     private String stockStateKey; // 库存状态key
-	@ApiModelProperty("库存状态value")
+    @ApiModelProperty("库存状态value")
     private String stockStateValue; // 库存状态value
 
 }