diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 9c36efb33f..c2cdbc02e1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -225,6 +225,10 @@ public interface BaseVehicleFeign { @PostMapping("/vehicleActualList") ResultBean> vehicleActualList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("调车申请选择车辆分页列表") + @PostMapping("/vehiclePurchaseList") + ResultBean> vehiclePurchaseList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("销售订单选择现车分页列表") @PostMapping("/selectVo") ResultBean> selectVo(@RequestBody PagerQuery pcBaseVehicleOrderQuery); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 7320eac978..f67ddc2d7b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -136,6 +136,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index acd99086a1..4dc1a927e5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -406,4 +406,6 @@ public interface BaseVehicleMapper extends BaseMapper { */ void updateVehicleGressionByVin(@Param("vin") String vin, @Param("location") String location, @Param("locationName") String locationName); + + IPage vehiclePurchasePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file 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 4123e2cd95..334fcc2700 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 @@ -180,7 +180,7 @@ @@ -295,8 +295,8 @@ resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo"> SELECT bv.guidedPrice AS price FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid WHERE bvm.sid = #{modelSid} ORDER BY bv.guidedPrice ASC @@ -304,14 +304,14 @@ @@ -333,8 +333,8 @@ bmc.packingCase, bvm.insideCode FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -411,8 +411,8 @@ bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`department`) as vehModelInfor FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -524,11 +524,11 @@ (select SUM(distinct cast((cast(bo.platformNo as signed) - IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity from bus_vehicle_order bo - LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid + LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid where bo.useOrgSid = bvc.useOrgSid AND bd.vehicleSid = bvm.sid) AS produceCarNum FROM base_vehicle_model bvm - LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid + LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid WHERE bvc.modelSid = #{modelSid} AND bvc.useOrgSid != #{useOrg} group by bvc.useOrgSid @@ -547,15 +547,15 @@ WHERE bv.modelSid = bvm.sid AND bv.modelConfigSid = bvc.configurationItemsSid AND lockedState = '03') - + + + (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvm.sid AND bvad.configSid = bvc.configurationItemsSid) - ) AS num + ) AS num FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid WHERE bvc.modelSid = #{modelSid} AND bvc.configurationItemsSid = #{configSid} AND bvc.useOrgSid = #{useOrg} @@ -699,7 +699,6 @@ LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` ${ew.sqlSegment} - and length(bv.salesDate)>0 @@ -739,14 +738,14 @@ carColor AS color, locationName AS address FROM base_vehicle bv - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid - ${ew.customSqlSegment} + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index c72a267498..51e5f8d241 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -366,6 +366,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehiclePurchaseList(pagerQuery); + return rb.success().setData(pv); + } + @Override public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { ResultBean> rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 9a802a9fe9..d807a04827 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1103,6 +1103,88 @@ public class BaseVehicleService extends MybatisBaseService vehiclePurchaseList(PagerQuery pagerQuery) { + IPage page = vehiclePurchasePageList(pagerQuery); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage vehiclePurchasePageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = vehiclePurchaseWrapper(pagerQuery.getParams()); + return baseMapper.vehiclePurchasePageList(page, qw); + } + + private QueryWrapper vehiclePurchaseWrapper(BaseVehicleReturnQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + if (StringUtils.isNotBlank(params.getUserSid())) { + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + qw.eq("bv.useOrgSid", orgSid); + + } + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.eq("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.eq("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.like("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + if (params.getVinNoList().size() > 0) { + qw.notIn("bv.vinNo", params.getVinNoList()); + } + //锁定状态:未锁定 + qw.eq("bv.settlementStatus", VehicleState.LockEnum.UN_LOCK.getCode()); + //库存状态:库存 + qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); + } + return qw; + } + /** * 未售买断车辆的数据 * diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index 6282271803..adcc71708b 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss @@ -131,7 +131,13 @@ div:focus { .main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);padding: 0 20px;} .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;} .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} - +.listconadd{ + .titwu { + font-size: 28px; + text-align: center; + padding-bottom: 30px; + } +} .listconsub { height: calc(100vh - 310px); overflow-y: auto; @@ -256,63 +262,15 @@ div:focus { } -.formaddcopy { - padding: 20px 0; - .title { - padding: 10px;font-weight: bold; - font-size: 20px; - background-color: $header-bg; - text-align: center; - color: #ffffff; - } - .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .el-col{ - display: flex; - justify-content: flex-start; - align-items: center; - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - min-height: 48px; - line-height: 1; - .spanOneWidth { - width: 100px; - } - .spanThreeWidth { - width: 70px; - } - .spanType { - text-align: right; - font-size: 14px; - color: #606266; - font-weight: 600; - border-right: 1px solid $table-border-color; - padding: 0 10px !important; - line-height: 48px; - } - .el-form-item{ - padding: 0 10px !important; - margin-bottom: 0; - .addinputw { width: 80%; } - } - } - - } - .footer{margin: 20px;} -} - .formaddcopy02 { - padding: 20px 0; - // height: calc(100vh - 200px);overflow-y: auto; + padding: 30px 40px 0 40px; .title { - padding: 10px; + padding: 12px; font-weight: bold; - font-size: 20px; - background-color: $header-bg; - text-align: center; + font-size: 16px; + background-color: #0294d7; color: #ffffff; + text-align: left; } .el-row { @@ -323,14 +281,16 @@ div:focus { .el-col { border-right: 1px solid $table-border-color; border-bottom: 1px solid $table-border-color; - min-height: 48px; + min-height: 42px; + padding: 0 15px; + line-height: 42px; position: relative; .span-sty { position: absolute; top: 0; bottom: 0; left: 0; - line-height: 48px; + line-height: 42px; text-align: right; font-size: 14px; color: #606266; @@ -342,7 +302,7 @@ div:focus { .el-form-item { margin-bottom: 0; - + line-height: 42px; .addinputw { padding: 5px 0; width: 65%; @@ -351,9 +311,12 @@ div:focus { .addinputInfo { margin-left: 80px; - line-height: 48px; + line-height: 42px; } + .el-input__inner { + height: 36px; + } } }