Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -47,6 +47,8 @@ public class BaseVehicle extends BaseEntity {
     @ApiModelProperty("发动机号/许可证号（陕汽必须的字段）")
     private String engineNo;
 
+    @ApiModelProperty(value = "备注")
+    private String remarks;
     /*@ApiModelProperty("制造日期（陕汽必须的字段）")
     private Date manufactureDate;*/
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@@ -114,4 +114,8 @@ public class BaseVehicleDto implements Dto {
     private String manufSaleAccessSid;
     @ApiModelProperty(value = "厂家销售通路名称")
     private String manufSaleAccessName;
+    @ApiModelProperty(value = "买断备注")
+    private String rebate1;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java

@@ -36,4 +36,89 @@ public class BaseVehicleQuery implements Query {
     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 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 = "排放标准")
+    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;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@@ -1,6 +1,8 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -48,26 +50,26 @@ public class BaseVehicleSelectVo implements Vo {
     @ApiModelProperty(value = "厂家采购订单类型value")
     private String manPurOrderTypeValue;
     @ApiModelProperty(value = "厂家入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date priceDate;
     @ApiModelProperty("发车日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date departureDate;
     @ApiModelProperty("到货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date arrivalDate;
     @ApiModelProperty("销售日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date salesDate;
     @ApiModelProperty(value = "买断日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date solidDate;
     @ApiModelProperty("结算状态key")
     private String settlementStatus;
     @ApiModelProperty("结算状态value")
     private String settlementStatusValue;
     @ApiModelProperty("采购退库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date returnDate;
     @ApiModelProperty("存放地点（陕汽必须的字段）")
     private String location;
@@ -103,4 +105,22 @@ public class BaseVehicleSelectVo implements Vo {
     private String manufSaleAccessSid;
     @ApiModelProperty(value = "厂家销售通路名称")
     private String manufSaleAccessName;
+
+    @ApiModelProperty("全款/贷款组合字段")
+    private String price;
+    @ApiModelProperty(value = "销售指导价（全款）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guidedPrice;
+    @ApiModelProperty(value = "销售指导价（贷款）")
+    private String manufactorSettlementPrice;
+
+
+    @ApiModelProperty("厂家合同价（挂账价）")
+    private String contractPrice;
+    @ApiModelProperty("运费")
+    private String freight;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("买断备注")
+    private String rebate1;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -110,6 +110,16 @@ public interface BaseVehmodelConfigFeign {
     @PostMapping("selVehModelByUseOrgSidAndModelSidAndConfigSid")
     ResultBean<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(@RequestBody PagerQuery<BaseVehmodelConfigQuerys> pq);
 
+    /**
+     * 根据分公司sid查询车型和常用配置关联表
+     * 排除已选择的车型与常用配置关联sid并查询其他
+     * @return
+     */
+    @ApiOperation("根据分公司sid查询车型和常用配置关联表(车辆台账使用)")
+    @PostMapping("/selVehModelByUseOrgSidAll")
+    ResultBean<PagerVo<BaseVehmodelConfigVehicleVos>> selVehModelByUseOrgSidAll(@RequestBody PagerQuery<BaseVehmodelConfigVehicleQuery> pq);
+
+
     /**
      * 调车选择车型
      * @return

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@@ -92,6 +92,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehmodelConfigVehicleVos>> selVehModelByUseOrgSidAll(PagerQuery<BaseVehmodelConfigVehicleQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<BaseVehmodelConfigVos>> purVehModel(PagerQuery<BaseVehmodelConfigQuerys> pq) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseVehmodelConfigVehicleQuery implements Query {
+    private static final long serialVersionUID = -349137436625968312L;
+
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "常用配置名称")
+    private String configName;
+    @ApiModelProperty(value = "分公司sid")
+    private String useOrgSid;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseVehmodelConfigVehicleVos implements Vo {
+    private static final long serialVersionUID = 5468003291227239951L;
+
+
+    @ApiModelProperty("全款/贷款组合字段（用于车辆台账选择接口）")
+    private String price;
+    @ApiModelProperty(value = "销售指导价（全款）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guidedPrice;
+    @ApiModelProperty(value = "销售指导价（贷款）")
+    private String manufactorSettlementPrice;
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "常用配置名称")
+    private String configName;
+    @ApiModelProperty(value = "常用配置sid")
+    private String configSid;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -481,7 +481,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         /**
                          * 物料分组
                          */
-                        sf.setWlfzType("01");
+                        //sf.setWlfzType("01");
                         fInStockEntry.add(sf);
                     }
                     stkInStock.setFInStockEntry(fInStockEntry);

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

@@ -12,30 +12,98 @@
     </select>
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
-        SELECT
-        bv.*,
-        bmc.*,
-        bvm.*,
-        bvc.sid AS vehModelConfigSid,
-        bvc.`guidedPrice`,
+        SELECT distinct
+        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,
+        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,
         bvm.modelName AS modelNameQuan,
-        bvm.`brandName` AS vehModelBrandName
+        bvm.`brandName` AS vehModelBrandName,
+        (select bbc.guidedPrice from base_vehmodel_config bbc where bbc.modelSid = bv.modelSid and bbc.useOrgSid = bv.useOrgSid) as guidedPrice
         FROM
         base_vehicle bv
-        LEFT JOIN base_vehmodel_config bvc
-        ON bv.`modelSid` = bvc.`modelSid`
-        AND bv.`modelConfigSid` = bvc.`configurationItemsSid`
-        AND bv.createOrgSid = bvc.useOrgSid
-        LEFT JOIN base_vehicle_certificate bvcf
-        ON bv.`sid` = bvcf.`vehicleSid`
-        AND bv.createOrgSid = bvcf.createOrgSid
-        LEFT JOIN base_model_config bmc
-        ON bv.`modelConfigSid` = bmc.`sid`
-        AND bv.`createOrgSid` = bmc.createOrgSId
-        LEFT JOIN base_vehicle_model bvm
-        ON bv.`modelSid` = bvm.`sid`
-        AND bv.`createOrgSid` = bvm.createOrg
+        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`
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -301,7 +301,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                 /**
                  * 物料分组
                  */
-                sf.setWlfzType("01");
+               // sf.setWlfzType("01");
                 fInStockEntry.add(sf);
             }
             stkInStock.setFInStockEntry(fInStockEntry);

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

@@ -12,6 +12,7 @@ import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -146,6 +147,119 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             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.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.priceDate");
         }
         return qw;
@@ -180,6 +294,22 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public BaseVehicleSelectVo details(String sid) {
         BaseVehicleSelectVo baseVehicleSelectVo = baseMapper.details(sid);
+        ResultBean<BaseVehmodelVo> baseVehmodelVoResultBean = baseVehmodelConfigService.selectOne(baseVehicleSelectVo.getModelSid(), baseVehicleSelectVo.getModelConfigSid(), baseVehicleSelectVo.getUseOrgSid());
+        BaseVehmodelVo data = baseVehmodelVoResultBean.getData();
+        String price = "";
+        String manufactorSettlementPrice = data.getManufactorSettlementPrice();
+        String guidedPrice = data.getGuidedPrice();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(manufactorSettlementPrice)) {
+            price = manufactorSettlementPrice;
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(guidedPrice)) {
+                price = price + "/" + guidedPrice;
+            }
+        } else {
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(guidedPrice)) {
+                price = guidedPrice;
+            }
+        }
+        baseVehicleSelectVo.setPrice(price);
         return baseVehicleSelectVo;
     }
 
@@ -2253,16 +2383,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getWitPinStateValue())) {
             baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         }
-        if (StringUtils.isNotBlank(dto.getPurchaseSystemSid())){
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemSid())) {
             baseVehicle.setPurchaseSystemSid(dto.getPurchaseSystemSid());
         }
-        if (StringUtils.isNotBlank(dto.getPurchaseSystemName())){
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemName())) {
             baseVehicle.setPurchaseSystemName(dto.getPurchaseSystemName());
         }
-        if (StringUtils.isNotBlank(dto.getManufSaleAccessSid())){
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessSid())) {
             baseVehicle.setManufSaleAccessSid(dto.getManufSaleAccessSid());
         }
-        if (StringUtils.isNotBlank(dto.getManufSaleAccessName())){
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessName())) {
             baseVehicle.setManufSaleAccessName(dto.getManufSaleAccessName());
         }
     }
@@ -2379,16 +2509,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getWitPinStateValue())) {
             baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         }
-        if (StringUtils.isNotBlank(dto.getPurchaseSystemSid())){
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemSid())) {
             baseVehicle.setPurchaseSystemSid(dto.getPurchaseSystemSid());
         }
-        if (StringUtils.isNotBlank(dto.getPurchaseSystemName())){
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemName())) {
             baseVehicle.setPurchaseSystemName(dto.getPurchaseSystemName());
         }
-        if (StringUtils.isNotBlank(dto.getManufSaleAccessSid())){
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessSid())) {
             baseVehicle.setManufSaleAccessSid(dto.getManufSaleAccessSid());
         }
-        if (StringUtils.isNotBlank(dto.getManufSaleAccessName())){
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessName())) {
             baseVehicle.setManufSaleAccessName(dto.getManufSaleAccessName());
         }
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -115,7 +115,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     BaseVehmodelConfigVo fetchAllBySid(String sid);
 
-    BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("orgSid")String orgSid);
+    BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid);
 
     AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
 
@@ -129,10 +129,12 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
 
-    IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
+    IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
 
     BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
 
     @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice} where sid = #{sid}")
-    void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice,@Param("sid") String sid);
+    void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice, @Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice, @Param("sid") String sid);
+
+    IPage<BaseVehmodelConfigVehicleVos> selVehModelByUseOrgSidAll(IPage<BaseVehmodelConfig> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVehicleVos> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -331,4 +331,23 @@
           and configurationItemsSid = #{configSid}
           and useOrgSid = #{useOrgSid}
     </select>
+    <select id="selVehModelByUseOrgSidAll"
+            resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVehicleVos">
+        SELECT bvm.`vehicleAlias`,
+        bvm.sid as modelSid,
+        bmc.`configName`,
+        bmc.sid as configSid,
+        bvc.`guidedPrice`,
+        bvc.manufactorSettlementPrice
+        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_brand bb on bb.sid = bvm.carBrand
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -126,6 +126,13 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehmodelConfigVehicleVos>> selVehModelByUseOrgSidAll(PagerQuery<BaseVehmodelConfigVehicleQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehmodelConfigVehicleVos> pv = baseVehmodelConfigService.selVehModelByUseOrgSidAll(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<PagerVo<BaseVehmodelConfigVos>> purVehModel(PagerQuery<BaseVehmodelConfigQuerys> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -676,6 +676,43 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return p;
     }
 
+    public PagerVo<BaseVehmodelConfigVehicleVos> selVehModelByUseOrgSidAll(PagerQuery<BaseVehmodelConfigVehicleQuery> pq) {
+        BaseVehmodelConfigVehicleQuery query = pq.getParams();
+        QueryWrapper<BaseVehmodelConfigVehicleVos> qw = new QueryWrapper<>();
+        qw.eq("bvc.useOrgSid", query.getUseOrgSid());
+        qw.like("bb.useOrg", query.getUseOrgSid());
+        if (StringUtils.isNotBlank(query.getVehicleAlias())) {
+            qw.like("bvm.vehicleAlias", query.getVehicleAlias());
+        }
+        if (StringUtils.isNotBlank(query.getConfigName())) {
+            qw.like("bmc.configName", query.getConfigName());
+        }
+        qw.eq("bvm.isDelete", 0);
+        qw.eq("bmc.isDelete", 0);
+        IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehmodelConfigVehicleVos> pagging = baseMapper.selVehModelByUseOrgSidAll(page, qw);
+        List<BaseVehmodelConfigVehicleVos> records = pagging.getRecords();
+        for (BaseVehmodelConfigVehicleVos record : records) {
+            //查询车型与配置对应台账的库存台数
+            String price = "";
+            String manufactorSettlementPrice = record.getManufactorSettlementPrice();
+            String guidedPrice = record.getGuidedPrice();
+            if (StringUtils.isNotBlank(manufactorSettlementPrice)) {
+                price = manufactorSettlementPrice;
+                if (StringUtils.isNotBlank(guidedPrice)) {
+                    price = price + "/" + guidedPrice;
+                }
+            } else {
+                if (StringUtils.isNotBlank(guidedPrice)) {
+                    price = guidedPrice;
+                }
+            }
+            record.setPrice(price);
+        }
+        PagerVo<BaseVehmodelConfigVehicleVos> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public PagerVo<BaseVehmodelConfigVos> purVehModel(PagerQuery<BaseVehmodelConfigQuerys> pq) {
         BaseVehmodelConfigQuerys query = pq.getParams();
         QueryWrapper<BaseVehmodelConfigVos> qw = new QueryWrapper<>();

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java

@@ -83,4 +83,7 @@ public class ScmWarehouse extends BaseEntity {
 
     @ApiModelProperty("库管人员姓名")
     private String libTubeName; // 库管人员姓名
+
+    @ApiModelProperty("库存地点编号")
+    private String gressionCode;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java

@@ -82,4 +82,7 @@ public class ScmWarehouseDto implements Dto {
 
 	@ApiModelProperty("库管人员姓名")
 	private String libTubeName; // 库管人员姓名
+
+	@ApiModelProperty("库存地点编号")
+	private String gressionCode;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@@ -84,4 +84,7 @@ public class ScmWarehouseVo implements Vo {
 
 	@ApiModelProperty("库管人员姓名")
 	private String libTubeName; // 库管人员姓名
+
+	@ApiModelProperty("库存地点编号")
+	private String gressionCode;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -601,8 +601,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 //bm.setFCreateOrgId("100");//创建机构
                 ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(s.getVinNo(),scmApplyInbound.getUseOrgSid());
                 bm.setFName(baseVehicleResultBean.getData().getVinNo());//物料名称
-                bm.setFMaterialGroupKey("03");//物料分组
-                bm.setFMaterialGroupType("03");//物料分组
+                bm.setFMaterialGroup("03");//物料分组
                 //bm.setFUseOrgId("100");//使用组织
                 bm.setTOrgIds("100020");//欧曼黑龙江
                 bm.setF_PAEZ_BaseKey("牵引");//车辆类型