移位问题修改

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

@@ -10,6 +10,12 @@ public class AppScmWarehouseVinVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("买断状态")
+    private String settlementStatus;
+
+    @ApiModelProperty("买断状态value")
+    private String settlementStatusValue;
+
     @ApiModelProperty("")
     private String address;
 

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

@@ -903,7 +903,9 @@
     </select>
 
     <select id="getVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">
-        select vinNo as vin
+        select vinNo as vin,
+               settlementStatus,
+               settlementStatusValue
         from base_vehicle bv
         <where>
             ${ew.sqlSegment}

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

@@ -477,7 +477,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     private ConfigInfoSpanSize getConfigValueSpanSize(String configName, String configValue) {
         ConfigInfoSpanSize configInfoSpanSize = new ConfigInfoSpanSize();
-        configInfoSpanSize.setSpanSize(1);
+        if ("变速箱".equals(configName) || "发动机型号".equals(configName)) {
+            configInfoSpanSize.setSpanSize(2);
+        } else {
+            configInfoSpanSize.setSpanSize(1);
+        }
         configInfoSpanSize.setName(configName);
         if (StringUtils.isBlank(configValue)) {
             configInfoSpanSize.setValue("-");
@@ -564,11 +568,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
         list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank()));
         list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia()));
-        list2.add(getConfigValueSpanSize("后桥",configVo.getRearAxleValue()));
+        list2.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue()));
         configDetailVo.setConfigInfo(list2);
         //更多配置
         String otherConfig = configVo.getOtherConfig();
-        configDetailVo.setMoreConfig(otherConfig);
+        if (StringUtils.isBlank(otherConfig)) {
+            configDetailVo.setMoreConfig("-");
+        } else {
+            configDetailVo.setMoreConfig(otherConfig);
+        }
         //拼接常用配置字段
         String modelInfoName = modelInfoName(currentCarVo);
         configDetailVo.setModelInfoName(modelInfoName);
@@ -857,7 +865,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
             for (MoreConfigVo moreConfigVo : moreConfigVos) {
                 String sid = moreConfigVo.getUseOrgSid();
-                if(StringUtils.isNotBlank(sid)){
+                if (StringUtils.isNotBlank(sid)) {
                     SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
                     moreConfigVo.setCompanyName(sysOrganization.getName());
                 }
@@ -1958,7 +1966,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
 
         //调出分公司车辆台账更新库存状态
-        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(),VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getVinNo());
+        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(), VehicleState.StockEnum.DC_STOCK.getRemarks(), baseVehicle.getVinNo());
 
         //新建调入分公司车辆台账，设置调入分公司sid
         BaseVehicle new_baseVehicle = new BaseVehicle();

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

@@ -57,6 +57,8 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
     private String vehicleSid; // 车辆sid
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("车架号")
+    private List<String> vins; // 车架号
     @ApiModelProperty("申请编号")
     private String applicantNo; // 申请编号
     @ApiModelProperty("申请人")
@@ -85,6 +87,10 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
     private String InsuranceState; // 保险状态
     @ApiModelProperty("保险状态")
     private String InsuranceStateKey;
+    @ApiModelProperty("临牌状态")
+    private String proCardState;
+    @ApiModelProperty("临牌状态")
+    private String proCardStateKey;
     @ApiModelProperty("临牌")
     private String temporaryCard; // 临牌
     @ApiModelProperty("审核状态")

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

