diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java index db75b89dbc..9fa2dc0cf2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java @@ -7,6 +7,9 @@ import lombok.Data; @Data public class AppBaseVinNowCarVo implements Vo { + @ApiModelProperty("车辆sid") + private String sid; + @ApiModelProperty("车架号") private String vin; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 0fbb39d685..4d85c8b345 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -787,7 +787,8 @@ SELECT bvm.vehicleAlias AS modelName, - bc.guidedPrice AS price, + convert(bc.guidedPrice/10000,decimal(10,2)) AS price, bmc.configName AS commonlyConfig FROM base_vehmodel_config bc LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid` @@ -818,7 +819,7 @@ + select * + from base_vehicle_certificate + where vehicleSid = #{sid} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index a71dbdaf9f..7d0ff18ca7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -140,6 +140,15 @@ public class BaseVehicleCertificateService extends MybatisBaseService pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); + String data2 = pathSidByUserSid.getData(); + baseVehicleDto.setCreateOrgSid(data2); + baseVehicleDto.setUseOrgSid(data2); + baseVehicleDto.setSettlementStatus("0"); + baseVehicleDto.setLockedState("0"); + baseVehicleDto.setLockedStateValue("未锁定"); + baseVehicleDto.setVehicleState("0001"); + baseVehicleDto.setVehicleStateValue("库存"); + baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString()) + baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()) + baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString()) + if ("01".equals(scmVehicleEnterlibrary.getPurchaseTypeKey())){ + baseVehicleDto.setCertificateState("0003"); + baseVehicleDto.setCertificateStateValue("待转"); + } + baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate() + baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate() + baseVehicleDto.setLocation(dto.getWarehouseKey()); + baseVehicleDto.setLocationName(dto.getWarehouse()); + baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid()); + baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName()); + baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName()); + baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid()); + baseVehicleFeign.save(baseVehicleDto); return rb.success().setMsg("操作成功!"); } else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) { return rb.fail().setMsg("当前车辆已入库,请勿重复保存"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index e958959f35..69976c1c04 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -460,6 +460,10 @@ public class ScmVehicleExamineService extends MybatisBaseService