yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

导出车辆台账

zhanglei
fanzongzhe 2 years ago
parent
8a67b2de1b
commit
2734542b6f
7 changed files with 683 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 126
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java
  2. 194
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java
  3. 24
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  4. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  5. 108
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  6. 119
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  7. 177
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

126
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java
View File

@ -21,12 +21,136 @@ public class BaseVehicleExportQuery implements Query {
@ApiModelProperty(value = "sids", required = false)
private List<String> sids;
// @ApiModelProperty(value = "车架号")
// private String vinNo;
// @ApiModelProperty(value = "车型名称")
// private String modelName;
// @ApiModelProperty(value = "存放地点")
// private String location;
// @ApiModelProperty(value = "车辆状态")
// private String vehicleState;
@ApiModelProperty(value = "厂家采购订单类型value")
private String manPurOrderTypeValue;
@ApiModelProperty(value = "厂家库龄")
private Long libraryAge;
@ApiModelProperty(value = "公司库龄")
private Long orgLibraryAge;
@ApiModelProperty(value = "买断库龄")
private Long settlementLibraryAge;
@ApiModelProperty(value = "分公司sid")
private String orgSid;
@ApiModelProperty(value = "创建组织sid")
private String createOrgSid;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
@ApiModelProperty(value = "车架号")
private String vinNo;
@ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "存放地点")
private String location;
@ApiModelProperty(value = "车辆状态")
@ApiModelProperty(value = "库存状态")
private String vehicleState;
@ApiModelProperty(value = "合格证状态value")
private String certificateStateValue;
@ApiModelProperty(value = "内部编码")
private String insideCode;
@ApiModelProperty(value = "采购类型")
private String manPurOrderTypeKey;
@ApiModelProperty(value = "厂家入库日期")
private String priceDate;
@ApiModelProperty(value = "买断状态")
private String settlementStatus;
@ApiModelProperty(value = "销售开始日期")
private String salesStartDate;
@ApiModelProperty(value = "销售结束日期")
private String salesEndDate;
@ApiModelProperty(value = "买断开始日期")
private String solidStartDate;
@ApiModelProperty(value = "买断结束日期")
private String solidEndDate;
/***************车型查询**********************/
@ApiModelProperty(value = "品牌")
private String carBrand;
@ApiModelProperty(value = "功能")
private String vehicleType;
@ApiModelProperty(value = "系列")
private String productLine;
@ApiModelProperty(value = "驱动")
private String driveForm;
@ApiModelProperty(value = "马力")
private String power;
@ApiModelProperty(value = "版本")
private String vehicleVersion;
@ApiModelProperty(value = "燃料")
private String fuelType;
@ApiModelProperty(value = "车型编码")
private String vehicleTypeCode;
@ApiModelProperty(value = "变速箱")
private String gearboxType;
@ApiModelProperty(value = "变速箱类型key")
private String tranCaseTypeKey;
@ApiModelProperty(value = "排放标准")
private String emissionStandard;
@ApiModelProperty(value = "发动机型号")
private String engineType;
@ApiModelProperty(value = "细分市场")
private String marketSegments;
@ApiModelProperty(value = "规格型号")
private String specifications;
/***************车型配置查询*******************/
@ApiModelProperty(value = "颜色")
private String carColorKey;
@ApiModelProperty(value = "缓速器")
private String slowMachineKey;
@ApiModelProperty(value = "后视镜")
private String rearViewMirrorKey;
// @ApiModelProperty(value = "轮胎")
// private String driveForm;
@ApiModelProperty(value = "驾驶室")
private String specificationKey;
@ApiModelProperty(value = "后桥")
private String rearAxleKey;
@ApiModelProperty(value = "速比")
private String rearAxleRatioKey;
@ApiModelProperty(value = "空调")
private String airConditionerKey;
@ApiModelProperty(value = "轮毂材质")
private String hubMaterialKey;
@ApiModelProperty(value = "导流罩")
private String baffleModelKey;
@ApiModelProperty(value = "悬架")
private String suspensionKey;
@ApiModelProperty(value = "座椅")
private String seatKey;
@ApiModelProperty(value = "护轮罩")
private String tireCoverKey;
@ApiModelProperty(value = "鞍座")
private String saddleKey;
@ApiModelProperty(value = "轴距")
private String wheelbaseKey;
@ApiModelProperty(value = "保险杠")
private String bumperKey;
@ApiModelProperty(value = "配置包")
private String configuringBaoKey;
@ApiModelProperty(value = "独立热源")
private String independentSourcesKey;
@ApiModelProperty(value = "燃料箱")
private String fuelTankKey;
@ApiModelProperty(value = "多媒体")
private String multimediaKey;
@ApiModelProperty(value = "常用配置名称")
private String configName;
@ApiModelProperty("配置编码")
private String configCode;
}

