简易订单推送车辆台账数据

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

@@ -254,6 +254,10 @@ public interface BaseVehicleFeign {
     @PostMapping("/updateByVinNo")
     ResultBean updateByVinNo(@RequestBody BaseVehicleUpdateQuery baseVehicleUpdateQuery);
 
+    @ApiOperation("简易订单更新状态")
+    @PostMapping("/updateMainDepositByVinNo")
+    ResultBean updateMainDepositByVinNo(@RequestBody BusMainDepositUpdateQuery busMainDepositUpdateQuery);
+
     @ApiOperation("是否有采购退库状态的车辆")
     @GetMapping("/selectStateByVinNo")
     ResultBean<Boolean> selectStateByVinNo(@RequestParam(value = "vinNoList") List<String> vinNoList);

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

@@ -151,6 +151,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateMainDepositByVinNo(BusMainDepositUpdateQuery busMainDepositUpdateQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<Boolean> selectStateByVinNo(List<String> vinNoList) {
         return null;

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BusMainDepositUpdateQuery implements Query {
+
+
+    private static final long serialVersionUID = -8412945306550896470L;
+
+    @ApiModelProperty("车架号")
+    private List<String> vinNoLis;
+
+    @ApiModelProperty("锁定状态")
+    private String lockedState;
+
+    @ApiModelProperty("锁定状态")
+    private String lockedStateValue;
+
+}

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

@@ -22,7 +22,11 @@ public class VehicleState {
         /**
          * 销售订单-锁定2
          */
-        ORDER_LOCK("02", "销售订单-锁定2");
+        ORDER_LOCK("02", "销售订单-锁定2"),
+        /**
+         * 审批中
+         */
+        CONDUCT_LOCK("04", "审批中");
 
         /**
          * code值

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

@@ -281,6 +281,16 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      */
     void updateByVinNo(@Param("vinNoList") List<String> stringList, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue);
 
+    /**
+     * 根据车架号更新车辆状态key和value
+     *
+     * @param stringList       车架号集合
+     * @param lockedState      锁定状态
+     * @param lockedStateValue 锁定状态vlaue
+     * @return
+     */
+    void updateMainDepositByVinNo(@Param("vinNoList") List<String> stringList, @Param("lockedState") String lockedState, @Param("lockedStateValue") String lockedStateValue);
+
     /**
      * 询该车辆数组中是否包含车辆状态为采购退库状态的车辆，若有返回true，没有则返回false
      *
@@ -304,7 +314,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param settlementStatus 结算状态
      * @return
      */
-    int updateStatusByVinNo(@Param("vinNoList") List<String> stringList, @Param("settlementStatus") String settlementStatus,@Param("settlementStatusValue") String settlementStatusValue);
+    int updateStatusByVinNo(@Param("vinNoList") List<String> stringList, @Param("settlementStatus") String settlementStatus, @Param("settlementStatusValue") String settlementStatusValue);
 
     /**
      * 未售买断选择车辆分页列表
@@ -374,9 +384,9 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     String selectImage(String vehicleSid);
 
-    List<AppScmWarehouseVinVo> getVinByWarehouseSid(@Param("warehouseSid") String warehouseSid,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    List<AppScmWarehouseVinVo> getVinByWarehouseSid(@Param("warehouseSid") String warehouseSid, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    List<AppScmInventoryRecordsVo> selectInventoryRecords(@Param("userOrgSid") String userOrgSid,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    List<AppScmInventoryRecordsVo> selectInventoryRecords(@Param("userOrgSid") String userOrgSid, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     List<BaseExistingCarListVo> selExistingCar(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
@@ -416,23 +426,25 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     ExiCarConfigDetailVo selectExiCarConfigByVehModelConfigSid(@Param("vehModelConfigSid") String vehModelConfigSid);
 
-    void updateVehicleOutLibrary(@Param("sid") String sid,@Param("vehicleState") String vehicleState,@Param("vehicleStateValue") String vehicleStateValue,@Param("salesDate") String salesDate,@Param("salePrice") String salePrice,@Param("remarks") String remarks);
+    void updateVehicleOutLibrary(@Param("sid") String sid, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salesDate") String salesDate, @Param("salePrice") String salePrice, @Param("remarks") String remarks);
 
-    void updateVehicleBuyBreak(@Param("sid") String sid,@Param("solidDate") String solidDate,@Param("settlementStatus") String settlementStatus,@Param("settlementStatusValue") String settlementStatusValue);
+    void updateVehicleBuyBreak(@Param("sid") String sid, @Param("solidDate") String solidDate, @Param("settlementStatus") String settlementStatus, @Param("settlementStatusValue") String settlementStatusValue);
 
     @Update("update base_vehicle set witPinState = #{witPinState},witPinStateValue = #{witPinStateValue} where vinNo = #{vinNo}")
-    boolean updateWitPinState(@Param("vinNo") String vinNo,@Param("witPinState") String witPinState,@Param("witPinStateValue") String witPinStateValue);
+    boolean updateWitPinState(@Param("vinNo") String vinNo, @Param("witPinState") String witPinState, @Param("witPinStateValue") String witPinStateValue);
 
     int getStockNum(@Param(Constants.WRAPPER) QueryWrapper<Object> qwq);
 
-    List<Map<String,String>> purSellVinNoAndLoc(@Param(Constants.WRAPPER) QueryWrapper<Object> qw);
+    List<Map<String, String>> purSellVinNoAndLoc(@Param(Constants.WRAPPER) QueryWrapper<Object> qw);
 
-    BaseVehicle selVehicleByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
+    BaseVehicle selVehicleByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("createOrgSid") String createOrgSid);
 
-    BaseVehicle selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("useOrgSid") String useOrgSid);
+    BaseVehicle selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
 
     @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue} where vinNo = #{vinNo} and useOrgSid = #{useOrgSid}")
-    void updateVehicleState(@Param("vehicleState") String vehicleState,@Param("vehicleStateValue") String vehicleStateValue,@Param("vinNo") String vinNo,@Param("useOrgSid") String useOrgSid);
+    void updateVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
+
+    IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
 
-    IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

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

@@ -702,6 +702,15 @@
         </foreach>
     </update>
 
+    <update id="updateMainDepositByVinNo">
+        update base_vehicle
+        set lockedState = #{lockedState},lockedStateValue = #{lockedStateValue}
+        where vinNo in
+        <foreach item="vinNo" collection="vinNoList" open="(" separator="," close=")">
+            #{vinNo}
+        </foreach>
+    </update>
+
     <select id="selectStateByVinNo" resultType="java.lang.Boolean">
         select if(vehicleState = '0006', 'true', 'false')
         from base_vehicle where vinNo in

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

@@ -88,7 +88,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         IPage<BaseVehicleVo> page = baseVehicleService.pagerList(pagerQuery);
         List<BaseVehicleVo> records = page.getRecords();
         for (BaseVehicleVo record : records) {
-            if (record.getPriceDate() != null){
+            if (record.getPriceDate() != null) {
                 Date priceDate = record.getPriceDate();
                 String today = DateUtil.today();
                 DateTime currentDate = DateUtil.parse(today);
@@ -160,11 +160,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         }
 
         for (BaseVehicleDto baseVehicleDto : dto) {
-            BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseVehicleDto.getVinNo(),baseVehicleDto.getUseOrgSid());
+            BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseVehicleDto.getVinNo(), baseVehicleDto.getUseOrgSid());
             if (null == baseVehicle)
                 baseVehicle = new BaseVehicle();
 
-            baseVehicleService.copyToBean(baseVehicleDto,baseVehicle);
+            baseVehicleService.copyToBean(baseVehicleDto, baseVehicle);
             //BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true));
             //更新车辆台账数据
             if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
@@ -441,6 +441,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.updateByVinNo(baseVehicleUpdateQuery);
     }
 
+    @Override
+    public ResultBean updateMainDepositByVinNo(BusMainDepositUpdateQuery busMainDepositUpdateQuery) {
+        return baseVehicleService.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+    }
+
     @Override
     public ResultBean<Boolean> selectStateByVinNo(List<String> vinNoList) {
         return baseVehicleService.selectStateByVinNo(vinNoList);

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

@@ -1152,6 +1152,21 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setMsg("更新成功");
     }
 
+    /**
+     * 根据车架号更新车辆的车辆锁定状态key和value
+     *
+     * @param busMainDepositUpdateQuery 参数
+     * @return
+     */
+    public ResultBean updateMainDepositByVinNo(BusMainDepositUpdateQuery busMainDepositUpdateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> stringList = busMainDepositUpdateQuery.getVinNoLis();
+        String lockedState = busMainDepositUpdateQuery.getLockedState();
+        String lockedStateValue = busMainDepositUpdateQuery.getLockedStateValue();
+        baseMapper.updateMainDepositByVinNo(stringList, lockedState, lockedStateValue);
+        return rb.success().setMsg("更新成功");
+    }
+
     /**
      * 查询该车辆数组中是否包含车辆状态为采购退库状态的车辆，若有返回true，没有则返回false
      *
@@ -1395,8 +1410,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //库存或调出或内销
             qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode()));
             //非外采或非内购
-            qw.ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.WC_ORDER.getCode());
-            qw.ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.NG_ORDER.getCode());
+            qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode());
+            qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
             //非删除
             qw.eq("bv.isDelete", 0);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -30,9 +30,11 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 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.busdeposit.AppBusDepositBusDetailsVo;
@@ -41,10 +43,7 @@ import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListD
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListDto;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehListVo;
-import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicle;
+import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
@@ -1882,6 +1881,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            List<String> list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getVin).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinNoLis(list);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             //极光推送
             busMainDeposit = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, appMap, busMainDeposit);
@@ -1919,7 +1924,14 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             }
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-            if(!"Event_end".equals(ufVo.getTaskDefKey())){
+            if (!"Event_end".equals(ufVo.getTaskDefKey())) {
+                AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(bv.getBusinessSid()).getData();
+                List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getVin).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                busMainDepositUpdateQuery.setVinNoLis(list);
+                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.LOCK.getCode());
+                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.LOCK.getRemarks());
+                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
                 //极光推送
                 busMainDeposit = fetchBySid(bv.getBusinessSid());
                 String msgSid = getMessage(ufVo, appMap, busMainDeposit);
@@ -1936,7 +1948,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      * @param dto
      * @return
      */
-    private synchronized int submitBusinessVehicleData(SubmitVirtualOrderVehicleDto dto, BusMainDeposit busMainDeposit) {
+    private synchronized int submitBusinessVehicleData(SubmitVirtualOrderVehicleDto dto, BusMainDeposit
+            busMainDeposit) {
         int r = 0;
         if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
             r = 1;
@@ -2060,6 +2073,13 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
+                //修改车辆台账锁定状态
+                AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
+                List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getVin).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                busMainDepositUpdateQuery.setVinNoLis(list);
+                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 return rb.success().setData(resultBean.getData());
             }