@@ -59,6 +59,8 @@ public class AppScmVehicleGressionDto implements Dto {
     private String vehicleSid;
     @ApiModelProperty("车架号")
     private String vinNo;
+    @ApiModelProperty("车架号")
+    private List<String> vins;
     @ApiModelProperty("申请编号")
     private String applicantNo;
     @ApiModelProperty("申请人")
@@ -91,6 +93,11 @@ public class AppScmVehicleGressionDto implements Dto {
     @ApiModelProperty("保险状态")
     @JsonProperty("InsuranceStateKey")
     private String InsuranceStateKey;
+    @ApiModelProperty("临牌状态")
+    @NotBlank(message = "临牌状态不能为空")
+    private String proCardState;
+    @ApiModelProperty("临牌状态")
+    private String proCardStateKey;
     @ApiModelProperty("临牌")
     private String temporaryCard;
     @ApiModelProperty("保单照片")

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

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -57,6 +58,8 @@ public class AppScmVehicleGressionInfoVo implements Vo {
     private String vehicleSid; // 车辆sid
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("车架号")
+    private List<String> vins; // 车架号
     @ApiModelProperty("申请编号")
     private String applicantNo; // 申请编号
     @ApiModelProperty("申请人")
@@ -87,6 +90,10 @@ public class AppScmVehicleGressionInfoVo implements Vo {
     @ApiModelProperty("保险状态")
     @JsonProperty("InsuranceStateKey")
     private String InsuranceStateKey;
+    @ApiModelProperty("临牌状态")
+    private String proCardState;
+    @ApiModelProperty("临牌状态")
+    private String proCardStateKey;
     @ApiModelProperty("临牌")
     private String temporaryCard; // 临牌
     @ApiModelProperty("审核状态")

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

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleGression.java <br/>
@@ -78,6 +80,10 @@ public class ScmVehicleGression extends BaseEntity {
     private String InsuranceState; // 保险状态
     @ApiModelProperty("保险状态")
     private String InsuranceStateKey; // 保险状态
+    @ApiModelProperty("临牌状态")
+    private String proCardState;
+    @ApiModelProperty("临牌状态")
+    private String proCardStateKey;
     @ApiModelProperty("临牌")
     private String temporaryCard; // 临牌
     @ApiModelProperty("申请状态（代办已办）")

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

@@ -136,6 +136,11 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-获取保险、临牌状态")
+    @GetMapping("/getErtraState/{sid}/{userSid}")
+    @ResponseBody
+    public ResultBean<AppErtraStateVo> getErtraState(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+
     /*************************************************PC移位审批流程***************************************************/
 
 

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

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

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVeh.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVeh.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVeh <br/>
+ * Description: 移位申请单车架号库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位申请单车架号库", description = "移位申请单车架号库")
+@TableName("scm_vehicle_gression_veh")
+public class ScmVehicleGressionVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("移位申请单sid")
+    private String mainSid; // 移位申请单sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vehVin; // 车架号
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("临时牌照号码")
+    private String temporaryCardNo; // 临时牌照号码
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDetailsVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehVo.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVehVo <br/>
+ * Description: 移位申请单车架号库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位申请单车架号库 视图数据详情", description = "移位申请单车架号库 视图数据详情")
+public class ScmVehicleGressionVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("移位申请单sid")
+    private String mainSid; // 移位申请单sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vehVin; // 车架号
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("临时牌照号码")
+    private String temporaryCardNo; // 临时牌照号码
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehDto.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehDto.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVehDto <br/>
+ * Description: 移位申请单车架号库 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位申请单车架号库 数据传输对象", description = "移位申请单车架号库 数据传输对象")
+public class ScmVehicleGressionVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("移位申请单sid")
+    private String mainSid; // 移位申请单sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vehVin; // 车架号
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("临时牌照号码")
+    private String temporaryCardNo; // 临时牌照号码
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehFeign.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVehFeign <br/>
+ * Description: 移位申请单车架号库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "移位申请单车架号库")
+@FeignClient(
+        contextId = "abc-ScmVehicleGressionVeh",
+        name = "abc",
+        path = "v1/scmvehiclegressionveh",
+        fallback = ScmVehicleGressionVehFeignFallback.class)
+public interface ScmVehicleGressionVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehicleGressionVehVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehicleGressionVehDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehicleGressionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehFeignFallback.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVehFeignFallback <br/>
+ * Description: 移位申请单车架号库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehicleGressionVehFeignFallback implements ScmVehicleGressionVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehicleGressionVehVo>> listPage(PagerQuery<ScmVehicleGressionVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口abc/scmvehiclegressionveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehicleGressionVehDto dto){
+		return ResultBean.fireFail().setMsg("接口abc/scmvehiclegressionveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口abc/scmvehiclegressionveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehicleGressionVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口abc/scmvehiclegressionveh/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehQuery.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehQuery.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVehQuery <br/>
+ * Description: 移位申请单车架号库 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位申请单车架号库 查询条件", description = "移位申请单车架号库 查询条件")
+public class ScmVehicleGressionVehQuery implements Query {
+
+	@ApiModelProperty("移位申请单sid")
+    private String mainSid; // 移位申请单sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vehVin; // 车架号
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("临时牌照号码")
+    private String temporaryCardNo; // 临时牌照号码
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegressionveh/ScmVehicleGressionVehVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegressionveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehVo.java <br/>
+ * Class: abc.api.scmvehiclegressionveh.ScmVehicleGressionVehVo <br/>
+ * Description: 移位申请单车架号库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位申请单车架号库 视图数据对象", description = "移位申请单车架号库 视图数据对象")
+public class ScmVehicleGressionVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("移位申请单sid")
+    private String mainSid; // 移位申请单sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vehVin; // 车架号
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("临时牌照号码")
+    private String temporaryCardNo; // 临时牌照号码
+
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -40,6 +40,8 @@ import com.yxt.anrui.base.api.basevehicle.VehicleEnterlibrary;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -103,6 +105,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     @Autowired
     BaseInternalPurchaseVehicleFeign baseInternalPurchaseVehicleFeign;
 
+    @Autowired
+    FinKingDeeFeign finKingDeeFeign;
+
     private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -337,6 +342,35 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
+                    //推送调拨单
+                    List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
+                    StkTransferDirect stkTransferDirect = new StkTransferDirect();
+                    stkTransferDirect.setFStockOutOrgId("100013"); //调出库存组织
+                    stkTransferDirect.setFTransferBizType("调车"); //调拨类型
+                    stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向
+                    stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型
+                    stkTransferDirect.setFStockOrgId("BD_OwnerOrg"); //调入库存组织
+                    stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型
+                    stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型
+                    stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
+                    StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
+                    fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态
+                    fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态
+                    fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型
+                    fBillEntry.setFKeeperOutId("101");//调出保管者
+                    fBillEntry.setFOwnerOutId("101");//调出货主
+                    fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型
+                    fBillEntry.setFOwnerId("101");//调入货主
+                    fBillEntry.setFOwnerIdHead("101");//调入货主
+                    fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型
+                    fBillEntry.setFKeeperId("101");//调入保管者
+                    fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型
+                    fBillEntry.setFDestStockId("CK003");//调入仓库
+                    fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
+                    fBillEntry.setFSrcStockId("CK001");//调出仓库
+                    FPAYBILLENTRYs.add(fBillEntry);
+                    stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
+                    finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
                 }
 
                 //外采
@@ -349,11 +383,11 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
                     String sid = businessSid;
                     BaseOutsourcingApplicationDetailsVo applicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(sid).getData();
-                    if(applicationDetailsVo != null){
-                        if(StringUtils.isNotBlank(applicationDetailsVo.getManufactorSettlementPrice())){
+                    if (applicationDetailsVo != null) {
+                        if (StringUtils.isNotBlank(applicationDetailsVo.getManufactorSettlementPrice())) {
                             baseVehicleDto.setContractPrice(Integer.valueOf(applicationDetailsVo.getManufactorSettlementPrice())); // 厂家合同价
                         }
-                        if(StringUtils.isNotBlank(applicationDetailsVo.getPurchasePrice())){
+                        if (StringUtils.isNotBlank(applicationDetailsVo.getPurchasePrice())) {
                             baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
                         }
                         baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
@@ -408,6 +442,35 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.TC_SAVEVEH.getCode());
+                    //推送调拨单
+                    List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
+                    StkTransferDirect stkTransferDirect = new StkTransferDirect();
+                    stkTransferDirect.setFStockOutOrgId("100013"); //调出库存组织
+                    stkTransferDirect.setFTransferBizType("调车"); //调拨类型
+                    stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向
+                    stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型
+                    stkTransferDirect.setFStockOrgId("BD_OwnerOrg"); //调入库存组织
+                    stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型
+                    stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型
+                    stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
+                    StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
+                    fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态
+                    fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态
+                    fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型
+                    fBillEntry.setFKeeperOutId("101");//调出保管者
+                    fBillEntry.setFOwnerOutId("101");//调出货主
+                    fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型
+                    fBillEntry.setFOwnerId("101");//调入货主
+                    fBillEntry.setFOwnerIdHead("101");//调入货主
+                    fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型
+                    fBillEntry.setFKeeperId("101");//调入保管者
+                    fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型
+                    fBillEntry.setFDestStockId("CK003");//调入仓库
+                    fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码
+                    fBillEntry.setFSrcStockId("CK001");//调出仓库
+                    FPAYBILLENTRYs.add(fBillEntry);
+                    stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
+                    finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
                 }
                 return rb.success().setMsg("操作成功！");
             } else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -559,8 +559,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         finPaymentrecordDto.setUseOrgSid(scmVehicleExamine.getUseOrgSid());
                         finPaymentrecordDto.setPayCompanySid(scmVehicleExamine.getUseOrgSid()); //付款单位sid
                         finPaymentrecordDto.setPayType(1); // 付款类别，1付款/2退款
-                        finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); // 款项类别
-                        finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别
+                        finPaymentrecordDto.setCostTypeKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode()); // 款项类别
+                        finPaymentrecordDto.setCostTypeValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());// 款项类别
                         finPaymentrecordDto.setCostTitleKey("2");// 款项名称
                         finPaymentrecordDto.setCostTitleValue("订金");//款项名称
                         finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号

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

@@ -201,8 +201,8 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     }
 
     @Override
-    public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid,String userSid) {
-        return scmVehicleGressionService.temporaryExitPermitInfo(sid,userSid);
+    public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid, String userSid) {
+        return scmVehicleGressionService.temporaryExitPermitInfo(sid, userSid);
     }
 
     @Override
@@ -210,6 +210,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
         return scmVehicleGressionService.getToDoNum(userSid);
     }
 
+    @Override
+    public ResultBean<AppErtraStateVo> getErtraState(String sid, String userSid) {
+        return scmVehicleGressionService.getErtraState(sid,userSid);
+    }
+
     @Override
     public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
         return scmVehicleGressionService.submitCarTransfer(dto);

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

@@ -30,10 +30,7 @@ import cn.hutool.core.date.DateUtil;
 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.BaseVehicleSelectVo;
-import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
-import com.yxt.anrui.base.api.basevehicle.VehicleGression;
+import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
@@ -64,8 +61,10 @@ import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto;
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh;
 import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -74,6 +73,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.*;
+import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -134,6 +134,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     private SysProUrlFeign sysProUrlFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private ScmVehicleGressionVehService scmVehicleGressionVehService;
 
     private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -260,6 +262,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
         List<AppScmVehicleGressionPageVo> records = iPage.getRecords();
         for (AppScmVehicleGressionPageVo record : records) {
+
+            List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(record.getSid());
+            String vin = StringUtils.join(vins, ",");
+            record.setVin(vin);
+
             if ("已办结".equals(record.getState())) {
                 record.setShowDownloadBtn(true);
                 //查询出门证
@@ -308,7 +315,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getVinNo())) {
+        if (dto.getVins() == null) {
             return rb.setMsg("请选择车架号！");
         }
         if (dto.getLocationSid().equals(dto.getTargetLocationSid())) {
@@ -325,14 +332,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String userSid = dto.getUserSid();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
-//        String vehicleSid = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData().getSid();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ScmVehicleGression scmVehicleGression = null;
         if (StringUtils.isBlank(dto.getSid())) {
             scmVehicleGression = new ScmVehicleGression();
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
             scmVehicleGression.setHandleState("1");
-            scmVehicleGression.setVehicleSid(dto.getVehicleSid());
             scmVehicleGression.setApplicantName(data.getStaffName());
             scmVehicleGression.setApplicantDate(simpleDateFormat.format(new Date()));
             scmVehicleGression.setOrgSid(data.getOrgSid());
@@ -343,27 +348,47 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
 //            Map<String, String> stringStringMap = generateBillNo(userSid);
             String billNo = getApplyCode(dto);
             scmVehicleGression.setApplicantNo(billNo);
-            if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
-                List<String> factoryImage = dto.getPolicyImage();
-                if (factoryImage.size() <= 0) {
-                    return rb.setMsg("保单照片不能为空");
-                }
-                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
-                for (String s : factoryImage) {
-                    if (s.contains(fileUploadComponent.getUrlPrefix())) {
-                        s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
-                    }
-                    ScmFile scmFile = new ScmFile();
-                    scmFile.setAttachType(type);
-                    scmFile.setFileName("保单照片");
-                    scmFile.setFilePath(s1);
-                    scmFile.setLinkSid(scmVehicleGression.getSid());
-                    scmFileService.save(scmFile);
+//            if ("1".equals(dto.getProCardStateKey())) {
+//                scmVehicleGression.setTemporaryCard(dto.getTemporaryCard());
+//            } else if ("0".equals(dto.getProCardStateKey())) {
+//                scmVehicleGression.setTemporaryCard("");
+//            }
+//            if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
+//                List<String> factoryImage = dto.getPolicyImage();
+//                if (factoryImage.size() <= 0) {
+//                    return rb.setMsg("保单照片不能为空");
+//                }
+//                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
+//                for (String s : factoryImage) {
+//                    if (s.contains(fileUploadComponent.getUrlPrefix())) {
+//                        s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+//                    }
+//                    ScmFile scmFile = new ScmFile();
+//                    scmFile.setAttachType(type);
+//                    scmFile.setFileName("保单照片");
+//                    scmFile.setFilePath(s1);
+//                    scmFile.setLinkSid(scmVehicleGression.getSid());
+//                    scmFileService.save(scmFile);
+//                }
+//            } else if ("0".equals(dto.getInsuranceStateKey())) {
+//                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
+//            }
+            save(scmVehicleGression);
+            //存放车架号
+            List<String> vins = dto.getVins();
+            if (vins != null) {
+                for (String vin : vins) {
+                    ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh();
+                    scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid());
+                    scmVehicleGressionVeh.setVehVin(vin);
+                    BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData();
+                    scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid());
+                    scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus());
+                    scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue());
+                    scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard());
+                    scmVehicleGressionVehService.save(scmVehicleGressionVeh);
                 }
-            } else if ("0".equals(dto.getInsuranceStateKey())) {
-                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
             }
-            save(scmVehicleGression);
         } else {
             scmVehicleGression = fetchBySid(dto.getSid());
             if (scmVehicleGression == null) {
@@ -411,6 +436,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
         SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
         AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid, useOrgSid);
+        List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
+        vo.setVins(vins);
         vo.setApplicantName(data1.getName());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String format = simpleDateFormat.format(new Date());
@@ -441,6 +468,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<String> policyImage = new ArrayList<>();
         List<String> image = new ArrayList<>();
         AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid);
