diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java new file mode 100644 index 0000000000..559cb4e0e2 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java @@ -0,0 +1,120 @@ +package com.yxt.anrui.base.common.enums; + +import lombok.Getter; + +/** + * @Author dimengzhe + * @Date 2022/6/13 11:57 + * @Description 车辆台账状态 + */ +public class VehicleState { + + @Getter + public static enum LockEnum { + /** + * 未锁定 + */ + UN_LOCK("0", "未锁定"), + /** + * 虚拟订单-预定1 + */ + LOCK("1", "虚拟订单-预定1"), + /** + * 销售订单-锁定2 + */ + ORDER_LOCK("2", "销售订单-锁定2"); + + /** + * code值 + */ + private final String code; + /** + * 备注 + */ + private final String remarks; + + /** + * 构造器 + * + * @param code code值 + * @param remarks 备注 + */ + private LockEnum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + + @Getter + public static enum BuyoutEnum { + /** + * 未买断 + */ + UN_BUYOUT("0", "未买断"), + /** + * 预买断 + */ + PRE_BUYOUT("1", "预买断"), + /** + * 已买断 + */ + BUYOUT("2", "已买断"), + ; + /** + * code值 + */ + private final String code; + /** + * 备注 + */ + private final String remarks; + + /** + * 构造器 + * + * @param code code值 + * @param remarks 备注 + */ + private BuyoutEnum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + + @Getter + public static enum StockEnum { + /** + * 库存 + */ + STOCK("0", "库存"), + /** + * 出库 + */ + OUT_STOCK("1", "出库"), + /** + * 退库 + */ + RETURN_STOCK("2", "退库"); + + /** + * code值 + */ + private final String code; + /** + * 备注 + */ + private final String remarks; + + /** + * 构造器 + * + * @param code code值 + * @param remarks 备注 + */ + private StockEnum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java index e4b2bbe5c8..3b4455f334 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java @@ -145,7 +145,7 @@ public interface BaseModelConfigMapper extends BaseMapper { * @param configSid * @return */ - AppModelConfigDetailsVo getAppModelConfigDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid ,@Param("useOrg") String useOrg); + AppModelConfigDetailsVo getAppModelConfigDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); /** * 车型配置分页列表(新) @@ -183,9 +183,9 @@ public interface BaseModelConfigMapper extends BaseMapper { AppModelConfigDetailsVo getAppProductionSchedulingDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid); //查询车型信息 - AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid,@Param("useOrgSid") String useOrgSid); + AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid); - List getModelConfigPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getModelConfigPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("lockedStateKey") String lockedStateKey); List getNowConfigList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @@ -195,5 +195,5 @@ public interface BaseModelConfigMapper extends BaseMapper { int checkByConfigName(String configName); - int checkByCreateOrgSidAndConfigSid(@Param("sid1") String sid1,@Param("sid") String sid); + int checkByCreateOrgSidAndConfigSid(@Param("sid1") String sid1, @Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index f33cff4bc3..7034c7dde8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -170,7 +170,7 @@ - SELECT - bmc.sid as configSid, - bmc.carColor, - bmc.slowMachine, - bmc.rearViewMirror, - bmc.tireSize, - bmc.specification, - bmc.rearAxleRatio, - bmc.airConditioner, - bmc.hubMaterial, - bmc.baffleModel, - bmc.suspension, - bmc.seat, - bmc.tireCover, - bmc.saddle, - bmc.wheelbase, - bmc.bumper, - bmc.configuringBao, - bmc.independentSources, - bmc.fuelTank, - bmc.multimedia, - bvc.guidedPrice as price, - bvc.priceValidity, - bvm.sid as modelSid, - bvm.vehicleAlias as modelName, - bvm.brandName as brand, - bvm.carBrand as brandSid, - ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid AND - lockedState = '03' ) AS nowCarNum, - ( SELECT SUM(cast(bvad.quantity as signed)) as quantity FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid - = bvc.modelSid - and bvad.configSid = - bmc.sid) AS produceCarNum + SELECT bmc.sid as configSid, + bmc.carColor, + bmc.slowMachine, + bmc.rearViewMirror, + bmc.tireSize, + bmc.specification, + bmc.rearAxleRatio, + bmc.airConditioner, + bmc.hubMaterial, + bmc.baffleModel, + bmc.suspension, + bmc.seat, + bmc.tireCover, + bmc.saddle, + bmc.wheelbase, + bmc.bumper, + bmc.configuringBao, + bmc.independentSources, + bmc.fuelTank, + bmc.multimedia, + bvc.guidedPrice as price, + bvc.priceValidity, + bvm.sid as modelSid, + bvm.vehicleAlias as modelName, + bvm.brandName as brand, + bvm.carBrand as brandSid, + (SELECT count(*) + FROM base_vehicle bv + WHERE bv.modelSid = bvc.modelSid + AND bv.modelConfigSid = bmc.sid + AND lockedState = #{lockedStateKey}) AS nowCarNum, + (SELECT SUM(cast(bvad.quantity as signed)) as quantity + FROM bus_vehicle_apply_detail bvad + WHERE bvad.vehicleSid + = bvc.modelSid + and bvad.configSid = + bmc.sid) AS produceCarNum FROM base_vehmodel_config bvc - 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 + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid ${ew.sqlSegment} - ORDER BY - nowCarNum DESC + ORDER BY nowCarNum DESC @@ -748,7 +748,7 @@ select filePath from base_vehicle_appendix where linkSid = #{vehicleSid} - and attachType = '0001' + and attachType = '0001' limit 1 \ 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 b87a3a40a8..49018e7f83 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 @@ -11,6 +11,7 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -99,16 +100,16 @@ public class BaseVehicleRest implements BaseVehicleFeign { } BaseVehicle baseVehicle = new BaseVehicle(); dto.fillEntity(baseVehicle); + //锁定状态 + 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()); boolean isSave = baseVehicleService.save(baseVehicle); - /*if (isSave) { - List list = dto.getVehiclePhoto(); - if (list.size() > 0) { - int i = baseVehicleAppendixService.saveAppendixFile(list, baseVehicle.getSid(), type); - if (i == 0) { - return rb.fail().setMsg("附件保存失败"); - } - } - }*/ + return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功"); } 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 a7e2e363e5..c5b27f2edc 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 @@ -14,6 +14,7 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +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; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -730,7 +731,7 @@ public class BaseVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = appExistingCarBuildQW(pagerQuery.getParams()); - IPage iPage = baseMapper.getModelList(page, qw, data.getSid()); + IPage iPage = baseMapper.getModelList(page, qw, data.getSid(), VehicleState.LockEnum.UN_LOCK.getCode()); // 3、 查询更多配置（其它分公司） for (AppVehicleModelPriceVo record : iPage.getRecords()) { String sid = record.getModelSid(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 5afb6d2614..8a0a4fdae2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -494,41 +494,42 @@ public class BaseVehmodelConfigService extends MybatisBaseService getVehModByModelSid(String sid,String useOrgSid) { - return baseMapper.getVehModByModelSid(sid,useOrgSid); + public List getVehModByModelSid(String sid, String useOrgSid) { + return baseMapper.getVehModByModelSid(sid, useOrgSid); } public int checkByConfigSid(String sid) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index 31c059796a..87dd2040c1 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -460,6 +460,8 @@ public class CrmVehicledemandService extends MybatisBaseService