车型的指导价字段修改，验车检查表返回的项目内容修改

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

@@ -7,6 +7,9 @@ import lombok.Data;
 @Data
 public class AppBaseVinNowCarVo implements Vo {
 
+    @ApiModelProperty("车辆sid")
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vin;
 

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

@@ -787,7 +787,8 @@
     </select>
 
     <select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
-        SELECT vinNo             AS vin,
+        SELECT bv.sid,
+               vinNo             AS vin,
                vehicleStateValue AS `state`,
                carColor          AS color,
                locationName      AS address
@@ -805,7 +806,7 @@
     <select id="selectByModelSidAndConfigSid"
             resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
         SELECT bvm.vehicleAlias AS modelName,
-               bc.guidedPrice   AS price,
+        convert(bc.guidedPrice/10000,decimal(10,2))   AS price,
                bmc.configName   AS commonlyConfig
         FROM base_vehmodel_config bc
                      LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
@@ -818,7 +819,7 @@
     <select id="getModelSidAndConfigSid"
             resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
         select bvm.vehicleAlias AS modelName,
-               bvc.guidedPrice  AS price,
+               convert(bvc.guidedPrice/10000,decimal(10,2))  AS price,
                bmc.configName   AS commonlyConfig
         from base_vehmodel_config bvc
                      LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
+import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@@ -8,6 +9,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
@@ -786,7 +788,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.like("bvm.modelName", pagerQuery.getName());
+            qw.like("bvm.vehicleAlias", pagerQuery.getName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
             qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard());
@@ -1359,7 +1361,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<AppBaseVinNowCarVo> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppBaseVinNowCarVo> pagging = baseMapper.getModelNowCarList(page, qw);
         for (AppBaseVinNowCarVo record : pagging.getRecords()) {
-            record.setCertificate("虚拟/正式");
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateService.selStateByVehicleSid(record.getSid());
+            if (baseVehicleCertificateVo != null){
+                record.setCertificate(baseVehicleCertificateVo.getCertificateStateValue());
+            }
             vinNowCarVos.add(record);
         }
         appBaseConfigNowCarVo.setRecords(vinNowCarVos);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -87,4 +87,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     BaseVehicleCertificate selectByVehicleSid(String carSid);
 
     int checkByCertificationNo(String certificationNo);
+
+    BaseVehicleCertificateVo selStateByVehicleSid(@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -184,4 +184,11 @@
         WHERE certificationNo = #{certificationNo}
           AND isDelete = 0
     </select>
+
+    <select id="selStateByVehicleSid"
+            resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo">
+        select *
+        from base_vehicle_certificate
+        where vehicleSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -140,6 +140,15 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         return baseMapper.deleteBySids(sidsList);
     }
 
+    /**
+     * 根据车辆台账sid查询合格证状态
+     *
+     * @param sid
+     * @return
+     */
+    public BaseVehicleCertificateVo selStateByVehicleSid(String sid){
+       return baseMapper.selStateByVehicleSid(sid);
+    }
 
     public int updateBySidIsDelete(String sid) {
         return baseMapper.updateBySidIsDelete(sid);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -32,7 +32,7 @@
                cvcd.modelName,
                cvcd.modelSid,
                cvcd.comonConfigSid,
-               cvcd.saleReferencePrice                  AS guidancePrice,
+               convert(cvcd.saleReferencePrice/10000,decimal(10,2))   AS guidancePrice,
                DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime,
                cvcd.purchaseMethodValue                 AS purchaseType,
                cvcd.purchaseMethod                      as purchaseKey,
@@ -80,7 +80,7 @@
                         cvcd.modelName,
                         cvcd.brandName,
                         cvcd.createTime,
-                        cvcd.saleReferencePrice  AS guidancePrice,
+                        convert(cvcd.saleReferencePrice/10000,decimal(10,2))  AS guidancePrice,
                         cvcd.purchaseMethodValue AS purchaseType
         FROM crm_visit cv
                  LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
@@ -120,7 +120,7 @@
                cv.modelSid,
                cv.modelName,
                cv.brandName           AS brand,
-               cv.saleReferencePrice  AS price,
+               convert(cv.saleReferencePrice/10000,decimal(10,2)) AS price,
                cv.vehicleModelOffer   AS quotation,
                cv.comonConfigSid      AS configSid,
                cv.number,

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java

@@ -60,9 +60,21 @@ public class AppScmVehicleEnterlibraryCarWarehousingDto implements Dto {
     @ApiModelProperty("订单类型")
     private String purchaseTypeKey;
 
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid;
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
     @ApiModelProperty("车型")
     private String modelName;
 
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("配置")
+    private String configName;
+
     @ApiModelProperty("发车日期")
     private String departureDate;
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -26,8 +26,10 @@
 package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.VehicleEnterlibrary;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -223,7 +225,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     }
 
     /**
-     * 手机端-初始化验车单信息
+     * 手机端-初始化入库信息
      *
      * @param warehousingSid
      * @param userSid
@@ -250,7 +252,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     }
 
     /**
-     * 手机端-保存验车单
+     * 手机端-保存入库
      *
      * @param dto
      * @return
@@ -290,6 +292,35 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     scmFile1.setLinkSid(dto.getWarehousingSid());
                     scmFileService.save(scmFile1);
                 }
+                //车辆台账推送数据
+                BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
+                baseVehicleDto.setVinNo(dto.getVin());
+                String userSid = dto.getUserSid();
+                ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+                String data2 = pathSidByUserSid.getData();
+                baseVehicleDto.setCreateOrgSid(data2);
+                baseVehicleDto.setUseOrgSid(data2);
+                baseVehicleDto.setSettlementStatus("0");
+                baseVehicleDto.setLockedState("0");
+                baseVehicleDto.setLockedStateValue("未锁定");
+                baseVehicleDto.setVehicleState("0001");
+                baseVehicleDto.setVehicleStateValue("库存");
+                baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
+                baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
+                baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
+                if ("01".equals(scmVehicleEnterlibrary.getPurchaseTypeKey())){
+                    baseVehicleDto.setCertificateState("0003");
+                    baseVehicleDto.setCertificateStateValue("待转");
+                }
+                baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
+                baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
+                baseVehicleDto.setLocation(dto.getWarehouseKey());
+                baseVehicleDto.setLocationName(dto.getWarehouse());
+                baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());
+                baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());
+                baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());
+                baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());
+                baseVehicleFeign.save(baseVehicleDto);
                 return rb.success().setMsg("操作成功！");
             } else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) {
                 return rb.fail().setMsg("当前车辆已入库，请勿重复保存");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -460,6 +460,10 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType());
                     carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey());
                     carWarehousingDto.setModelName(scmVehicleExamine.getModelName());
+                    carWarehousingDto.setModelSid(scmVehicleExamine.getModelSid());
+                    carWarehousingDto.setConfigSid(scmVehicleExamine.getConfigSid());
+                    carWarehousingDto.setConfigName(scmVehicleExamine.getConfigName());
+                    carWarehousingDto.setVehicleSid(scmVehicleExamine.getVehicleSid());
                     carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate());
                     carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate());
                     carWarehousingDto.setInspection(scmVehicleExamine.getInspection());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@@ -151,7 +151,8 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
         String text = "";
         for (int i = 0; i < itemDetailVoList.size(); i++) {
             String itemConten = itemDetailVoList.get(i).getItemContent() + "\n";
-            text = text + itemConten;
+            String sortNo = itemDetailVoList.get(i).getSortNo() + ".";
+            text = text + sortNo + itemConten;
         }
         vo.setItemConten(text.substring(0, text.length() - 2));