194
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java
View File

@ -1,9 +1,12 @@
package com.yxt.anrui.base.api.basevehicle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.utils.ExportEntityMap;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/9/30 16:25
@ -13,30 +16,175 @@ import lombok.Data;
public class BaseVehicleExportVo implements Vo {
private static final long serialVersionUID = -1722170460354213687L;
@ExportEntityMap(CnName = "车型名称", EnName = "modelName")
private String modelName;
@ExportEntityMap(CnName = "配置编码", EnName = "vehicleCode")
private String vehicleCode;
// @ExportEntityMap(CnName = "车型名称", EnName = "modelName")
// private String modelName;
//
// @ExportEntityMap(CnName = "配置编码", EnName = "vehicleCode")
// private String vehicleCode;
//
// @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
// private String vinNo;
//
// @ExportEntityMap(CnName = "发动机号/许可证号", EnName = "engineNo")
// private String engineNo;
//
// @ExportEntityMap(CnName = "制造日期", EnName = "manufactureDate")
// private String manufactureDate;
//
// @ExportEntityMap(CnName = "车辆状态", EnName = "vehicleState")
// private String vehicleState;
//
// @ExportEntityMap(CnName = "存放地点", EnName = "location")
// private String location;
//
// @ExportEntityMap(CnName = "首次发车日期", EnName = "firstStartDate")
// private String firstStartDate;
//
// @ExportEntityMap(CnName = "库龄", EnName = "libraryAge")
// private String libraryAge;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo")
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "所属公司", EnName = "createOrgName")
private String createOrgName; // 分公司
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "车型（配置简述）", EnName = "modelName")
private String modelName;
@ExportEntityMap(CnName = "厂家库龄", EnName = "libraryAge")
private Long libraryAge;
@ExportEntityMap(CnName = "公司库龄", EnName = "orgLibraryAge")
private Long orgLibraryAge;
@ExportEntityMap(CnName = "买断库龄", EnName = "settlementLibraryAge")
private Long settlementLibraryAge;
@ExportEntityMap(CnName = "17位车架号", EnName = "vinNo")
private String vinNo;
@ExportEntityMap(CnName = "发动机号/许可证号", EnName = "engineNo")
@ExportEntityMap(CnName = "后8位车架号", EnName = "lastVinNo")
private String lastVinNo;
@ExportEntityMap(CnName = "发动机号", EnName = "engineNo")
private String engineNo;
@ExportEntityMap(CnName = "制造日期", EnName = "manufactureDate")
private String manufactureDate;
@ExportEntityMap(CnName = "车辆状态", EnName = "vehicleState")
private String vehicleState;
@ExportEntityMap(CnName = "存放地点", EnName = "location")
private String location;
@ExportEntityMap(CnName = "首次发车日期", EnName = "firstStartDate")
private String firstStartDate;
@ExportEntityMap(CnName = "库龄", EnName = "libraryAge")
private String libraryAge;
@ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue")
private String manPurOrderTypeValue;
@ExportEntityMap(CnName = "排产订单编号", EnName = "orderingNo")
private String orderingNo;
@ExportEntityMap(CnName = "锁定状态", EnName = "lockedStateValue")
private String lockedStateValue;
@ExportEntityMap(CnName = "细分市场", EnName = "marketSegmentsValue")
private String marketSegmentsValue;
@ExportEntityMap(CnName = "品牌", EnName = "vehModelBrandName")
private String vehModelBrandName;
@ExportEntityMap(CnName = "功能", EnName = "vehicleTypeValue")
private String vehicleTypeValue;
@ExportEntityMap(CnName = "内部编码", EnName = "insideCode")
private String insideCode;
@ExportEntityMap(CnName = "车辆型号", EnName = "carModel")
private String carModel;
@ExportEntityMap(CnName = "系列", EnName = "productLineValue")
private String productLineValue;
@ExportEntityMap(CnName = "版本", EnName = "vehicleVersionValue")
private String vehicleVersionValue;
@ExportEntityMap(CnName = "驱动", EnName = "driveFormValue")
private String driveFormValue;
@ExportEntityMap(CnName = "排放", EnName = "emissionStandardValue")
private String emissionStandardValue;
@ExportEntityMap(CnName = "马力", EnName = "powerValue")
private String powerValue;
@ExportEntityMap(CnName = "变速箱", EnName = "gearboxTypeValue")
private String gearboxTypeValue;
@ExportEntityMap(CnName = "后桥", EnName = "rearAxleValue")
private String rearAxleValue;
@ExportEntityMap(CnName = "速比", EnName = "rearAxleRatio")
private String rearAxleRatio;
@ExportEntityMap(CnName = "轴距", EnName = "wheelbase")
private String wheelbase;
@ExportEntityMap(CnName = "悬架/板簧片数", EnName = "suspension")
private String suspension;
@ExportEntityMap(CnName = "鞍座", EnName = "saddle")
private String saddle;
@ExportEntityMap(CnName = "颜色", EnName = "carColor")
private String carColor;
@ExportEntityMap(CnName = "驾驶室", EnName = "specification")
private String specification;
@ExportEntityMap(CnName = "保险杠", EnName = "bumper")
private String bumper;
@ExportEntityMap(CnName = "油箱/气罐", EnName = "fuelTank")
private String fuelTank;
@ExportEntityMap(CnName = "导流罩", EnName = "baffleModel")
private String baffleModel;
@ExportEntityMap(CnName = "独立热源", EnName = "independentSources")
private String independentSources;
@ExportEntityMap(CnName = "液力缓速器", EnName = "slowMachine")
private String slowMachine;
@ExportEntityMap(CnName = "护轮罩", EnName = "tireCover")
private String tireCover;
@ExportEntityMap(CnName = "后视镜", EnName = "rearViewMirror")
private String rearViewMirror;
@ExportEntityMap(CnName = "轮胎", EnName = "tireSize")
private String tireSize;
@ExportEntityMap(CnName = "轮毂材质", EnName = "hubMaterial")
private String hubMaterial;
@ExportEntityMap(CnName = "独立空调", EnName = "airConditioner")
private String airConditioner;
@ExportEntityMap(CnName = "座椅", EnName = "seat")
private String seat;
@ExportEntityMap(CnName = "多媒体", EnName = "multimedia")
private String multimedia;
@ExportEntityMap(CnName = "配置包", EnName = "configuringBao")
private String configuringBao;
@ExportEntityMap(CnName = "更多配置", EnName = "otherConfig")
private String otherConfig;
@ExportEntityMap(CnName = "库存状态", EnName = "vehicleStateValue")
private String vehicleStateValue;
@ExportEntityMap(CnName = "厂家入库日期", EnName = "priceDate")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String priceDate;
@ExportEntityMap(CnName = "物流到车日期", EnName = "arrivalDate")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String arrivalDate;
@ExportEntityMap(CnName = "退库日期", EnName = "returnDate")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String returnDate;
@ExportEntityMap(CnName = "存放地点", EnName = "locationName")
private String locationName;
@ExportEntityMap(CnName = "厂家销售通路", EnName = "manufSaleAccessName")
private String manufSaleAccessName;
@ExportEntityMap(CnName = "厂家合同价（含运费）", EnName = "contractPrice")
private String contractPrice;
@ExportEntityMap(CnName = "运费", EnName = "freight")
private String freight;
@ExportEntityMap(CnName = "买断状态", EnName = "settlementStatus")
private String settlementStatus;
@ExportEntityMap(CnName = "买断日期", EnName = "solidDate")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String solidDate;
@ExportEntityMap(CnName = "全款销售指导价", EnName = "guidedPrice")
private String guidedPrice;
@ExportEntityMap(CnName = "贷款销售指导价", EnName = "manufactorSettlementPrice")
private String manufactorSettlementPrice;
@ExportEntityMap(CnName = "销售成交价", EnName = "salePrice")
private String salePrice;
@ExportEntityMap(CnName = "销售日期", EnName = "salesDate")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String salesDate;
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks;
@ExportEntityMap(CnName = "合格证状态", EnName = "certificateStateValue")
private String certificateStateValue;
@ExportEntityMap(CnName = "常用配置名称", EnName = "configName")
private String configName;
@ExportEntityMap(CnName = "是否问题车", EnName = "isProblemVeh")
private String isProblemVeh;
@ExportEntityMap(CnName = "发动机型号", EnName = "engineTypeValue")
private String engineTypeValue;
@ExportEntityMap(CnName = "保修卡号", EnName = "warrantyCardNo")
private String warrantyCardNo;
@ExportEntityMap(CnName = "燃料", EnName = "fuelTypeValue")
private String fuelTypeValue;
@ExportEntityMap(CnName = "规格型号", EnName = "specifications")
private String specifications;
@ExportEntityMap(CnName = "系别", EnName = "departmentValue")
private String departmentValue;
@ApiModelProperty("发车日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String departureDate;
}

