From 80b07d2bc669827189de0dbf68972d30c627fa6d Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Thu, 28 Jul 2022 19:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E7=9A=84=E6=8C=87=E5=AF=BC?= =?UTF-8?q?=E4=BB=B7=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=AA=8C?= =?UTF-8?q?=E8=BD=A6=E6=A3=80=E6=9F=A5=E8=A1=A8=E8=BF=94=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/AppBaseVinNowCarVo.java | 3 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 7 ++-- .../biz/basevehicle/BaseVehicleService.java | 9 +++-- .../BaseVehicleCertificateMapper.java | 2 ++ .../BaseVehicleCertificateMapper.xml | 7 ++++ .../BaseVehicleCertificateService.java | 9 +++++ .../CrmVehicledemandMapper.xml | 6 ++-- ...mVehicleEnterlibraryCarWarehousingDto.java | 12 +++++++ .../ScmVehicleEnterlibraryService.java | 35 +++++++++++++++++-- .../ScmVehicleExamineService.java | 4 +++ .../ScmVehinspectItemService.java | 3 +- 11 files changed, 86 insertions(+), 11 deletions(-) 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