Merge remote-tracking branch 'origin/master'

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

@@ -133,4 +133,9 @@ public class BaseVehicle extends BaseEntity {
     private String specialInstructions;
     @ApiModelProperty("内部编码")
     private String insideCode;
+
+    @ApiModelProperty(value = "调车状态key")
+    private String witPinState;
+    @ApiModelProperty(value = "调车状态value")
+    private String witPinStateValue;
 }

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

@@ -102,8 +102,14 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         String vinNo = dto.getVinNo();
         String type = "0001";
         int count = baseVehicleService.selectCountByVinNo(vinNo);
+        ResultBean<BaseVehicleVo> baseVehicleVoResultBean = baseVehicleService.selVehicleByVinNo(vinNo);
+        BaseVehicleVo data = baseVehicleVoResultBean.getData();
         if (count > 0) {
-            return rb.setMsg("已存在该车架号的车辆信息");
+            ResultBean resultBean = update(dto, data.getSid());
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            return rb.success().setMsg(resultBean.getMsg());
         }
         BaseVehicle baseVehicle = new BaseVehicle();
         dto.fillEntity(baseVehicle);
@@ -121,6 +127,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
         baseVehicle.setSettlementStatus(dto.getSettlementStatus());
         baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
+        baseVehicle.setWitPinState(dto.getWitPinState());
+        baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         boolean isSave = baseVehicleService.save(baseVehicle);
         BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
         if (StringUtils.isNotBlank(dto.getVinNo())){
@@ -164,21 +172,29 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         if (baseVehicle == null) {
             return rb.setMsg("该车辆信息不存在");
         }
-        String vinNo = dto.getVinNo();
+        //String vinNo = dto.getVinNo();
         //根据车架号和车辆信息sid查询车辆信息是否存在
-        int count = baseVehicleService.selectCountBySidAndVinNo(vinNo, sid);
+        /*int count = baseVehicleService.selectCountBySidAndVinNo(vinNo, sid);
         if (count > 0) {
             return rb.setMsg("已存在该车架号的车辆信息");
-        }
+        }*/
         BeanUtil.copyProperties(dto, baseVehicle);
         //锁定状态
-        String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
+        /*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
         String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks();
         baseVehicle.setLockedState(lockedStateKey);
         baseVehicle.setLockedStateValue(lockedStateValue);
         baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
-        baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
+        baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/
+        baseVehicle.setLockedState(dto.getLockedState());
+        baseVehicle.setLockedStateValue(dto.getLockedStateValue());
+        baseVehicle.setVehicleState(dto.getVehicleState());
+        baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
+        baseVehicle.setSettlementStatus(dto.getSettlementStatus());
+        baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
+        baseVehicle.setWitPinState(dto.getWitPinState());
+        baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         boolean isTrue = baseVehicleService.updateById(baseVehicle);
 //        int i = baseVehicleService.updateBySid(dto.toMap(), sid);
         if (!isTrue) {