+        List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
+        String vin = StringUtils.join(vins, StringUtils.LF);
+        vo.setVinNo(vin);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
         if (scmFiles1.size() > 0) {
             for (ScmFile scmFile : scmFiles1) {
@@ -1052,7 +1082,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     public ResultBean<String> getToDoNum(String userSid) {
         ResultBean rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid,userSid);
+        int count = baseMapper.getToDoNum(useOrgSid, userSid);
         return rb.success().setData(String.valueOf(count));
     }
 
@@ -1107,4 +1137,21 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return msgSid;
 
     }
+
+    public ResultBean<AppErtraStateVo> getErtraState(String sid, String userSid) {
+        ResultBean<AppErtraStateVo> rb = ResultBean.fireFail();
+        AppErtraStateVo vo = new AppErtraStateVo();
+        ScmVehicleGression scmVehicleGression = fetchBySid(sid);
+        if ("1".equals(scmVehicleGression.getProCardStateKey())) {
+            vo.setPolicyShow(true);
+        } else if ("0".equals(scmVehicleGression.getProCardStateKey())) {
+            vo.setPolicyShow(false);
+        }
+        if ("1".equals(scmVehicleGression.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
+            vo.setProCardShow(true);
+        } else if ("0".equals(scmVehicleGression.getInsuranceStateKey())) {
+            vo.setProCardShow(false);
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehiclegressionveh;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh;
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDetailsVo;
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+
+import java.util.List;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehMapper.java <br/>
+ * Class: abc.biz.scmvehiclegressionveh.ScmVehicleGressionVehMapper <br/>
+ * Description: 移位申请单车架号库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmVehicleGressionVehMapper extends BaseMapper<ScmVehicleGressionVeh> {
+
+    //@Update("update scm_vehicle_gression_veh set name=#{msg} where id=#{id}")
+    //IPage<ScmVehicleGressionVehVo> voPage(IPage<ScmVehicleGressionVeh> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleGressionVeh> qw);
+
+    IPage<ScmVehicleGressionVehVo> selectPageVo(IPage<ScmVehicleGressionVeh> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleGressionVeh> qw);
+
+    List<ScmVehicleGressionVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleGressionVeh> qw);
+
+    @Select("select * from scm_vehicle_gression_veh")
+    List<ScmVehicleGressionVehVo> selectListVo();
+
+    @Select("select * from scm_vehicle_gression_veh where mainSid =#{mainSid} ")
+    List<ScmVehicleGressionVehDetailsVo> fetchVoByMainSid(@Param("mainSid") String mainSid);
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo">
+        SELECT * FROM scm_vehicle_gression_veh
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo">
+        SELECT * FROM scm_vehicle_gression_veh
+        <where>${ew.sqlSegment}</where>
+    </select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehRest.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehiclegressionveh;
+
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehFeignFallback.java <br/>
+ * Class: abc.biz.scmvehiclegressionveh.ScmVehicleGressionVehRest <br/>
+ * Description: 移位申请单车架号库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "移位申请单车架号库")
+@RestController("abc.biz.scmvehiclegressionveh.ScmVehicleGressionVehRest")
+@RequestMapping("v1/scmvehiclegressionveh")
+public class ScmVehicleGressionVehRest implements ScmVehicleGressionVehFeign {
+
+	@Autowired
+	private ScmVehicleGressionVehService scmVehicleGressionVehService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmVehicleGressionVehVo>> listPage(@RequestBody PagerQuery<ScmVehicleGressionVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehicleGressionVehVo> pv = scmVehicleGressionVehService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmVehicleGressionVehDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleGressionVehService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleGressionVehService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehicleGressionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmVehicleGressionVehDetailsVo vo = scmVehicleGressionVehService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java

@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehiclegressionveh;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.SharedString;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: abc(abc) <br/>
+ * File: ScmVehicleGressionVehService.java <br/>
+ * Class: abc.biz.scmvehiclegressionveh.ScmVehicleGressionVehService <br/>
+ * Description: 移位申请单车架号库 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-02 16:48:12 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleGressionVehMapper, ScmVehicleGressionVeh> {
+    private QueryWrapper<ScmVehicleGressionVeh> createQueryWrapper(ScmVehicleGressionVehQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmVehicleGressionVeh> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmVehicleGressionVehVo> listPageVo(PagerQuery<ScmVehicleGressionVehQuery> pq) {
+        ScmVehicleGressionVehQuery query = pq.getParams();
+        QueryWrapper<ScmVehicleGressionVeh> qw = createQueryWrapper(query);
+        IPage<ScmVehicleGressionVeh> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehicleGressionVehVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehicleGressionVehVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmVehicleGressionVehDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmVehicleGressionVehDto dto) {
+        ScmVehicleGressionVeh entity = new ScmVehicleGressionVeh();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmVehicleGressionVehDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmVehicleGressionVeh entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmVehicleGressionVehDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmVehicleGressionVeh entity = fetchBySid(sid);
+        ScmVehicleGressionVehDetailsVo vo = new ScmVehicleGressionVehDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public List<String> fetchVoByMainSid(String mainSid) {
+        List<String> list = new ArrayList<>();
+        List<ScmVehicleGressionVehDetailsVo> vos = baseMapper.fetchVoByMainSid(mainSid);
+        for (ScmVehicleGressionVehDetailsVo vo : vos) {
+            list.add(vo.getVehVin());
+        }
+        return list;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/AppWarehouseVinVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +13,13 @@ public class AppWarehouseVinVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("买断状态")
+    private String settlementStatus;
+
+    @ApiModelProperty("买断状态value")
+    @JsonProperty("buyoutState")
+    private String settlementStatusValue;
+
     @ApiModelProperty("")
     private String address;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java

@@ -51,6 +51,9 @@ public class AppGressionDetailsVo implements Vo {
     @JsonProperty("vin")
     private String vinNo;
 
+    @ApiModelProperty("车架号")
+    private List<String> vins; // 车架号
+
     @ApiModelProperty("目标库")
     @JsonProperty("targetAddress")
     private String targetLocation;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java

@@ -52,6 +52,9 @@ public class AppGressionDto implements Dto {
     @JsonProperty("vin")
     private String vinNo;
 
+    @ApiModelProperty("车架号")
+    private List<String> vins;
+
     @ApiModelProperty("目标库")
     @JsonProperty("targetAddress")
     private String targetLocation;
@@ -88,6 +91,12 @@ public class AppGressionDto implements Dto {
     @JsonProperty("policyImage")
     private List<String> policyImage;
 
+    @ApiModelProperty("临牌状态")
+    private String proCardState;
+
+    @ApiModelProperty("临牌状态")
+    private String proCardStateKey;
+
     @ApiModelProperty("临牌")
     @JsonProperty("proCard")
     private String temporaryCard;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java

@@ -50,6 +50,9 @@ public class AppGressionInfoVo implements Vo {
     @JsonProperty("vin")
     private String vinNo;
 
+    @ApiModelProperty("车架号")
+    private List<String> vins; // 车架号
+
     @ApiModelProperty("目标库")
     @JsonProperty("targetAddress")
     private String targetLocation;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java

@@ -89,6 +89,12 @@ public interface AppScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean saveCarTransferSiteImage(@RequestBody AppCarTransferSiteImageDto dto);
 
+    @ApiOperation("手机端-获取保险、临牌状态")
+    @GetMapping("/getErtraState/{sid}/{userSid}")
+    @ResponseBody
+    public ResultBean<ErtraStateVo> getErtraState(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+
+
     @ApiOperation("提交流程")
     @PostMapping("/submitCarTransferInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java

@@ -81,6 +81,11 @@ public class AppScmVehicleGressionFeignFallback implements AppScmVehicleGression
         return null;
     }
 
+    @Override
+    public ResultBean<ErtraStateVo> getErtraState(String sid, String userSid) {
+        return null;
+    }
+
     @Override
     public ResultBean submitCarTransferInfo(SubmitGressionDto dto) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/ErtraStateVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ErtraStateVo implements Vo {
+    private static final long serialVersionUID = 8046396307238622019L;
+
+    @ApiModelProperty("保险状态")
+    private boolean policyShow;
+
+    @ApiModelProperty("临牌状态")
+    private boolean proCardShow;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java

@@ -95,6 +95,11 @@ public class AppScmVehicleGressionRest implements AppScmVehicleGressionFeign {
         return appScmVehicleGressionService.saveCarTransferSiteImage(dto);
     }
 
+    @Override
+    public ResultBean<ErtraStateVo> getErtraState(String sid, String userSid) {
+        return appScmVehicleGressionService.getErtraState(sid, userSid);
+    }
+
     @Override
     public ResultBean submitCarTransferInfo(SubmitGressionDto dto) {
         return appScmVehicleGressionService.submitCarTransferInfo(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@@ -87,11 +87,11 @@ public class AppScmVehicleGressionService {
     public ResultBean saveCarTransferInfo(AppGressionDto dto) {
         AppScmVehicleGressionDto appScmVehicleGressionDto = new AppScmVehicleGressionDto();
         BeanUtil.copyProperties(dto, appScmVehicleGressionDto);
-        //根据车架号查询车辆sid
-        ResultBean<BaseVehicleVo> stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
-        if(stringResultBean.getSuccess()){
-            appScmVehicleGressionDto.setVehicleSid(stringResultBean.getData().getSid());
-        }
+//        //根据车架号查询车辆sid
+//        ResultBean<BaseVehicleVo> stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
+//        if (stringResultBean.getSuccess()) {
+//            appScmVehicleGressionDto.setVehicleSid(stringResultBean.getData().getSid());
+//        }
         ResultBean resultBean = scmVehicleGressionFeign.saveCarTransferInfo(appScmVehicleGressionDto);
         return resultBean;
     }
@@ -142,7 +142,7 @@ public class AppScmVehicleGressionService {
         BeanUtil.copyProperties(dto, submitCarTransferDto);
         //根据车架号查询车辆sid
         ResultBean<BaseVehicleVo> stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
-        if(stringResultBean.getSuccess()){
+        if (stringResultBean.getSuccess()) {
             submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid());
         }
         ResultBean resultBean = scmVehicleGressionFeign.submitCarTransfer(submitCarTransferDto);
@@ -237,4 +237,16 @@ public class AppScmVehicleGressionService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean<ErtraStateVo> getErtraState(String sid, String userSid) {
+        ResultBean<ErtraStateVo> rb = ResultBean.fireFail();
+        ErtraStateVo vo = new ErtraStateVo();
+        ResultBean<AppErtraStateVo> resultBean = scmVehicleGressionFeign.getErtraState(sid, userSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppErtraStateVo appErtraStateVo = resultBean.getData();
+        BeanUtil.copyProperties(appErtraStateVo, vo);
+        return rb.success().setData(vo);
+    }
 }

doc/databases/scm_tables.sql

@@ -2,14 +2,14 @@
 DROP TABLE IF EXISTS `scm_material`;
 CREATE TABLE `scm_material`
 (
-    `id`              int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`              int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`             varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`     int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`     int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`        int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`           int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`        int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`        int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`           int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`        int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -27,7 +27,7 @@ CREATE TABLE `scm_material`
     `manufacturer`    varchar(64)          DEFAULT NULL COMMENT '生产厂家',
     `manufacturerSid` varchar(64)          DEFAULT NULL COMMENT '生产厂家sid',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY               `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='物料信息';
 
@@ -35,14 +35,14 @@ CREATE TABLE `scm_material`
 DROP TABLE IF EXISTS `scm_inbound`;
 CREATE TABLE `scm_inbound`
 (
-    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                  int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                 varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`         int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`               int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`            int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -75,7 +75,7 @@ CREATE TABLE `scm_inbound`
     `purKeeperName`       varchar(64)          DEFAULT NULL COMMENT '采购员',
     `printCount`          varchar(64)          DEFAULT NULL COMMENT '打印次数',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                   `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售入库单';
 
@@ -83,14 +83,14 @@ CREATE TABLE `scm_inbound`
 DROP TABLE IF EXISTS `scm_inbound_detail`;
 CREATE TABLE `scm_inbound_detail`
 (
-    `id`               int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`               int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`              varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`      int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`      int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`       timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`       timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`         int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`            int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`         int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`         int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`            int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`         int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`          varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`      varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`      varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -126,7 +126,7 @@ CREATE TABLE `scm_inbound_detail`
     `powerValue`       varchar(64)          DEFAULT NULL COMMENT '车辆马力value',
     `carColor`         varchar(64)          DEFAULT NULL COMMENT '车辆颜色',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售入库单_明细';
 
@@ -134,14 +134,14 @@ CREATE TABLE `scm_inbound_detail`
 DROP TABLE IF EXISTS `scm_rejected`;
 CREATE TABLE `scm_rejected`
 (
-    `id`                    int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                    int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                   varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`           int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`           int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`              int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                 int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`              int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`              int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                 int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`              int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`               varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`           varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`           varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -175,7 +175,7 @@ CREATE TABLE `scm_rejected`
     `manufacturerSid`       varchar(64)          DEFAULT NULL COMMENT '厂商sid',
     `manufacturerName`      varchar(64)          DEFAULT NULL COMMENT '供应商名称',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                     `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='采购退料单';
 
@@ -183,14 +183,14 @@ CREATE TABLE `scm_rejected`
 DROP TABLE IF EXISTS `scm_rejected_detail`;
 CREATE TABLE `scm_rejected_detail`
 (
-    `id`                int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`               varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`       int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`       int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`        timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`        timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`          int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`             int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`          int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`          int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`             int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`          int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`           varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`       varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`       varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -221,7 +221,7 @@ CREATE TABLE `scm_rejected_detail`
     `taxAmount`         varchar(64)          DEFAULT NULL COMMENT '税额',
     `leviedSubtotal`    varchar(64)          DEFAULT NULL COMMENT '价税合计',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                 `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='采购退料单_明细';
 
@@ -229,14 +229,14 @@ CREATE TABLE `scm_rejected_detail`
 DROP TABLE IF EXISTS `scm_outbound`;
 CREATE TABLE `scm_outbound`
 (
-    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                  int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                 varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`         int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`               int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`            int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -276,7 +276,7 @@ CREATE TABLE `scm_outbound`
     `InvoicingMoeny`      varchar(64)          DEFAULT NULL COMMENT '开票金额',
     `manHourIncome`       varchar(64)          DEFAULT NULL COMMENT '工时收入',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                   `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售出库单';
 
@@ -284,14 +284,14 @@ CREATE TABLE `scm_outbound`
 DROP TABLE IF EXISTS `scm_outbound_detail`;
 CREATE TABLE `scm_outbound_detail`
 (
-    `id`                    int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                    int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                   varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`           int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`           int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`              int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                 int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`              int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`              int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                 int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`              int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`               varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`           varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`           varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -323,7 +323,7 @@ CREATE TABLE `scm_outbound_detail`
     `vehicleTypeValue`      varchar(64)          DEFAULT NULL COMMENT '车辆类型value',
     `mGroup`                varchar(64)          DEFAULT NULL COMMENT '物料分组',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                     `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售出库单_明细';
 
@@ -331,14 +331,14 @@ CREATE TABLE `scm_outbound_detail`
 DROP TABLE IF EXISTS `scm_return`;
 CREATE TABLE `scm_return`
 (
-    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                  int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                 varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`         int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`               int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`            int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -360,7 +360,7 @@ CREATE TABLE `scm_return`
     `salesOrgName`        varchar(64)          DEFAULT NULL COMMENT '销售组织',
     `projectCategory`     varchar(64)          DEFAULT NULL COMMENT '项目类别',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                   `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售退货单';
 
@@ -368,14 +368,14 @@ CREATE TABLE `scm_return`
 DROP TABLE IF EXISTS `scm_return_detail`;
 CREATE TABLE `scm_return_detail`
 (
-    `id`                 int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                 int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`        int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`        int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`           int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`              int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`           int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`           int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`              int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`           int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -398,7 +398,7 @@ CREATE TABLE `scm_return_detail`
     `vehicleType`        varchar(64)          DEFAULT NULL COMMENT '车辆类型key',
     `vehicleTypeValue`   varchar(64)          DEFAULT NULL COMMENT '车辆类型value',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                  `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售退货单_明细';
 
@@ -406,14 +406,14 @@ CREATE TABLE `scm_return_detail`
 DROP TABLE IF EXISTS `scm_other_inbound`;
 CREATE TABLE `scm_other_inbound`
 (
-    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                  int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                 varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`         int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`               int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`            int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -439,7 +439,7 @@ CREATE TABLE `scm_other_inbound`
     `customerSid`         varchar(64)          DEFAULT NULL COMMENT '客户sid',
     `customer`            varchar(64)          DEFAULT NULL COMMENT '客户',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                   `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='其他入库单';
 
@@ -447,14 +447,14 @@ CREATE TABLE `scm_other_inbound`
 DROP TABLE IF EXISTS `scm_other_inbound_detail`;
 CREATE TABLE `scm_other_inbound_detail`
 (
-    `id`                 int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                 int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`        int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`        int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`           int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`              int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`           int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`           int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`              int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`           int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -471,7 +471,7 @@ CREATE TABLE `scm_other_inbound_detail`
     `batchNum`           varchar(64)          DEFAULT NULL COMMENT '批号',
     `cargoOwner`         varchar(64)          DEFAULT NULL COMMENT '货主',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                  `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='其他入库单_明细';
 
@@ -479,14 +479,14 @@ CREATE TABLE `scm_other_inbound_detail`
 DROP TABLE IF EXISTS `scm_other_outbound`;
 CREATE TABLE `scm_other_outbound`
 (
-    `id`                   int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                   int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                  varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`          int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`          int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`           timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`           timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`             int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`             int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`             int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`             int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`              varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`          varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`          varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -515,7 +515,7 @@ CREATE TABLE `scm_other_outbound`
     `date`                 DATE                 DEFAULT NULL COMMENT '日期',
     `transferInDepartment` varchar(64)          DEFAULT NULL COMMENT '调入部门',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                    `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='其他出库单';
 
@@ -523,14 +523,14 @@ CREATE TABLE `scm_other_outbound`
 DROP TABLE IF EXISTS `scm_other_outbound_detail`;
 CREATE TABLE `scm_other_outbound_detail`
 (
-    `id`                int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`               varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`       int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`       int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`        timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`        timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`          int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`             int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`          int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`          int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`             int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`          int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`           varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`       varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`       varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -550,7 +550,7 @@ CREATE TABLE `scm_other_outbound_detail`
     `ShippingUnit`      varchar(64)          DEFAULT NULL COMMENT '出货单价',
     `deliveryAmount`    varchar(64)          DEFAULT NULL COMMENT '出库金额',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                 `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='其他出库单_明细';
 
@@ -558,14 +558,14 @@ CREATE TABLE `scm_other_outbound_detail`
 DROP TABLE IF EXISTS `scm_real_time_inventory`;
 CREATE TABLE `scm_real_time_inventory`
 (
-    `id`                   int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                   int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                  varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`          int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`          int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`           timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`           timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`             int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`             int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`             int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`             int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`              varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`          varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`          varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -585,7 +585,7 @@ CREATE TABLE `scm_real_time_inventory`
     `custodianNo`          varchar(64)          DEFAULT NULL COMMENT '保管者编码',
     `custodian`            varchar(64)          DEFAULT NULL COMMENT '保管者名称',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                    `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='即时库存表';
 
@@ -593,14 +593,14 @@ CREATE TABLE `scm_real_time_inventory`
 DROP TABLE IF EXISTS `scm_order`;
 CREATE TABLE `scm_order`
 (
-    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`                  int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`                 varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`         int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`               int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`            int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -613,7 +613,7 @@ CREATE TABLE `scm_order`
     `receivedInvoiceDate` varchar(64)          DEFAULT NULL COMMENT '收到发票日期',
     `invoiceAmount`       varchar(64)          DEFAULT NULL COMMENT '发票金额',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                   `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆采购订单';
 
@@ -622,27 +622,27 @@ CREATE TABLE `scm_order`
 DROP TABLE IF EXISTS `scm_vehicle_inbound`;
 CREATE TABLE `scm_vehicle_inbound`
 (
-    `id`             int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`             int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`            varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`    int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`    int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`       int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`          int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`       int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`       int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`          int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`       int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`        varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`    varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`    varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `vinNo`          varchar(64)          DEFAULT NULL COMMENT '车架号',
     `modelName`      varchar(64)          DEFAULT NULL COMMENT '车型',
     `orderType`      varchar(64)          DEFAULT NULL COMMENT '采购订单类型',
-    `departureDate`  timestamp   null     DEFAULT NULL COMMENT '发车日期',
-    `inspectionDate` timestamp   null     DEFAULT NULL COMMENT '验车日期',
+    `departureDate`  timestamp null DEFAULT NULL COMMENT '发车日期',
+    `inspectionDate` timestamp null DEFAULT NULL COMMENT '验车日期',
     `inspection`     varchar(64)          DEFAULT NULL COMMENT '验车人',
     `warehouseCode`  varchar(64)          DEFAULT NULL COMMENT '库位即仓库',
-    `inboundDate`    timestamp   null     DEFAULT NULL COMMENT '实际入库日期',
+    `inboundDate`    timestamp null DEFAULT NULL COMMENT '实际入库日期',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY              `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆入库管理表';
 
@@ -650,14 +650,14 @@ CREATE TABLE `scm_vehicle_inbound`
 DROP TABLE IF EXISTS `scm_vehicle_return`;
 CREATE TABLE `scm_vehicle_return`
 (
-    `id`              int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`              int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`             varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`     int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`     int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(申请日期)',
     `modifyTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`        int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`           int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`        int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`        int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`           int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`        int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid(申请人sid)',
     `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -665,7 +665,7 @@ CREATE TABLE `scm_vehicle_return`
     `applicationName` varchar(64)          DEFAULT NULL COMMENT '申请人',
     `reason`          varchar(500)         DEFAULT NULL COMMENT '退库原因',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY               `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆采购退库';
 
@@ -674,14 +674,14 @@ CREATE TABLE `scm_vehicle_return`
 DROP TABLE IF EXISTS `scm_vehicle_return_details`;
 CREATE TABLE `scm_vehicle_return_details`
 (
-    `id`            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`            int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`           varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`   int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`   int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`         int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`      int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -689,9 +689,9 @@ CREATE TABLE `scm_vehicle_return_details`
     `vinNo`         varchar(64)          DEFAULT NULL COMMENT '车架号',
     `modelName`     varchar(500)         DEFAULT NULL COMMENT '车型名称',
     `configName`    varchar(500)         DEFAULT NULL COMMENT '常用配置',
-    `inboundDate`   timestamp   null     DEFAULT NULL COMMENT '入库日期',
+    `inboundDate`   timestamp null DEFAULT NULL COMMENT '入库日期',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY             `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆采购退库详细';
 
@@ -700,14 +700,14 @@ CREATE TABLE `scm_vehicle_return_details`
 DROP TABLE IF EXISTS `scm_vehicle_actual_sales`;
 CREATE TABLE `scm_vehicle_actual_sales`
 (
-    `id`              int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`              int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`             varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`     int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`     int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(申请日期)',
     `modifyTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`        int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`           int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`        int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`        int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`           int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`        int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid(申请人sid)',
     `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -718,7 +718,7 @@ CREATE TABLE `scm_vehicle_actual_sales`
     `nodeSid`         varchar(500)         DEFAULT NULL COMMENT '环节定义的sid',
     `procInstSid`     varchar(500)         DEFAULT NULL COMMENT '流程实例的sid',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY               `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆实销';
 
@@ -727,24 +727,24 @@ CREATE TABLE `scm_vehicle_actual_sales`
 DROP TABLE IF EXISTS `scm_vehicle_actual_details`;
 CREATE TABLE `scm_vehicle_actual_details`
 (
-    `id`               int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`               int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`              varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`      int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`      int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`       timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`       timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`         int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`            int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`         int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`         int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`            int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`         int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`          varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`      varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`      varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `vehicleActualSid` varchar(64)          DEFAULT NULL COMMENT '车辆未售买断申请sid',
     `vinNo`            varchar(64)          DEFAULT NULL COMMENT '车架号',
     `modelName`        varchar(500)         DEFAULT NULL COMMENT '车型名称',
-    `inboundDate`      timestamp   null     DEFAULT NULL COMMENT '入库日期',
+    `inboundDate`      timestamp null DEFAULT NULL COMMENT '入库日期',
     `inboundPrice`     varchar(200)         DEFAULT NULL COMMENT '入库价',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY                `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆未售买断详细';
 
@@ -752,23 +752,23 @@ CREATE TABLE `scm_vehicle_actual_details`
 DROP TABLE IF EXISTS `scm_vehicle_inspectItem`;
 CREATE TABLE `scm_vehicle_inspectItem`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`          int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`    int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `sortNo`      int(32)              DEFAULT NULL COMMENT '序号',
+    `sortNo`      int(32) DEFAULT NULL COMMENT '序号',
     `item`        varchar(64)          DEFAULT NULL COMMENT '项目名称',
-    `isImg`       int(32)              DEFAULT NULL COMMENT '是否上传照片：是1，否0',
+    `isImg`       int(32) DEFAULT NULL COMMENT '是否上传照片：是1，否0',
     `result`      varchar(64)          DEFAULT NULL COMMENT '检查结果：是/否',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY           `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='验车检查项目';
 
@@ -776,14 +776,14 @@ CREATE TABLE `scm_vehicle_inspectItem`
 DROP TABLE IF EXISTS `scm_vehicle_inspectImgTemp`;
 CREATE TABLE `scm_vehicle_inspectImgTemp`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`          int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`    int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -791,7 +791,7 @@ CREATE TABLE `scm_vehicle_inspectImgTemp`
     `imgTitle`    varchar(64)          DEFAULT NULL COMMENT '照片名称',
     `imgTempUrl`  varchar(64)          DEFAULT NULL COMMENT '照片示例',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY           `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='验车检查项目照片示例';
 
@@ -799,22 +799,22 @@ CREATE TABLE `scm_vehicle_inspectImgTemp`
 DROP TABLE IF EXISTS `scm_vehicle_inspectDetail`;
 CREATE TABLE `scm_vehicle_inspectDetail`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`          int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`    int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `itemSid`     varchar(64)          DEFAULT NULL COMMENT '检查项目sid',
     `itemContent` varchar(500)         DEFAULT NULL COMMENT '内容',
-    `sortNo`      int(32)              DEFAULT NULL COMMENT '序号',
+    `sortNo`      int(32) DEFAULT NULL COMMENT '序号',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY           `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='验车检查项目内容';
 
@@ -822,23 +822,23 @@ CREATE TABLE `scm_vehicle_inspectDetail`
 DROP TABLE IF EXISTS `scm_vehinspect_item`;
 CREATE TABLE `scm_vehinspect_item`
 (
-    `id`            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`            int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`           varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`   int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion`   int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`         int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`      int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `vehInspectSid` varchar(64)          DEFAULT NULL COMMENT '验车单sid',
     `item`          varchar(64)          DEFAULT NULL COMMENT '项目名称',
-    `sortNo`        int(32)              DEFAULT NULL COMMENT '序号',
-    `result`        int(32)              DEFAULT NULL COMMENT '检查结果：1是，0否，2无结果，默认2',
+    `sortNo`        int(32) DEFAULT NULL COMMENT '序号',
+    `result`        int(32) DEFAULT NULL COMMENT '检查结果：1是，0否，2无结果，默认2',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY             `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='验车单中的检查表项目';
 
@@ -846,14 +846,14 @@ CREATE TABLE `scm_vehinspect_item`
 DROP TABLE IF EXISTS `scm_vehinspect_itemImg`;
 CREATE TABLE `scm_vehinspect_itemImg`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`          int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`    int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
@@ -861,7 +861,7 @@ CREATE TABLE `scm_vehinspect_itemImg`
     `imgTitle`    varchar(64)          DEFAULT NULL COMMENT '照片名称',
     `imgUrl`      varchar(500)         DEFAULT NULL COMMENT '照片路径',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY           `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='验车检查表项目照片';
 
@@ -870,42 +870,67 @@ CREATE TABLE `scm_vehinspect_itemImg`
 DROP TABLE IF EXISTS `scm_vehinspect_itemDetail`;
 CREATE TABLE `scm_vehinspect_itemDetail`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`          int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`    int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `mainSid`     varchar(64)          DEFAULT NULL COMMENT '检查表sid',
     `itemContent` varchar(500)         DEFAULT NULL COMMENT '内容',
-    `sortNo`      int(32)              DEFAULT NULL COMMENT '序号',
+    `sortNo`      int(32) DEFAULT NULL COMMENT '序号',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY           `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='验车检查项目内容';
 
 DROP TABLE IF EXISTS `scm_exit_permit`;
 CREATE TABLE `scm_exit_permit`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `id`          int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
     `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
     `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `isEnable`    int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
     `linkSid`     varchar(64)          DEFAULT NULL COMMENT '关联sid',
     `url`         varchar(64)          DEFAULT NULL COMMENT '出门证地址',
     PRIMARY KEY (`id`),
-    KEY `id` (`id`)
+    KEY           `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='出门证';
 
+DROP TABLE IF EXISTS `scm_vehicle_gression_veh`;
+CREATE TABLE `scm_vehicle_gression_veh`
+(
+    `id`                    int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                   varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`           int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(申请日期)',
+    `modifyTime`            timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`              int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                 int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`              int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`               varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`           varchar(64)          DEFAULT NULL COMMENT '创建人sid(申请人sid)',
+    `updateBySid`           varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`               varchar(64)          DEFAULT NULL COMMENT '移位申请单sid',
+    `vehSid`                varchar(64)         DEFAULT NULL COMMENT '车辆sid',
+    `vehVin`                varchar(64)         DEFAULT NULL COMMENT '车架号',
+    `settlementStatus`      varchar(64)         DEFAULT NULL COMMENT '买断状态key',
+    `settlementStatusValue` varchar(64)         DEFAULT NULL COMMENT '买断状态value',
+    `temporaryCardNo`       varchar(64)         DEFAULT NULL COMMENT '临时牌照号码',
+    PRIMARY KEY (`id`),
+    KEY                     `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='移位申请单车架号库';
+