24
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
View File

@ -3,6 +3,7 @@ package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
import com.yxt.anrui.base.api.basevehicle.app.*;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -130,14 +131,27 @@ public interface BaseVehicleFeign {
@GetMapping("/details/{sid}")
public ResultBean<BaseVehicleSelectVo> details(@PathVariable("sid") String sid);
// /**
// * 车辆列表导出
// *
// * @param query 查询条件
// */
// @GetMapping("/exportExcel")
// @ApiOperation(value = "车辆列表导出")
// public void exportExcel(BaseVehicleExportQuery query);
/**
* 车辆列表导出
* 车辆台账列表导出
*
* @param query 查询条件
* @param baseVehicleExportQuery 查询条件
*/
@GetMapping("/exportExcel")
@ApiOperation(value = "车辆列表导出")
public void exportExcel(BaseVehicleExportQuery query);
@PostMapping("/exportExcel")
@ApiOperation(value = "车辆销售台账列表导出")
@ResponseBody
public void exportExcel(@RequestBody BaseVehicleExportQuery baseVehicleExportQuery) throws ParseException;
/**
* 删除、批量删除

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
View File

@ -496,4 +496,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
@Update("update base_vehicle set lockedState = #{code},lockedStateValue = #{remarks} where sid = #{vehSid}")
ResultBean updateLockedState(@Param("vehSid") String vehSid,@Param("code") String code,@Param("remarks") String remarks);
//导出车辆台账信息
List<BaseVehicleExportVo> selByExcel(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleExportVo> qw);
}

108
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
View File

@ -2489,6 +2489,7 @@
and deptSid = #{purchaseSystemSid}
</select>
<update id="updateVehicleStateAndSaleDate">
UPDATE
base_vehicle
@ -2497,4 +2498,111 @@
salesDate = null
WHERE sid = #{sid}
</update>
<!-- 导出车辆台账信息列表-->
<select id="selByExcel" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleExportVo">
SELECT distinct
so.orgSidPath,
bv.sid,
bv.modelSid,
bv.engineNo,
bv.remarks,
bv.modelConfigSid,
bv.configName,
bv.vinNo,
bv.vehicleStateValue,
bv.locationName,
bv.orderingNo,
bv.costPrice,
bv.freight,
bv.contractPrice,
bv.priceDate,
bv.solidDate,
bv.salePrice,
bv.createOrgSid,
bv.createOrgName,
bv.useOrgName,
bv.modelName,
bv.departureDate,
bv.arrivalDate,
bv.salesDate,
bv.returnDate,
bv.rebate1,
bv.rebate2,
bv.warrantyCardNo,
bv.lockedStateValue,
bv.rebate3,
bv.settlementStatus,
bv.settlementStatusValue,
bv.manPurOrderTypeValue,
bv.specialInstructions,
bv.insideCode,
bv.witPinStateValue,
bv.isProblemVeh,
bv.purchaseSystemSid,
bv.purchaseSystemName,
bv.manufSaleAccessName,
bv.manufSaleAccessSid,
bv.vehMark,
bmc.carColor,
bmc.specification,
bmc.fuelTank,
bmc.baffleModel,
bmc.independentSources,
bmc.tireCover,
bmc.saddle,
bmc.airConditioner,
bmc.otherConfig,
bmc.rearAxleRatio,
bmc.rearAxleValue,
bmc.tireSize,
bmc.slowMachine,
bmc.rearViewMirror,
bmc.wheelbase,
bmc.suspension,
bmc.packingCase,
bmc.seat,
bmc.hubMaterial,
bmc.configuringBao,
bmc.multimedia,
bmc.bumper,
bmc.brandName,
bmc.configCode,
bvm.manufacturer,
bvm.vehicleTypeValue,
bvm.productLineValue,
bvm.emissionStandardValue,
bvm.driveFormValue,
bvm.powerValue,
bvm.gearboxTypeValue,
bvm.fuelTypeValue,
bvm.vehicleVersionValue,
bvm.engineTypeValue,
bvm.specifications,
bvm.department,
bvm.departmentValue,
bvm.vehicleAlias,
bvm.vehicleTypeCode,
bvm.announcementModel,
bvm.marketSegmentsValue,
bvcf.certificateStateValue,
bvcf.carModel,
bvm.modelName AS modelNameQuan,
bvm.`brandName` AS vehModelBrandName,
(select bbc.guidedPrice from base_vehmodel_config bbc where bbc.modelSid = bv.modelSid
and bbc.useOrgSid =bv.useOrgSid
AND bmc.sid=bbc.configurationItemsSid ) as guidedPrice
FROM
base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.`modelConfigSid` = bmc.`sid`
LEFT JOIN base_vehicle_certificate bvcf ON bv.`sid` = bvcf.`vehicleSid`
LEFT JOIN base_vehmodel_config bvc ON bvm.`sid` = bvc.`modelSid`
LEFT JOIN anrui_portal.sys_organization so ON bv.createOrgSid = so.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -130,6 +130,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
private ScmApplyInboundFeign scmApplyInboundFeign;
@Autowired
private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
/**
* 财务模块中的金蝶接口
*/
@ -161,7 +162,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
List<BaseVehicleVo> records = page.getRecords();
for (BaseVehicleVo record : records) {
String manPurOrderTypeValue = record.getManPurOrderTypeValue();
if (manPurOrderTypeValue.equals("外采")) {
if (("外采").equals(manPurOrderTypeValue)) {
record.setLibraryAge(Long.parseLong("0"));
} else {
//厂家库龄
@ -436,7 +437,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
}
//调车入库生成台账
if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode()))
baseVehicleService.saveVeh_tc(baseVehicle,baseVehicleDto.getCallOutOrgSid());
baseVehicleService.saveVeh_tc(baseVehicle, baseVehicleDto.getCallOutOrgSid());
}
String cgrkdSid = "";
if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) {
@ -583,7 +584,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
}
}*//*
*//*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采
*//*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采
//根据外采编号查询外采的申请人部门
BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getOrderingNo());
String createBySid = baseOutsourcingApplication.getCreateBySid();
@ -613,14 +614,14 @@ public class BaseVehicleRest implements BaseVehicleFeign {
String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid());
stkInStock.setFSupplierId(manCode);
}*//*
*//**
* // 入库日期:FDate (必填项)
*//*
*//**
* // 入库日期:FDate (必填项)
*//*
stkInStock.setFDate(baseVehicle.getPriceDate());
*//**
* // 物料列表:FInStockEntry (必填项)
*//*
* // 物料列表:FInStockEntry (必填项)
*//*
List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
//直接调拨单的物料列表
List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
@ -628,20 +629,20 @@ public class BaseVehicleRest implements BaseVehicleFeign {
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
sf.setWlfz(baseVehicleDto.getCarBrandCode());
*//**
* 物料分组
*//*
*//*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid());
* 物料分组
*//*
*//*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid());
if (baseVehicleBrand != null) {
sf.setWlfz(baseVehicleBrand.getBrandCode());
}*//*
*//**
* 单价 对应厂家结算价
*//*
*//**
* 单价 对应厂家结算价
*//*
sf.setFPrice(baseVehicleDto.getCostPrice() + "");
*//**
* 车辆类型
*//*
* 车辆类型
*//*
//厂家采购
if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) ||
ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {
@ -666,16 +667,16 @@ public class BaseVehicleRest implements BaseVehicleFeign {
sf.setFCategoryIDKey(baseVehicleDto.getManPurOrderTypeKey());
*//**
* // 批号:FLot
*//*
* // 批号:FLot
*//*
sf.setFLot(baseVehicleDto.getVinNo());
*//**
* // 物料编码:FMaterialId (必填项)
*//*
* // 物料编码:FMaterialId (必填项)
*//*
sf.setFMaterialId(baseVehicleDto.getVinNo().substring(baseVehicleDto.getVinNo().length() - 8));
*//**
* // 仓库:FStockId-目前只分在途和正式两个仓库。
*//*
* // 仓库:FStockId-目前只分在途和正式两个仓库。
*//*
//仓库编码
sf.setFStockId("ARZSCK");
*//*if (StringUtils.isBlank(baseVehicleDto.getLocation())) {
@ -785,12 +786,80 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(baseVehicleSelectVo);
}
@Override
public void exportExcel(BaseVehicleExportQuery query) {
public void exportExcel(BaseVehicleExportQuery query) throws ParseException{
//得到所有要导出的数据
List<BaseVehicleExportVo> baseVehicleExportVoList = baseVehicleService.listExcel(query);
for (BaseVehicleExportVo baseVehicleExportVo : baseVehicleExportVoList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String manPurOrderTypeValue = baseVehicleExportVo.getManPurOrderTypeValue();
if (("外采").equals(manPurOrderTypeValue)) {
baseVehicleExportVo.setLibraryAge(Long.parseLong("0"));
} else {
//厂家库龄
if (baseVehicleExportVo.getPriceDate() != null) {
//厂家入库日期
Date priceDate = sdf.parse(baseVehicleExportVo.getPriceDate());
if (baseVehicleExportVo.getSolidDate() != null){
//买断日期
Date solidDate = sdf.parse(baseVehicleExportVo.getSolidDate());
int i = priceDate.compareTo(solidDate);
long betweenDay = DateUtil.between(priceDate, solidDate, DateUnit.DAY);
baseVehicleExportVo.setLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = priceDate.compareTo(currentDate);
long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
baseVehicleExportVo.setLibraryAge(betweenDay * i * -1);
}
}
}
//公司库龄
if (baseVehicleExportVo.getDepartureDate() != null) {
//发车日期
Date departureDate = sdf.parse(baseVehicleExportVo.getDepartureDate());
if (baseVehicleExportVo.getSalesDate() != null) {
//销售日期
Date salesDate = sdf.parse(baseVehicleExportVo.getSalesDate());
int i = departureDate.compareTo(salesDate);
long betweenDay = DateUtil.between(departureDate, salesDate, DateUnit.DAY);
baseVehicleExportVo.setOrgLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = departureDate.compareTo(currentDate);
long betweenDay = DateUtil.between(departureDate, currentDate, DateUnit.DAY);
baseVehicleExportVo.setOrgLibraryAge(betweenDay * i * -1);
}
}
//买断库龄
if (baseVehicleExportVo.getSolidDate() != null) {
//买断日期
Date solidDate = sdf.parse(baseVehicleExportVo.getSolidDate());
if (baseVehicleExportVo.getSalesDate() != null) {
//销售日期
Date salesDate = sdf.parse(baseVehicleExportVo.getSalesDate());
int i = solidDate.compareTo(salesDate);
long betweenDay = DateUtil.between(solidDate, salesDate, DateUnit.DAY);
baseVehicleExportVo.setSettlementLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = solidDate.compareTo(currentDate);
long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY);
baseVehicleExportVo.setSettlementLibraryAge(betweenDay * i * -1);
}
}
String vinNo = baseVehicleExportVo.getVinNo();
if (StringUtils.isNotBlank(vinNo)) {
baseVehicleExportVo.setLastVinNo(vinNo.substring(vinNo.length() - 8));
}
}
//定义导出的excel名字
String excelName = "车辆管理列表";
String excelName = "车辆台账列表";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
@ -801,6 +870,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
ExportExcelUtils.export(fileNameURL, baseVehicleExportVoList, BaseVehicleExportVo.class, response);
}
@Override
public ResultBean deleteBySids(String sids) {
List<String> sidList = Arrays.asList(sids.split(","));
@ -879,6 +949,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
* @param pq 查询条件
* @return
*/
@Override
public ResultBean<PagerVo<BaseVehicleListVo>> exiCarPagerList(PagerQuery<ExiCarQuery> pq) {
ResultBean<PagerVo<BaseVehicleListVo>> rb = ResultBean.fireFail();

177
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -505,6 +505,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @return
*/
public List<BaseVehicleExportVo> listExcel(BaseVehicleExportQuery pagerQuery) {
QueryWrapper<BaseVehicleExportVo> qw = new QueryWrapper<>();
List<String> sids = pagerQuery.getSids();
if (sids != null) {
@ -512,21 +513,167 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.in("bv.sid", sids);
}
}
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
qw.like("bv.vinNo", pagerQuery.getVinNo());
}
if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称
qw.like("bvm.modelName", pagerQuery.getModelName());
}
if (StringUtils.isNotBlank(pagerQuery.getLocation())) {//存放地点
qw.like("bv.location", pagerQuery.getLocation());
if (pagerQuery != null) {
qw.eq("bv.isDelete", "0");
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
}
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
qw.like("bv.vinNo", pagerQuery.getVinNo());
}
if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称
qw.like("bv.modelName", pagerQuery.getModelName());
}
if (StringUtils.isNotBlank(pagerQuery.getLocation())) {//存放地点
qw.like("bv.location", pagerQuery.getLocation());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//库存状态
qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
}
if (StringUtils.isNotBlank(pagerQuery.getCertificateStateValue())) {//合格证状态value
qw.eq("bvcf.certificateStateValue", pagerQuery.getCertificateStateValue());
}
if (StringUtils.isNotBlank(pagerQuery.getInsideCode())) {//内部编码
qw.like("bv.insideCode", pagerQuery.getInsideCode());
}
if (StringUtils.isNotBlank(pagerQuery.getManPurOrderTypeKey())) {//采购类型
qw.eq("bv.manPurOrderTypeKey", pagerQuery.getManPurOrderTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getPriceDate())) {//厂家入库日期
qw.eq("bv.priceDate", pagerQuery.getPriceDate());
}
if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
}
//车型字段
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌
qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleType())) {//功能
qw.eq("bvm.vehicleType", pagerQuery.getVehicleType());
}
if (StringUtils.isNotBlank(pagerQuery.getProductLine())) {//系列
qw.eq("bvm.productLine", pagerQuery.getProductLine());
}
if (StringUtils.isNotBlank(pagerQuery.getDriveForm())) {//驱动
qw.eq("bvm.driveForm", pagerQuery.getDriveForm());
}
if (StringUtils.isNotBlank(pagerQuery.getPower())) {//马力
qw.eq("bvm.power", pagerQuery.getPower());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) {//版本
qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
}
if (StringUtils.isNotBlank(pagerQuery.getFuelType())) {//燃料
qw.eq("bvm.fuelType", pagerQuery.getFuelType());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleTypeCode())) {//车型编码
qw.like("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode());
}
if (StringUtils.isNotBlank(pagerQuery.getTranCaseTypeKey())) {//变速箱类型
qw.eq("bvm.tranCaseTypeKey", pagerQuery.getTranCaseTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getGearboxType())) {//变速箱
qw.eq("bvm.gearboxType", pagerQuery.getGearboxType());
}
if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) {//排放标准
qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
}
if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {//发动机型号
qw.eq("bvm.engineType", pagerQuery.getEngineType());
}
if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) {//细分市场
qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
}
if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {//规格型号
qw.like("bvm.specifications", pagerQuery.getSpecifications());
}
//车型配置字段
if (StringUtils.isNotBlank(pagerQuery.getCarColorKey())) {//颜色
qw.eq("bmc.carColorKey", pagerQuery.getCarColorKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSlowMachineKey())) {//缓速器
qw.eq("bmc.slowMachineKey", pagerQuery.getSlowMachineKey());
}
if (StringUtils.isNotBlank(pagerQuery.getRearViewMirrorKey())) {//后视镜
qw.eq("bmc.rearViewMirrorKey", pagerQuery.getRearViewMirrorKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSpecificationKey())) {//驾驶室
qw.eq("bmc.specificationKey", pagerQuery.getSpecificationKey());
}
if (StringUtils.isNotBlank(pagerQuery.getRearAxleKey())) {//后桥
qw.eq("bmc.rearAxleKey", pagerQuery.getRearAxleKey());
}
if (StringUtils.isNotBlank(pagerQuery.getRearAxleRatioKey())) {//速比
qw.eq("bmc.rearAxleRatioKey", pagerQuery.getRearAxleRatioKey());
}
if (StringUtils.isNotBlank(pagerQuery.getAirConditionerKey())) {//空调
qw.eq("bmc.airConditionerKey", pagerQuery.getAirConditionerKey());
}
if (StringUtils.isNotBlank(pagerQuery.getHubMaterialKey())) {//轮毂材质
qw.eq("bmc.hubMaterialKey", pagerQuery.getHubMaterialKey());
}
if (StringUtils.isNotBlank(pagerQuery.getBaffleModelKey())) {//导流罩
qw.eq("bmc.baffleModelKey", pagerQuery.getBaffleModelKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSuspensionKey())) {//悬架
qw.eq("bmc.suspensionKey", pagerQuery.getSuspensionKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSeatKey())) {//座椅
qw.eq("bmc.seatKey", pagerQuery.getSeatKey());
}
if (StringUtils.isNotBlank(pagerQuery.getTireCoverKey())) {//护轮罩
qw.eq("bmc.tireCoverKey", pagerQuery.getTireCoverKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSaddleKey())) {//鞍座
qw.eq("bmc.saddleKey", pagerQuery.getSaddleKey());
}
if (StringUtils.isNotBlank(pagerQuery.getWheelbaseKey())) {//轴距
qw.eq("bmc.wheelbaseKey", pagerQuery.getWheelbaseKey());
}
if (StringUtils.isNotBlank(pagerQuery.getBumperKey())) {//保险杠
qw.eq("bmc.bumperKey", pagerQuery.getBumperKey());
}
if (StringUtils.isNotBlank(pagerQuery.getConfiguringBaoKey())) {//配置包
qw.eq("bmc.configuringBaoKey", pagerQuery.getConfiguringBaoKey());
}
if (StringUtils.isNotBlank(pagerQuery.getIndependentSourcesKey())) {//独立热源
qw.eq("bmc.independentSourcesKey", pagerQuery.getIndependentSourcesKey());
}
if (StringUtils.isNotBlank(pagerQuery.getFuelTankKey())) {//燃料箱
qw.eq("bmc.fuelTankKey", pagerQuery.getFuelTankKey());
}
if (StringUtils.isNotBlank(pagerQuery.getMultimediaKey())) {//多媒体
qw.eq("bmc.multimediaKey", pagerQuery.getMultimediaKey());
}
if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
qw.eq("bmc.configName", pagerQuery.getConfigName());
}
qw.orderByDesc("bv.createOrgSid");
qw.orderByDesc("bv.priceDate");
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//车辆状态
qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
//======================
// if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
// qw.like("bv.vinNo", pagerQuery.getVinNo());
// }
// if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称
// qw.like("bvm.modelName", pagerQuery.getModelName());
// }
// if (StringUtils.isNotBlank(pagerQuery.getLocation())) {//存放地点
// qw.like("bv.location", pagerQuery.getLocation());
//
// }
// if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//车辆状态
// qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
// }
List<BaseVehicleExportVo> baseVehicleExportVoList = baseMapper.selByExcel(qw);
int id = 1;
for (BaseVehicleExportVo baseVehicleExportVo : baseVehicleExportVoList) {
baseVehicleExportVo.setRankNo(id);
id = id + 1;
}
return baseMapper.listExcel(qw);
return baseVehicleExportVoList;
}
/**
@ -853,8 +1000,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
configDetailVo.setDateLong(time);
}
}
configDetailVo.setVehicleTypeCode("车型信息（"+configDetailVo.getVehicleTypeCode()+"）");
configDetailVo.setConfigCode("常用配置（"+configDetailVo.getConfigCode()+"）");
configDetailVo.setVehicleTypeCode("车型信息（" + configDetailVo.getVehicleTypeCode() + "）");
configDetailVo.setConfigCode("常用配置（" + configDetailVo.getConfigCode() + "）");
//车型详细配置数据
@ -1309,7 +1456,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private QueryWrapper<VehicleModelPriceVo> appExistingCarBuildQW(VehicleModelPriceQuery pagerQuery) {
QueryWrapper<VehicleModelPriceVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(pagerQuery.getName())) { // 车型名称
qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", pagerQuery.getName()).or().like("bvm.vehicleTypeCode", pagerQuery.getName()).or().like("bmc.configCode",pagerQuery.getName()));
qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", pagerQuery.getName()).or().like("bvm.vehicleTypeCode", pagerQuery.getName()).or().like("bmc.configCode", pagerQuery.getName()));
}
if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard());

Write Preview
Loading…
Cancel
Save