优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -64,6 +64,7 @@ public class BaseVehicleStateEnum {
         CKKP_PASS("3", "出库开票审核通过"),
         JC_PASS("4", "交车审核通过"),
         BUS_STOP("5", "业务终止"),
+        DDBA_SAVEVIN("6", "录入车架号"),
 
         ;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -51,6 +51,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
             } else if (BaseVehicleStateEnum.OperateTypeEnum.BUS_STOP.getTypeKey().equals(operateType)) {
                 //如果为终止或作废，则更新小状态为业务终止602
                 baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.YWJS_STATE_2.getStateKey());
+            } else if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_SAVEVIN.getTypeKey().equals(operateType)) {
+                //销售订单录入车架号
+                baseVehicleState.setVinNo(dto.getVinNo());
+                baseVehicleState.setVinSid(dto.getVinSid());
             }
 
             //认款办理确认以及结转审核通过的更新款项状态为1，否则为0

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

@@ -5585,6 +5585,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean saveSaleOrderInputVin(VinDto dto) {
         ResultBean rb = ResultBean.fireFail();
         List<VinListDto> list = dto.getVinList();
+        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
         //根据销售订单sid查询车架号
         List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleDetailsVos = busSalesOrderVehicleService.detailsList(dto.getSaleOrderSid());
         busSalesOrderVehicleDetailsVos.removeAll(Collections.singleton(null));
@@ -5603,6 +5604,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                 busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
                 busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SUBMIT.getTypeKey());
+                if (StringUtils.isNotBlank(list.get(i).getLinkSid())) {
+                    baseVehicleStateDto.setVinSid(list.get(i).getLinkSid());
+                    baseVehicleStateDto.setVinNo(list.get(i).getLinkNo());
+                }
+                baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                dtoList.add(baseVehicleStateDto);
             }
             //将选择的车辆的锁定状态修改为已锁定
             busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@@ -5611,6 +5620,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
             busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
             baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            //==============================新增车辆的持久状态组装数据
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                Future future1 = pool.submit(() -> {
+                    ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //==============================
 
         }
         return rb.success();