Merge remote-tracking branch 'origin/master'

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

@@ -62,9 +62,9 @@ public class BaseVehicleDto implements Dto {
     private String salesDate;
     @ApiModelProperty(value = "买断日期")
     private String solidDate;
-    @ApiModelProperty("结算状态key")
+    @ApiModelProperty("买断状态key")
     private String settlementStatus;
-    @ApiModelProperty("结算状态value")
+    @ApiModelProperty("买断状态value")
     private String settlementStatusValue;
     @ApiModelProperty("采购退库日期")
     private String returnDate;

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

@@ -66,9 +66,20 @@ public interface BaseVehicleFeign {
      * @param dto 数据传输对象
      * @return
      */
-    @ApiOperation("批量推送车辆台账")
-    @PostMapping("/saveAll")
-    public ResultBean saveAll(@Valid @RequestBody List<BaseVehicleDto> dto);
+    @ApiOperation("批量推送车辆台账(新增或修改)")
+    @PostMapping("/saveOrUpdate")
+    public ResultBean saveOrUpdate(@Valid @RequestBody List<BaseVehicleDto> dto, @RequestParam("eventType") String eventType);
+
+    /**
+     * 批量推送车辆台账
+     * 只是更新验车推送数据作用，验车推送需要更新的字段属性
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    @ApiOperation("验车批量推送车辆台账")
+    @PostMapping("/inspectVeh")
+    public ResultBean inspectVeh(@Valid @RequestBody List<BaseVehicleDto> dto);
 
     /**
      * 车辆台账出库
@@ -194,7 +205,7 @@ public interface BaseVehicleFeign {
      */
     @ApiOperation("车型详细配置接口（新）")
     @PostMapping("/selectExiCarConfig")
-    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid,@RequestParam("vehModelConfigSid") String vehModelConfigSid);
+    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("vehModelConfigSid") String vehModelConfigSid);
 
     /**
      * 现车分页列表（新）

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

@@ -0,0 +1,97 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author God
+ * @Date 2022/8/01 15:44
+ * @Description 设备合格证状态
+ */
+public class CertificState {
+
+    /**
+     * 合格证状态
+     */
+    @Getter
+    public static enum CertificateState {
+        /**
+         * 虚拟
+         */
+        CERSTATE_XN("001", "虚拟"),
+        /**
+         * 待转
+         */
+        CERSTATE_DZ("002", "待转"),
+        /**
+         * 申请中
+         */
+        CERSTATE_SQZ("003", "申请中"),
+        /**
+         * 正式
+         */
+        CERSTATE_ZS("004", "正式");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private CertificateState(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 移交状态
+     */
+    @Getter
+    public static enum TransferState {
+        /**
+         * 未接收
+         */
+        TRANSTATE_WJS("001", "未接收"),
+        /**
+         * 已接收
+         */
+        TRANSTATE_YJS("002", "已接收"),
+        /**
+         * 待移交
+         */
+        TRANSTATE_DYJ("003", "待移交"),
+        /**
+         * 已移交
+         */
+        TRANSTATE_YYJ("004", "已移交");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private TransferState(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author God
+ * @Date 2022/8/01 15:44
+ * @Description 厂家采购订单类型
+ */
+public class ManPurOrderType {
+
+    @Getter
+    public static enum ManOrderType {
+        /**
+         * 排产
+         */
+        PC_ORDER("001", "排产"),
+        /**
+         * 外采
+         */
+        WC_ORDER("002", "外采"),
+        /**
+         * 调车
+         */
+        TC_ORDER("003", "调车");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private ManOrderType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author God
+ * @Date 2022/8/01 15:44
+ * @Description 车辆台账操作状态
+ */
+public class OperVehicleState {
+
+    @Getter
+    public static enum EventType {
+        /**
+         * 更新车辆台账数据
+         */
+        UPDATE_VEHICLE("001", "更新车辆台账数据"),
+        /**
+         * 入账生成台账
+         */
+        RZ_SAVEVEH("002", "入账生成台账"),
+        /**
+         * 外采入库生成台账
+         */
+        WC_SAVEVEH("003", "外采入库生成台账"),
+
+        /**
+         * 调车入库生成台账
+         */
+        TC_SAVEVEH("004", "调车入库生成台账");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private EventType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
@@ -14,6 +15,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
+import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -131,7 +133,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         boolean isSave = baseVehicleService.save(baseVehicle);
         BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
-        if (StringUtils.isNotBlank(dto.getVinNo())){
+        if (StringUtils.isNotBlank(dto.getVinNo())) {
             baseVehicleCertificate.setVinNo(dto.getVinNo());
             baseVehicleCertificate.setCertificateState(dto.getCertificateState());
             baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
@@ -139,21 +141,50 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             baseVehicleCertificate.setTransferStateKey("001");
             baseVehicleCertificate.setTransferStateValue("未接收");
             baseVehicleCertificateService.save(baseVehicleCertificate);
-        }else {
+        } else {
             return rb.setMsg("车架号不能为空");
         }
         return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功");
     }
 
     @Override
-    public ResultBean saveAll(List<BaseVehicleDto> dto) {
+    public ResultBean saveOrUpdate(List<BaseVehicleDto> dto, String eventType) {
+
         ResultBean rb = ResultBean.fireFail();
+        if (null == dto || 0 < dto.size() || eventType.isEmpty()) {
+            return rb.setMsg("参数错误");
+        }
+
         for (BaseVehicleDto baseVehicleDto : dto) {
-            ResultBean resultBean = save(baseVehicleDto);
+            BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(baseVehicleDto.getVinNo());
+            if (null == baseVehicle)
+                baseVehicle = new BaseVehicle();
+
+            BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true));
+            //更新车辆台账数据
+            if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
+                baseVehicleService.updateVeh(baseVehicle);
+            //入账生成台账
+            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()))
+                baseVehicleService.saveVeh_rz(baseVehicle);
+            //外采入库生成台账
+            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode()))
+                baseVehicleService.saveVeh_wc(baseVehicle);
+            //调车入库生成台账
+            if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode()))
+                baseVehicleService.saveVeh_tc(baseVehicle);
         }
         return rb.success().setMsg("保存成功");
     }
 
+    /***
+     * 只是更新验车推送数据作用，验车推送需要更新的字段属性
+     */
+    @Override
+    public ResultBean inspectVeh(List<BaseVehicleDto> dto) {
+        return baseVehicleService.inspectVeh(dto);
+    }
+
     @Override
     public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
         return baseVehicleService.vehicleOutLibrary(baseVehicleOutLibrary);
@@ -329,7 +360,6 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
 
-
     /**
      * 车型详细配置接口
      *
@@ -340,7 +370,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     @Override
     public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(String modelSid, String configSid, String vehModelConfigSid) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(vehModelConfigSid)){
+        if (StringUtils.isBlank(vehModelConfigSid)) {
             ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfig(modelSid, configSid);
             return rb.success().setData(exiCarConfigDetailVo);
         }

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +23,8 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.base.common.enums.CertificState;
+import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
@@ -45,6 +49,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -1053,7 +1058,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
-            qw.eq("bv.isDelete",0);
+            qw.eq("bv.isDelete", 0);
             //锁定状态
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
 //            qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
@@ -1654,7 +1659,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             remarks.append(contractNo);
         }
         String salePrice = baseVehicleOutLibrary.getSalePrice();
-        baseMapper.updateVehicleOutLibrary(vehicleSid,VehicleState.StockEnum.OUT_STOCK.getCode(),VehicleState.StockEnum.OUT_STOCK.getRemarks(), DateUtil.today(),salePrice,remarks.toString());
+        baseMapper.updateVehicleOutLibrary(vehicleSid, VehicleState.StockEnum.OUT_STOCK.getCode(), VehicleState.StockEnum.OUT_STOCK.getRemarks(), DateUtil.today(), salePrice, remarks.toString());
         CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto();
         crmCustomerTempDto.setCustomerTypeKey(baseVehicleOutLibrary.getCustomerTypeKey());
         crmCustomerTempDto.setCustomerType(baseVehicleOutLibrary.getCustomerType());
@@ -1673,11 +1678,177 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String solidDate = baseVehicleBuyBlank.getSolidDate();
         CommonAppendix commonAppendix = baseVehicleBuyBlank.getCommonAppendix();
         for (String s : vehicleSid) {
-            baseMapper.updateVehicleBuyBreak(s,solidDate,VehicleState.BuyoutEnum.BUYOUT.getCode(),VehicleState.BuyoutEnum.BUYOUT.getRemarks());
+            baseMapper.updateVehicleBuyBreak(s, solidDate, VehicleState.BuyoutEnum.BUYOUT.getCode(), VehicleState.BuyoutEnum.BUYOUT.getRemarks());
             commonAppendix.setLinkSid(s);
             commonAppendix.setAttachType(CommonAttachTypeEnum.VEHBUYBLANK.getAttachType());
             commonAppendixService.save(commonAppendix);
         }
         return rb.success().setMsg("买断成功");
     }
+
+    public ResultBean inspectVeh(List<BaseVehicleDto> dto) {
+        ResultBean rb = ResultBean.fireFail();
+        for (BaseVehicleDto baseVehicleDto : dto) {
+            String vinNo = baseVehicleDto.getVinNo();
+            ResultBean<BaseVehicleVo> baseVehicleVoResultBean = selVehicleByVinNo(vinNo);
+            BaseVehicleVo data = baseVehicleVoResultBean.getData();
+            if (data != null) {
+                String sid = data.getSid();
+                BaseVehicle baseVehicle = fetchBySid(sid);
+                //保修卡号
+                String warrantyCardNo = baseVehicleDto.getWarrantyCardNo();
+                //特殊或差异说明
+                String specialInstructions = baseVehicleDto.getSpecialInstructions();
+                baseVehicle.setWarrantyCardNo(warrantyCardNo);
+                baseVehicle.setSpecialInstructions(specialInstructions);
+                boolean isTrue = updateById(baseVehicle);
+                if (!isTrue) {
+                    return rb.setMsg("更新台账验车数据失败");
+                }
+            } else {
+                return rb.success().setMsg("无需更新车辆台账");
+            }
+        }
+        return rb.success().setMsg("更新台账验车数据成功");
+    }
+
+    //验车:保修卡号、特殊情况说明
+    //排产入库:库存状态、到货日期、库存地点
+    // 退库申请 退库办理：库存状态
+    // 未售买断提交申请 未售买断审批不通过：买断状态
+    // 买断操作：买断状态、买断日期
+    // 调车提交申请 调车审核不通过：调车状态
+
+    public ResultBean updateVeh(BaseVehicle baseVehicle) {
+        ResultBean rb = ResultBean.fireFail();
+        if (null == baseVehicle)
+            return rb.success().setMsg("参数错误");
+
+        if (!updateById(baseVehicle)) {
+            return rb.setMsg("更新车辆台账据失败");
+        }
+        return rb.success().setMsg("更新车辆台账数据成功");
+    }
+
+    //入账生成台账
+    public ResultBean saveVeh_rz(BaseVehicle baseVehicle) {
+        ResultBean rb = ResultBean.fireFail();
+        if (null == baseVehicle) {
+            return rb.setMsg("参数错误");
+        }
+
+        baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
+        baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
+        baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
+        baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
+
+        baseVehicle.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
+        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
+        baseVehicle.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
+        baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
+        baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
+        baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
+        if (save(baseVehicle)) {
+            BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
+            baseVehicleCertificate.setVinNo(baseVehicle.getVinNo());
+            baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
+            baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
+            baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
+            baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
+            baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
+            baseVehicleCertificateService.save(baseVehicleCertificate);
+            return rb.success().setMsg("入账新增车辆台账数据成功");
+        }
+        return rb.setMsg("入账新增车辆台账据失败");
+
+    }
+
+    //外采生成台账
+    public ResultBean saveVeh_wc(BaseVehicle baseVehicle) {
+        ResultBean rb = ResultBean.fireFail();
+        if (null == baseVehicle) {
+            return rb.setMsg("参数错误");
+        }
+
+        baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
+        baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
+        baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
+        baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
+
+        baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+        baseVehicle.setWitPinState(VehicleState.ShuntingEnum.OUTCOLL.getCode());
+        baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.OUTCOLL.getRemarks());
+        baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode());
+        baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());
+
+        if (!save(baseVehicle)) {
+            BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
+            baseVehicleCertificate.setVinNo(baseVehicle.getVinNo());
+            baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_DZ.getCode());
+            baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_DZ.getRemarks());
+            baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
+            baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
+            baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
+            baseVehicleCertificateService.save(baseVehicleCertificate);
+            return rb.success().setMsg("外采入库新增车辆台账据成功");
+        }
+        return rb.setMsg("外采新增车辆台账数据失败");
+
+    }
+
+    //调车入库生成台账
+    public ResultBean saveVeh_tc(BaseVehicle baseVehicle) {
+        ResultBean rb = ResultBean.fireFail();
+        if (null == baseVehicle) {
+            return rb.setMsg("参数错误");
+        }
+
+        //调出分公司车辆台账更新调出状态
+        baseVehicle.setWitPinState(VehicleState.ShuntingEnum.WITPIN.getCode());
+        baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.WITPIN.getRemarks());
+        if (!updateById(baseVehicle)) {
+            return rb.setMsg("调车入库更新调出方车辆台账据失败");
+        }
+
+        //新建调入分公司车辆台账，设置调入分公司sid
+        BaseVehicle new_baseVehicle = new BaseVehicle();
+        baseVehicle.setId(null);
+        baseVehicle.setSid(null);
+        baseVehicle.setCreateTime(null);
+        baseVehicle.setModifyTime(null);
+        baseVehicle.setCreateBySid(null);
+
+        BeanUtil.copyProperties(baseVehicle, new_baseVehicle, new CopyOptions().setIgnoreNullValue(true));
+
+        //调车状态
+        new_baseVehicle.setWitPinState(VehicleState.ShuntingEnum.WITPURCHASE.getCode());
+        new_baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.WITPURCHASE.getRemarks());
+        //库存状态
+        new_baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+        new_baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+        //锁定状态
+        new_baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
+        new_baseVehicle.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
+        //买断状态
+        new_baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
+        new_baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
+        //采购订单类型
+        new_baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.TC_ORDER.getCode());
+        new_baseVehicle.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.TC_ORDER.getRemarks());
+        if (!save(new_baseVehicle)) {
+            BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
+
+            baseVehicleCertificate.setVinNo(new_baseVehicle.getVinNo());
+            baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
+            baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
+            baseVehicleCertificate.setVehicleSid(new_baseVehicle.getSid());
+            baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
+            baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
+            baseVehicleCertificateService.save(baseVehicleCertificate);
+            return rb.success().setMsg("调车入库新增调入方车辆台账据成功");
+        }
+        return rb.setMsg("调车入库新增调入方车辆台账数据失败");
+
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java

@@ -76,8 +76,7 @@ public interface ScmApplyInboundFeign {
 
     @ApiOperation(value = "流程历史流转记录")
     @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
-    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId,
-                                 @ApiParam(value = "目前没用") @PathVariable(value = "deployId") String deployId);
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java

@@ -80,7 +80,7 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign {
     }
 
     @Override
-    public ResultBean flowRecord(String procInsId, String deployId) {
+    public ResultBean flowRecord(String procInsId) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-scm/scmapplyinbound/flowRecord无法访问");
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java

@@ -91,8 +91,8 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign {
 	}
 
 	@Override
-	public ResultBean flowRecord(String procInsId, String deployId) {
-		return scmApplyInboundService.flowRecord(procInsId, deployId);
+	public ResultBean flowRecord(String procInsId) {
+		return scmApplyInboundService.flowRecord(procInsId);
 	}
 
 	@Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
+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.flowable.api.flow.FlowableFeign;
@@ -417,6 +418,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid);
                 List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
                 for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
+                    //验车数据推送
                     ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
                     //配置的名称
                     scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
@@ -453,25 +455,15 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     baseVehicleDto.setConfigName(booad.getConfigName());
                     baseVehicleDto.setInsideCode(booad.getInsideCode());
                     baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
-                    baseVehicleDto.setSettlementStatus("0");
-                    baseVehicleDto.setSettlementStatusValue("未买断");
-                    baseVehicleDto.setLockedState("03");
-                    baseVehicleDto.setLockedStateValue("未锁定");
-                    baseVehicleDto.setVehicleState("0003");
-                    baseVehicleDto.setVehicleStateValue("在途");
-                    baseVehicleDto.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
-                    baseVehicleDto.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
-                    baseVehicleDto.setManPurOrderTypeKey("001");
-                    baseVehicleDto.setManPurOrderTypeValue("排产订单");
                     baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
-                    baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().subtract(booad.getSecondaryFreight()).toString()));
+                    baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
                     baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
                     baseVehicleDto.setPriceDate(booad.getPriceDate());
                     baseVehicleDto.setDepartureDate(booad.getDepartureDate());
                     baseVehicleDto.setInsideCode(booad.getInsideCode());
                     baseVehicleDtos.add(baseVehicleDto);
                 }
-                baseVehicleFeign.saveAll(baseVehicleDtos);
+                baseVehicleFeign.saveOrUpdate(baseVehicleDtos,OperVehicleState.EventType.RZ_SAVEVEH.getCode());
                 busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
             }
             return rb.success().setData(resultBean.getData());
@@ -563,10 +555,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
      * 流程历史流转记录
      *
      * @param procInsId
-     * @param deployId
      * @return
      */
-    public ResultBean flowRecord(String procInsId, String deployId) {
+    public ResultBean flowRecord(String procInsId) {
         return flowTaskFeign.businessFlowRecord(procInsId);
     }