Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java

@@ -34,10 +34,10 @@ public class BaseDistributor extends BaseEntity {
     @ApiModelProperty("成立时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date setUpTime;
-    @ApiModelProperty("注册（登记）地址（省市县）")
-    private String registAddress;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+    @ApiModelProperty("经营地址（省市县）code")
+    private String managementAddressCode;
     @ApiModelProperty("经营地址（省市县）")
     private String managementAddress;
     @ApiModelProperty("实际经营地址")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java

@@ -29,24 +29,12 @@ public class BaseDistributorDetailsVo implements Vo {
     @ApiModelProperty("成立时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date setUpTime;
-    @ApiModelProperty("注册（登记）地址（省市县）")
-    private String registAddress;
-    @ApiModelProperty("注册（登记）地址（省）")
-    private String registAddressProvince;
-    @ApiModelProperty("注册（登记）地址（市）")
-    private String registAddressCity;
-    @ApiModelProperty("注册（登记）地址（县）")
-    private String registAddressCounty;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+    @ApiModelProperty("经营地址（省市县）code")
+    private String managementAddressCode;
     @ApiModelProperty("经营地址（省市县）")
     private String managementAddress;
-    @ApiModelProperty("经营地址（省）")
-    private String managementAddressProvince;
-    @ApiModelProperty("经营地址（市）")
-    private String managementAddressCity;
-    @ApiModelProperty("经营地址（县）")
-    private String managementAddressCounty;
     @ApiModelProperty("实际经营地址")
     private String managementDetailAddress;
     @ApiModelProperty("联系人")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java

@@ -42,10 +42,10 @@ public class BaseDistributorDto implements Dto {
     @ApiModelProperty("成立日期")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date setUpTime;
-    @ApiModelProperty("注册（登记）地址（省市县）")
-    private String registAddress;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+    @ApiModelProperty("经营地址（省市县）code")
+    private String managementAddressCode;
     @ApiModelProperty("经营地址（省市县）")
     private String managementAddress;
     @ApiModelProperty("实际经营地址")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@@ -36,10 +36,10 @@ public class BaseDistributorVo implements Vo {
     @ApiModelProperty("成立时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date setUpTime;
-    @ApiModelProperty("注册（登记）地址（省市县）")
-    private String registAddress;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+    @ApiModelProperty("经营地址（省市县）code")
+    private String managementAddressCode;
     @ApiModelProperty("经营地址（省市县）")
     private String managementAddress;
     @ApiModelProperty("实际经营地址")

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmInventoryRecordsVo implements Vo {
+
+    @ApiModelProperty("列表sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+}

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

@@ -0,0 +1,33 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseExistingCarListVo implements Vo {
+
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String brandName;
+    @ApiModelProperty(value = "车型名称")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty(value = "公告型号")
+    private String noticeModel;
+    @ApiModelProperty(value = "入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date priceDate;
+    @ApiModelProperty(value = "出库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date salesDate;
+    @ApiModelProperty(value = "库存状态key")
+    private String vehicleStateKey;
+    @ApiModelProperty(value = "库存状态value")
+    private String vehicleStateValue;
+}

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

@@ -179,6 +179,16 @@ public interface BaseVehicleFeign {
     @PostMapping("/selExistingCarPageList")
     public ResultBean<PagerVo<BaseExistingCarListPageVo>> selExistingCarPageList(@RequestBody PagerQuery<BaseExistingCarPageQuery> pagerQuery);
 
+    /**
+     * 获取当前分公司的车辆信息
+     * 2022/3/31
+     *
+     * @return
+     */
+    @ApiOperation("获取当前分公司的车辆信息")
+    @PostMapping("/selExistingCar")
+    public ResultBean<List<BaseExistingCarListVo>> selExistingCar(@RequestParam("createOrgSid") String createOrgSid);
+
     /**
      * pc排产车详情（新）
      *
@@ -273,4 +283,7 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("根据用户sid 获取库存车辆信息")
+    @GetMapping("/selectInventoryRecords/{userSid}")
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);
 }

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

@@ -101,6 +101,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseExistingCarListVo>> selExistingCar(String createOrgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(String vinNo) {
         return null;
@@ -201,4 +206,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+        return null;
+    }
+
 }

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

@@ -8,10 +8,14 @@ import lombok.Data;
 public class ExiCarConfigDetailVo implements Vo {
 
     private static final long serialVersionUID = 5960160515593151936L;
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
     @ApiModelProperty(value = "品牌")
     private String brandName;
     @ApiModelProperty(value = "功能")
     private String vehicleTypeValue;
+    @ApiModelProperty(value = "排放标准")
+    private String emissionStandardValue;
     @ApiModelProperty(value = "系列")
     private String productLineValue;
     @ApiModelProperty(value = "驱动")
@@ -35,7 +39,7 @@ public class ExiCarConfigDetailVo implements Vo {
     @ApiModelProperty(value = "货箱")
     private String packingCase;
     @ApiModelProperty(value = "系别")
-    private String department;
+    private String departmentValue;
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
     @ApiModelProperty(value = "颜色")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstall.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstall.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstall <br/>
+ * Description: 上装表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装表", description = "上装表")
+@TableName("base_vehinstall")
+public class BaseVehinstall extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("上装配置sid")
+    private String mainSid; // 上装配置sid
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("公告型号")
+    private String noticeModel; // 公告型号
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("销售指导价")
+    private String guidePrice; // 销售指导价
+	@ApiModelProperty("库存状态key")
+    private String vehicleStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String vehicleStateValue; // 库存状态value
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("出库日期")
+    private String salesDate; // 出库日期
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("创建组织")
+    private String createOrg; // 创建组织
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDetailsVo.java

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo <br/>
+ * Description: 上装表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装表 视图数据详情", description = "上装表 视图数据详情")
+public class BaseVehinstallDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("上装配置sid")
+    private String mainSid; // 上装配置sid
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("公告型号")
+    private String noticeModel; // 公告型号
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("销售指导价")
+    private String guidePrice; // 销售指导价
+	@ApiModelProperty("库存状态key")
+    private String vehicleStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String vehicleStateValue; // 库存状态value
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("出库日期")
+    private String salesDate; // 出库日期
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("创建组织")
+    private String createOrg; // 创建组织
+    @ApiModelProperty("上装配置")
+    private BaseVehinstallmodel baseVehinstallmodel; // 上装配置
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto <br/>
+ * Description: 上装表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装表 数据传输对象", description = "上装表 数据传输对象")
+public class BaseVehinstallDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("上装配置sid")
+    private String mainSid; // 上装配置sid
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("公告型号")
+    private String noticeModel; // 公告型号
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("销售指导价")
+    private String guidePrice; // 销售指导价
+	@ApiModelProperty("库存状态key")
+    private String vehicleStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String vehicleStateValue; // 库存状态value
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("出库日期")
+    private String salesDate; // 出库日期
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("创建组织")
+    private String createOrg; // 创建组织
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign <br/>
+ * Description: 上装表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "上装表")
+@FeignClient(
+        contextId = "anrui-base-BaseVehinstall",
+        name = "anrui-base",
+        path = "v1/basevehinstall",
+        fallback = BaseVehinstallFeignFallback.class)
+public interface BaseVehinstallFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseVehinstallDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeignFallback <br/>
+ * Description: 上装表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseVehinstallVo>> listPage(PagerQuery<BaseVehinstallQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehinstall/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseVehinstallDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehinstall/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehinstall/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehinstall/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallQuery.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery <br/>
+ * Description: 上装表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装表 查询条件", description = "上装表 查询条件")
+public class BaseVehinstallQuery implements Query {
+
+    @ApiModelProperty("车辆功能key")
+    private String vehicleTypeKey; // 车辆功能key
+    @ApiModelProperty("上装名称key")
+    private String installNameKey; // 上装名称key
+    @ApiModelProperty("委改方式key")
+    private String refitMethodKey; // 委改方式key
+    @ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+    @ApiModelProperty("颜色key")
+    private String colorKey; // 颜色key
+    @ApiModelProperty("板材材质key")
+    private String plateMaterialKey; // 板材材质key
+    @ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+    @ApiModelProperty("公告型号")
+    private String noticeModel; // 公告型号
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallVo.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo <br/>
+ * Description: 上装表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装表 视图数据对象", description = "上装表 视图数据对象")
+public class BaseVehinstallVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("车辆功能value")
+    private String vehicleTypeValue; // 车辆功能value
+    @ApiModelProperty("上装名称value")
+    private String installNameValue; // 上装名称value
+    @ApiModelProperty("委改方式value")
+    private String refitMethodValue; // 委改方式value
+    @ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+    @ApiModelProperty("颜色value")
+    private String colorValue; // 颜色value
+    @ApiModelProperty("板材材质value")
+    private String plateMaterialValue; // 板材材质value
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("公告型号")
+    private String noticeModel; // 公告型号
+    @ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+    @ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+    @ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+    @ApiModelProperty("销售指导价")
+    private String guidePrice; // 销售指导价
+    @ApiModelProperty("库存状态value")
+    private String vehicleStateValue; // 库存状态value
+    @ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+    @ApiModelProperty("出库日期")
+    private String salesDate; // 出库日期
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodel.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel <br/>
+ * Description: 上装配置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装配置表", description = "上装配置表")
+@TableName("base_vehinstallmodel")
+public class BaseVehinstallmodel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车辆功能key")
+    private String vehicleTypeKey; // 车辆功能key
+	@ApiModelProperty("车辆功能value")
+    private String vehicleTypeValue; // 车辆功能value
+	@ApiModelProperty("上装名称key")
+    private String installNameKey; // 上装名称key
+	@ApiModelProperty("上装名称value")
+    private String installNameValue; // 上装名称value
+	@ApiModelProperty("委改方式key")
+    private String refitMethodKey; // 委改方式key
+	@ApiModelProperty("委改方式value")
+    private String refitMethodValue; // 委改方式value
+	@ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+	@ApiModelProperty("颜色key")
+    private String colorKey; // 颜色key
+	@ApiModelProperty("颜色value")
+    private String colorValue; // 颜色value
+	@ApiModelProperty("外廓尺寸_长")
+    private String wk_long; // 外廓尺寸_长
+	@ApiModelProperty("外廓尺寸_宽")
+    private String wk_wide; // 外廓尺寸_宽
+	@ApiModelProperty("外廓尺寸_高")
+    private String wk_high; // 外廓尺寸_高
+	@ApiModelProperty("板材材质key")
+    private String plateMaterialKey; // 板材材质key
+    @ApiModelProperty("板材材质value")
+    private String plateMaterialValue; // 板材材质value
+	@ApiModelProperty("板材厚度_底")
+    private String plateThicknessBottom; // 板材厚度_底
+	@ApiModelProperty("板材厚度_边")
+    private String plateThicknessEdge; // 板材厚度_边
+	@ApiModelProperty("篷布滑道")
+    private String tarpaulinSlide; // 篷布滑道
+	@ApiModelProperty("冷藏冷机")
+    private String refrigerator; // 冷藏冷机
+	@ApiModelProperty("自卸液压盖板")
+    private String selfUnHyCoPl; // 自卸液压盖板
+	@ApiModelProperty("底板加热")
+    private String floorHeating; // 底板加热
+	@ApiModelProperty("更多配置")
+    private String moreConfig; // 更多配置
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java

@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo <br/>
+ * Description: 上装配置表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装配置表 视图数据详情", description = "上装配置表 视图数据详情")
+public class BaseVehinstallmodelDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆功能key")
+    private String vehicleTypeKey; // 车辆功能key
+	@ApiModelProperty("车辆功能value")
+    private String vehicleTypeValue; // 车辆功能value
+	@ApiModelProperty("上装名称key")
+    private String installNameKey; // 上装名称key
+	@ApiModelProperty("上装名称value")
+    private String installNameValue; // 上装名称value
+	@ApiModelProperty("委改方式key")
+    private String refitMethodKey; // 委改方式key
+	@ApiModelProperty("委改方式value")
+    private String refitMethodValue; // 委改方式value
+	@ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+	@ApiModelProperty("颜色key")
+    private String colorKey; // 颜色key
+	@ApiModelProperty("颜色value")
+    private String colorValue; // 颜色value
+	@ApiModelProperty("外廓尺寸_长")
+    private String wk_long; // 外廓尺寸_长
+	@ApiModelProperty("外廓尺寸_宽")
+    private String wk_wide; // 外廓尺寸_宽
+	@ApiModelProperty("外廓尺寸_高")
+    private String wk_high; // 外廓尺寸_高
+    @ApiModelProperty("板材材质key")
+    private String plateMaterialKey; // 板材材质key
+    @ApiModelProperty("板材材质value")
+    private String plateMaterialValue; // 板材材质value
+	@ApiModelProperty("板材厚度_底")
+    private String plateThicknessBottom; // 板材厚度_底
+	@ApiModelProperty("板材厚度_边")
+    private String plateThicknessEdge; // 板材厚度_边
+	@ApiModelProperty("篷布滑道")
+    private String tarpaulinSlide; // 篷布滑道
+	@ApiModelProperty("冷藏冷机")
+    private String refrigerator; // 冷藏冷机
+	@ApiModelProperty("自卸液压盖板")
+    private String selfUnHyCoPl; // 自卸液压盖板
+	@ApiModelProperty("底板加热")
+    private String floorHeating; // 底板加热
+    @ApiModelProperty("更多配置")
+    private String moreConfig; // 更多配置
+    @ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDto <br/>
+ * Description: 上装配置表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装配置表 数据传输对象", description = "上装配置表 数据传输对象")
+public class BaseVehinstallmodelDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆功能key")
+    private String vehicleTypeKey; // 车辆功能key
+	@ApiModelProperty("车辆功能value")
+    private String vehicleTypeValue; // 车辆功能value
+	@ApiModelProperty("上装名称key")
+    private String installNameKey; // 上装名称key
+	@ApiModelProperty("上装名称value")
+    private String installNameValue; // 上装名称value
+	@ApiModelProperty("委改方式key")
+    private String refitMethodKey; // 委改方式key
+	@ApiModelProperty("委改方式value")
+    private String refitMethodValue; // 委改方式value
+	@ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+	@ApiModelProperty("颜色key")
+    private String colorKey; // 颜色key
+	@ApiModelProperty("颜色value")
+    private String colorValue; // 颜色value
+	@ApiModelProperty("外廓尺寸_长")
+    @NotBlank(message = "外廓尺寸长不能为空")
+    private String wk_long; // 外廓尺寸_长
+	@ApiModelProperty("外廓尺寸_宽")
+    @NotBlank(message = "外廓尺寸宽不能为空")
+    private String wk_wide; // 外廓尺寸_宽
+	@ApiModelProperty("外廓尺寸_高")
+    @NotBlank(message = "外廓尺寸高不能为空")
+    private String wk_high; // 外廓尺寸_高
+    @ApiModelProperty("板材材质key")
+    private String plateMaterialKey; // 板材材质key
+    @ApiModelProperty("板材材质value")
+    private String plateMaterialValue; // 板材材质value
+	@ApiModelProperty("板材厚度_底")
+    @NotBlank(message = "板材厚度底不能为空")
+    private String plateThicknessBottom; // 板材厚度_底
+	@ApiModelProperty("板材厚度_边")
+    @NotBlank(message = "板材厚度边不能为空")
+    private String plateThicknessEdge; // 板材厚度_边
+	@ApiModelProperty("篷布滑道")
+    private String tarpaulinSlide; // 篷布滑道
+	@ApiModelProperty("冷藏冷机")
+    private String refrigerator; // 冷藏冷机
+	@ApiModelProperty("自卸液压盖板")
+    private String selfUnHyCoPl; // 自卸液压盖板
+	@ApiModelProperty("底板加热")
+    private String floorHeating; // 底板加热
+    @ApiModelProperty("更多配置")
+    private String moreConfig; // 更多配置
+    @ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign <br/>
+ * Description: 上装配置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "上装配置表")
+@FeignClient(
+        contextId = "anrui-base-BaseVehinstallmodel",
+        name = "anrui-base",
+        path = "v1/basevehinstallmodel",
+        fallback = BaseVehinstallmodelFeignFallback.class)
+public interface BaseVehinstallmodelFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehinstallmodelVo>> listPage(@RequestBody PagerQuery<BaseVehinstallmodelQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseVehinstallmodelDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseVehinstallmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeignFallback <br/>
+ * Description: 上装配置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseVehinstallmodelFeignFallback implements BaseVehinstallmodelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseVehinstallmodelVo>> listPage(PagerQuery<BaseVehinstallmodelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehinstallmodel/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseVehinstallmodelDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehinstallmodel/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehinstallmodel/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseVehinstallmodelDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehinstallmodel/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelQuery.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelQuery <br/>
+ * Description: 上装配置表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装配置表 查询条件", description = "上装配置表 查询条件")
+public class BaseVehinstallmodelQuery implements Query {
+
+	@ApiModelProperty("车辆功能key")
+    private String vehicleTypeKey; // 车辆功能key
+	@ApiModelProperty("上装名称key")
+    private String installNameKey; // 上装名称key
+	@ApiModelProperty("委改方式key")
+    private String refitMethodKey; // 委改方式key
+	@ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+	@ApiModelProperty("颜色key")
+    private String colorKey; // 颜色key
+    @ApiModelProperty("板材材质key")
+    private String plateMaterialKey; // 板材材质key
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo <br/>
+ * Description: 上装配置表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "上装配置表 视图数据对象", description = "上装配置表 视图数据对象")
+public class BaseVehinstallmodelVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车辆功能value")
+    private String vehicleTypeValue; // 车辆功能value
+	@ApiModelProperty("上装名称value")
+    private String installNameValue; // 上装名称value
+	@ApiModelProperty("委改方式value")
+    private String refitMethodValue; // 委改方式value
+	@ApiModelProperty("委改厂")
+    private String refitFactory; // 委改厂
+	@ApiModelProperty("颜色value")
+    private String colorValue; // 颜色value
+	@ApiModelProperty("外廓尺寸_长")
+    private String wk_long; // 外廓尺寸_长
+	@ApiModelProperty("外廓尺寸_宽")
+    private String wk_wide; // 外廓尺寸_宽
+	@ApiModelProperty("外廓尺寸_高")
+    private String wk_high; // 外廓尺寸_高
+    @ApiModelProperty("外廓尺寸")
+    private String wk; // 外廓尺寸
+    @ApiModelProperty("板材材质value")
+    private String plateMaterialValue; // 板材材质value
+	@ApiModelProperty("板材厚度_底")
+    private String plateThicknessBottom; // 板材厚度_底
+	@ApiModelProperty("板材厚度_边")
+    private String plateThicknessEdge; // 板材厚度_边
+    @ApiModelProperty("板材厚度")
+    private String plateThickness; // 板材厚度
+	@ApiModelProperty("篷布滑道")
+    private String tarpaulinSlide; // 篷布滑道
+	@ApiModelProperty("冷藏冷机")
+    private String refrigerator; // 冷藏冷机
+	@ApiModelProperty("自卸液压盖板")
+    private String selfUnHyCoPl; // 自卸液压盖板
+	@ApiModelProperty("底板加热")
+    private String floorHeating; // 底板加热
+    @ApiModelProperty("更多配置")
+    private String moreConfig; // 更多配置
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-base(车型信息) <br/>
  * File: BusVehicleInquiry.java <br/>
@@ -51,27 +53,29 @@ public class BusVehicleInquiry extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("询价日期")
-    private String inquiryDate;
+    private Date createTime;
     @ApiModelProperty("询价人")
     private String inquirer;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("品牌sid")
     private String brandSid;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("车型sid")
+    private String vehModelSid;
     @ApiModelProperty("车型名称")
-    private String modelName;
+    private String vehModel;
+    @ApiModelProperty("常用配置sid")
+    private String vehModelConfigSid;
     @ApiModelProperty("常用配置")
-    private String modelBriefConfiguration;
+    private String vehModelConfig;
     @ApiModelProperty("其它配置说明")
     private String otherConfig;
     @ApiModelProperty("客户sid")
     private String customerSid;
-    @ApiModelProperty("品牌名称")
-    private String brandName;
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-    @ApiModelProperty("配置sid")
-    private String configSid;
-    @ApiModelProperty("更多配置")
+    @ApiModelProperty("常用配置更多配置")
     private String moreConfig;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryDto.java

@@ -30,6 +30,7 @@ import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -45,126 +46,35 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "车型询价单 数据传输对象", description = "车型询价单 数据传输对象")
+@Data
 public class BusVehicleInquiryDto implements Dto {
 
-    
+	@ApiModelProperty("sid")
+	private String sid;
 	@ApiModelProperty("询价日期")
-    private String inquiryDate; // 询价日期
-    
+	private String inquiryDate;
 	@ApiModelProperty("询价人")
-    private String inquirer; // 询价人
-    
+	private String inquirer;
 	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
-    
+	private String createOrgSid;
 	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-    
+	private String brandSid;
+	@ApiModelProperty("品牌名称")
+	private String brandName;
+	@ApiModelProperty("车型sid")
+	private String vehModelSid;
 	@ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
-    
-	@ApiModelProperty("车型简述配置")
-    private String modelBriefConfiguration; // 车型简述配置
-    
+	private String vehModel;
+	@ApiModelProperty("常用配置sid")
+	private String vehModelConfigSid;
+	@ApiModelProperty("常用配置")
+	private String vehModelConfig;
 	@ApiModelProperty("其它配置说明")
-    private String otherConfig; // 其它配置说明
-
-	
-	/**
-	 * @return 询价日期
-	 */
-	public String getInquiryDate(){
-		return inquiryDate;
-	}
-	
-	/**
-	 * @param inquiryDate 询价日期 to set
-	 */
-	public void setInquiryDate(String inquiryDate){
-		this.inquiryDate = inquiryDate;
-	}
-	
-	/**
-	 * @return 询价人
-	 */
-	public String getInquirer(){
-		return inquirer;
-	}
-	
-	/**
-	 * @param inquirer 询价人 to set
-	 */
-	public void setInquirer(String inquirer){
-		this.inquirer = inquirer;
-	}
-	
-	/**
-	 * @return 创建组织sid
-	 */
-	public String getCreateOrgSid(){
-		return createOrgSid;
-	}
-	
-	/**
-	 * @param createOrgSid 创建组织sid to set
-	 */
-	public void setCreateOrgSid(String createOrgSid){
-		this.createOrgSid = createOrgSid;
-	}
-	
-	/**
-	 * @return 品牌sid
-	 */
-	public String getBrandSid(){
-		return brandSid;
-	}
-	
-	/**
-	 * @param brandSid 品牌sid to set
-	 */
-	public void setBrandSid(String brandSid){
-		this.brandSid = brandSid;
-	}
-	
-	/**
-	 * @return 车型名称
-	 */
-	public String getModelName(){
-		return modelName;
-	}
-	
-	/**
-	 * @param modelName 车型名称 to set
-	 */
-	public void setModelName(String modelName){
-		this.modelName = modelName;
-	}
-	
-	/**
-	 * @return 车型简述配置
-	 */
-	public String getModelBriefConfiguration(){
-		return modelBriefConfiguration;
-	}
-	
-	/**
-	 * @param modelBriefConfiguration 车型简述配置 to set
-	 */
-	public void setModelBriefConfiguration(String modelBriefConfiguration){
-		this.modelBriefConfiguration = modelBriefConfiguration;
-	}
-	
-	/**
-	 * @return 其它配置说明
-	 */
-	public String getOtherConfig(){
-		return otherConfig;
-	}
-	
-	/**
-	 * @param otherConfig 其它配置说明 to set
-	 */
-	public void setOtherConfig(String otherConfig){
-		this.otherConfig = otherConfig;
-	}
+	private String otherConfig;
+	@ApiModelProperty("客户sid")
+	private String customerSid;
+	@ApiModelProperty("常用配置更多配置")
+	private String moreConfig;
+	@ApiModelProperty("使用组织sid")
+	private String useOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeign.java

@@ -52,7 +52,7 @@ import java.util.List;
 @FeignClient(
         contextId = "anrui-base-BusVehicleInquiry",
         name = "anrui-base",
-        path = "busvehicleinquiry",
+        path = "v1/busvehicleinquiry",
         fallback = BusVehicleInquiryFeignFallback.class)
 public interface BusVehicleInquiryFeign {
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryQuery.java

@@ -58,5 +58,5 @@ public class BusVehicleInquiryQuery implements Query {
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("车型名称")
-    private String vehModelName; // 车型名称
+    private String vehModel; // 车型名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.base.api.busvehicleinquiry;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-base(车型信息) <br/>
  * File: BusVehicleInquiryVo.java <br/>
@@ -52,11 +55,12 @@ public class BusVehicleInquiryVo implements Vo {
 	@ApiModelProperty("sid")
 	private String sid; // sid
 	@ApiModelProperty("询价日期")
-    private String createTime; // 询价日期
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 询价日期
 	@ApiModelProperty("询价人")
     private String inquirer; // 询价人
 	@ApiModelProperty("品牌名称")
     private String brandName; // 品牌sid
 	@ApiModelProperty("车型名称")
-    private String vehModelName; // 车型名称
+    private String vehModel; // 车型名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOffer.java

@@ -29,6 +29,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -44,217 +47,35 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "车型报价单", description = "车型报价单")
+@Data
 @TableName("bus_vehicle_offer")
 public class BusVehicleOffer extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
 	@ApiModelProperty("询价单sid")
     private String inquirySid; // 询价单sid
-    
 	@ApiModelProperty("报价人")
-    private String offerPeoplea; // 报价人
-    
+    private String offerName; // 报价人
 	@ApiModelProperty("报价日期")
-    private String offerDate; // 报价日期
-    
+    private Date createTime; // 报价日期
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-    
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("品牌名称")
     private String brandName; // 品牌sid
-
 	@ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
-    
+    private String vehModelSid; // 车型sid
 	@ApiModelProperty("车型简述配置sid")
-    private String modelBriefConfigurationSid; // 车型简述配置sid
-    
+    private String vehModelConfigSid; // 车型简述配置sid
 	@ApiModelProperty("特殊或差异说明")
     private String specialInstructions; // 特殊或差异说明
-    
 	@ApiModelProperty("厂家结算价")
-    private String manufacturerSettlementPrice; // 厂家结算价
-    
+    private String costPrice; // 厂家结算价
 	@ApiModelProperty("销售参考价")
-    private String salesReferencePrice; // 销售参考价
-    
+    private String salePrice; // 销售参考价
 	@ApiModelProperty("价格有效期")
     private String priceValidity; // 价格有效期
-
 	@ApiModelProperty("车型名称")
-    private String modelName; //
-
-	@ApiModelProperty("常用配置")
-    private String configSid; //
-
-	public String getBrandName() {
-		return brandName;
-	}
-
-	public void setBrandName(String brandName) {
-		this.brandName = brandName;
-	}
-
-	public String getModelName() {
-		return modelName;
-	}
-
-	public void setModelName(String modelName) {
-		this.modelName = modelName;
-	}
-
-	public String getConfigSid() {
-		return configSid;
-	}
-
-	public void setConfigSid(String configSid) {
-		this.configSid = configSid;
-	}
-
-	/**
-	 * @return 询价单sid
-	 */
-	public String getInquirySid(){
-		return inquirySid;
-	}
-	
-	/**
-	 * @param inquirySid 询价单sid to set
-	 */
-	public void setInquirySid(String inquirySid){
-		this.inquirySid = inquirySid;
-	}
-	/**
-	 * @return 报价人
-	 */
-	public String getOfferPeoplea(){
-		return offerPeoplea;
-	}
-	
-	/**
-	 * @param offerPeoplea 报价人 to set
-	 */
-	public void setOfferPeoplea(String offerPeoplea){
-		this.offerPeoplea = offerPeoplea;
-	}
-	/**
-	 * @return 报价日期
-	 */
-	public String getOfferDate(){
-		return offerDate;
-	}
-	
-	/**
-	 * @param offerDate 报价日期 to set
-	 */
-	public void setOfferDate(String offerDate){
-		this.offerDate = offerDate;
-	}
-	/**
-	 * @return 创建组织sid
-	 */
-	public String getCreateOrgSid(){
-		return createOrgSid;
-	}
-	
-	/**
-	 * @param createOrgSid 创建组织sid to set
-	 */
-	public void setCreateOrgSid(String createOrgSid){
-		this.createOrgSid = createOrgSid;
-	}
-	/**
-	 * @return 品牌sid
-	 */
-	public String getBrandSid(){
-		return brandSid;
-	}
-	
-	/**
-	 * @param brandSid 品牌sid to set
-	 */
-	public void setBrandSid(String brandSid){
-		this.brandSid = brandSid;
-	}
-	/**
-	 * @return 车型sid
-	 */
-	public String getModelSid(){
-		return modelSid;
-	}
-	
-	/**
-	 * @param modelSid 车型sid to set
-	 */
-	public void setModelSid(String modelSid){
-		this.modelSid = modelSid;
-	}
-	/**
-	 * @return 车型简述配置sid
-	 */
-	public String getModelBriefConfigurationSid(){
-		return modelBriefConfigurationSid;
-	}
-	
-	/**
-	 * @param modelBriefConfigurationSid 车型简述配置sid to set
-	 */
-	public void setModelBriefConfigurationSid(String modelBriefConfigurationSid){
-		this.modelBriefConfigurationSid = modelBriefConfigurationSid;
-	}
-	/**
-	 * @return 特殊或差异说明
-	 */
-	public String getSpecialInstructions(){
-		return specialInstructions;
-	}
-	
-	/**
-	 * @param specialInstructions 特殊或差异说明 to set
-	 */
-	public void setSpecialInstructions(String specialInstructions){
-		this.specialInstructions = specialInstructions;
-	}
-	/**
-	 * @return 厂家结算价
-	 */
-	public String getManufacturerSettlementPrice(){
-		return manufacturerSettlementPrice;
-	}
-	
-	/**
-	 * @param manufacturerSettlementPrice 厂家结算价 to set
-	 */
-	public void setManufacturerSettlementPrice(String manufacturerSettlementPrice){
-		this.manufacturerSettlementPrice = manufacturerSettlementPrice;
-	}
-	/**
-	 * @return 销售参考价
-	 */
-	public String getSalesReferencePrice(){
-		return salesReferencePrice;
-	}
-	
-	/**
-	 * @param salesReferencePrice 销售参考价 to set
-	 */
-	public void setSalesReferencePrice(String salesReferencePrice){
-		this.salesReferencePrice = salesReferencePrice;
-	}
-	/**
-	 * @return 价格有效期
-	 */
-	public String getPriceValidity(){
-		return priceValidity;
-	}
-	
-	/**
-	 * @param priceValidity 价格有效期 to set
-	 */
-	public void setPriceValidity(String priceValidity){
-		this.priceValidity = priceValidity;
-	}
+    private String vehModelName; //车型名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java

@@ -0,0 +1,203 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.busvehicleoffer;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-base(车型信息) <br/>
+ * File: BusVehicleOfferVo.java <br/>
+ * Class: com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferVo <br/>
+ * Description: 车型报价单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-15 10:51:35 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型报价单 视图数据对象", description = "车型报价单 视图数据对象")
+@Data
+public class BusVehicleOfferDetailVo implements Vo {
+
+	@ApiModelProperty("询价单sid")
+	private String sid; // 询价单sid
+	//车型询价单
+	@ApiModelProperty("询价人姓名")
+	private String inquirer; // 询价人姓名
+	@ApiModelProperty("询价人联系电话")
+	private String phone; // 询价人联系电话
+	@ApiModelProperty("询价日期")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date createTime; // 询价日期
+	@ApiModelProperty("车型sid")
+	private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+	private String vehModel; // 车型名称
+	@ApiModelProperty("常用配置sid")
+	private String vehModelConfigSid;
+	@ApiModelProperty("常用配置")
+	private String vehModelConfig;
+	@ApiModelProperty("常用配置更多配置")
+	private String moreConfig;
+	@ApiModelProperty("换选装说明")
+	private String repInstr;
+	@ApiModelProperty("其他配置说明")
+    private String otherConfig; // 其他配置说明
+	//报价单
+	@ApiModelProperty("车型别名")
+	private String vehicleAlias; // 车型别名
+	@ApiModelProperty("品牌sid")
+	private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+	private String brandName; // 品牌sid
+	@ApiModelProperty("功能value值")
+	private String vehicleTypeValue;
+	@ApiModelProperty("系列value值")
+	private String productLineValue;
+	@ApiModelProperty(value = "驱动形式value值")
+	private String driveFormValue;
+	@ApiModelProperty(value = "马力value值")
+	private String powerValue;
+	@ApiModelProperty("车辆版本value值")
+	private String vehicleVersionValue;
+	@ApiModelProperty(value = "燃料种类value值")
+	private String fuelTypeValue;
+	@ApiModelProperty(value = "变速箱value值")
+	private String gearboxTypeValue;
+	//车型信息
+	@ApiModelProperty(value = "细分市场")
+	private String marketSegmentsValue;
+	@ApiModelProperty(value = "发动机型号value值")
+	private String engineTypeValue;
+	@ApiModelProperty(value = "规格型号")
+	private String specifications;
+	@ApiModelProperty(value = "排放标准value值")
+	private String emissionStandardValue;
+	@ApiModelProperty(value = "系别Value")
+	private String departmentValue;
+	//常用配置
+	@ApiModelProperty("车身颜色key")
+	private String carColorKey;
+	@ApiModelProperty("车身颜色")
+	private String carColor;
+	@ApiModelProperty("驾驶室规格key")
+	private String specificationKey;
+	@ApiModelProperty("驾驶室规格")
+	private String specification;
+	@ApiModelProperty("导流罩key")
+	private String baffleModelKey;
+	@ApiModelProperty("导流罩")
+	private String baffleModel;
+	@ApiModelProperty("鞍座key")
+	private String saddleKey;
+	@ApiModelProperty("鞍座")
+	private String saddle;
+	@ApiModelProperty("独立热源key(1有、0无)")
+	private String independentSourcesKey;
+	@ApiModelProperty("独立热源（有、无）")
+	private String independentSources;
+	@ApiModelProperty("缓速器key")
+	private String slowMachineKey;
+	@ApiModelProperty("缓速器")
+	private String slowMachine;
+	@ApiModelProperty("后桥速比key")
+	private String rearAxleRatioKey;
+	@ApiModelProperty("后桥速比")
+	private String rearAxleRatio;
+	@ApiModelProperty("悬架key")
+	private String suspensionKey;
+	@ApiModelProperty("悬架")
+	private String suspension;
+	@ApiModelProperty("轴距key")
+	private String wheelbaseKey;
+	@ApiModelProperty("轴距")
+	private String wheelbase;
+	@ApiModelProperty("油箱/气罐key")
+	private String fuelTankKey;
+	@ApiModelProperty("油箱/气罐")
+	private String fuelTank;
+	@ApiModelProperty("后视镜key")
+	private String rearViewMirrorKey;
+	@ApiModelProperty("后视镜")
+	private String rearViewMirror;
+	@ApiModelProperty("空调key")
+	private String airConditionerKey;
+	@ApiModelProperty("空调")
+	private String airConditioner;
+	@ApiModelProperty("座椅key")
+	private String seatKey;
+	@ApiModelProperty("座椅")
+	private String seat;
+	@ApiModelProperty("保险杠key")
+	private String bumperKey;
+	@ApiModelProperty("保险杠")
+	private String bumper;
+	@ApiModelProperty("多媒体key")
+	private String multimediaKey;
+	@ApiModelProperty("多媒体")
+	private String multimedia;
+	@ApiModelProperty("轮胎规格key")
+	private String tireSizeKey;
+	@ApiModelProperty("轮胎规格")
+	private String tireSize;
+	@ApiModelProperty("轮毂材质key")
+	private String hubMaterialKey;
+	@ApiModelProperty("轮毂材质")
+	private String hubMaterial;
+	@ApiModelProperty("护轮罩key（有、无）")
+	private String tireCoverKey;
+	@ApiModelProperty("护轮罩（有、无）")
+	private String tireCover;
+	@ApiModelProperty("配置包key")
+	private String configuringBaoKey;
+	@ApiModelProperty("配置包")
+	private String configuringBao;
+	@ApiModelProperty("货箱key")
+	private String packingCaseKey;
+	@ApiModelProperty("货箱")
+	private String packingCase;
+	//特殊或差异说明
+	@ApiModelProperty("特殊或差异说明")
+	private String specialInstructions;
+	@ApiModelProperty("厂家结算价")
+	private String costPrice;
+	@ApiModelProperty("销售参考价")
+	private String salePrice;
+	@ApiModelProperty("备注")
+	private String remarks;
+
+	@ApiModelProperty("创建组织sid")
+	private String createOrgSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVos.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.busvehicleoffer;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-base(车型信息) <br/>
+ * File: BusVehicleOfferVo.java <br/>
+ * Class: com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferVo <br/>
+ * Description: 车型报价单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-15 10:51:35 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型报价单 视图数据对象", description = "车型报价单 视图数据对象")
+@Data
+public class BusVehicleOfferDetailVos implements Vo {
+
+	//车型询价单
+	@ApiModelProperty("询价人姓名")
+	private String inquirer; // 询价人姓名
+	@ApiModelProperty("询价人联系电话")
+	private String phone; // 询价人联系电话
+	@ApiModelProperty("询价日期")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date createTime; // 询价日期
+	@ApiModelProperty("车型sid")
+	private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+	private String vehModel; // 车型名称
+	@ApiModelProperty("询价常用配置sid")
+	private String xvehModelConfigSid;
+	@ApiModelProperty("询价常用配置")
+	private String xvehModelConfig;
+	@ApiModelProperty("询价常用配置更多配置")
+	private String xmoreConfig;
+	@ApiModelProperty("换选装说明")
+	private String repInstr;
+	@ApiModelProperty("其他配置说明")
+    private String otherConfig; // 其他配置说明
+	//报价单
+	@ApiModelProperty("报价常用配置sid")
+	private String bvehModelConfigSid;
+	@ApiModelProperty("报价常用配置")
+	private String bvehModelConfig;
+	@ApiModelProperty("报价常用配置更多配置")
+	private String bmoreConfig;
+	@ApiModelProperty("特殊或差异说明")
+	private String specialInstructions;
+	@ApiModelProperty("厂家结算价")
+	private String costPrice;
+	@ApiModelProperty("销售参考价")
+	private String salePrice;
+	@ApiModelProperty("备注")
+	private String remarks;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeign.java

@@ -52,7 +52,7 @@ import java.util.List;
 @FeignClient(
         contextId = "anrui-base-BusVehicleOffer",
         name = "anrui-base",
-        path = "busvehicleoffer",
+        path = "v1/busvehicleoffer",
         fallback = BusVehicleOfferFeignFallback.class)
 public interface BusVehicleOfferFeign {
 
@@ -70,5 +70,13 @@ public interface BusVehicleOfferFeign {
 
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<BusVehicleOfferVo> fetchBySid(@PathVariable("sid") String sid);
+    public ResultBean<BusVehicleOfferDetailVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("获取已报价详情")
+    @GetMapping("/fetchAllBySid/{sid}")
+    public ResultBean<BusVehicleOfferDetailVos> fetchAllBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("报价提交")
+    @PostMapping("/offerSubmit")
+    public ResultBean offerSubmit(@RequestBody BusVehicleOfferDetailVo busVehicleOfferDetailVo);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeignFallback.java

@@ -65,8 +65,18 @@ public class BusVehicleOfferFeignFallback implements BusVehicleOfferFeign {
 	}
 
 	@Override
-	public ResultBean<BusVehicleOfferVo> fetchBySid(String sid){
+	public ResultBean<BusVehicleOfferDetailVo> fetchBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/busvehicleoffer/fetchBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<BusVehicleOfferDetailVos> fetchAllBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.base.api.busvehicleoffer;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-base(车型信息) <br/>
  * File: BusVehicleOfferVo.java <br/>
@@ -52,9 +55,14 @@ public class BusVehicleOfferVo implements Vo {
 	@ApiModelProperty("sid")
 	private String sid; // sid
 	@ApiModelProperty("报价日期")
-    private String createTime; // 报价日期
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 报价日期
 	@ApiModelProperty("品牌名称")
 	private String brandName; // 品牌sid
+	@ApiModelProperty("车型sid")
+	private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型常用配置sid")
+	private String vehModelConfigSid; // 车型常用配置sid
 	@ApiModelProperty("车型名称")
 	private String vehModelName; // 车型名称
 	@ApiModelProperty("特殊或差异说明")
@@ -65,4 +73,6 @@ public class BusVehicleOfferVo implements Vo {
     private String salePrice; // 销售参考价
 	@ApiModelProperty("价格有效期")
     private String priceValidity; // 价格有效期
+	@ApiModelProperty("备注")
+	private String remarks; // 备注
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -129,22 +129,6 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         if (baseDistributorDetailsVo == null) {
             return rb.fail().setMsg("该经销商不存在");
         }
-        String registAddress = baseDistributorDetailsVo.getRegistAddress();
-        if (StringUtils.isNotBlank(registAddress)) {
-            String[] split = registAddress.split("-");
-            List<String> stringList = Arrays.asList(split);
-            baseDistributorDetailsVo.setRegistAddressProvince(stringList.get(0));
-            baseDistributorDetailsVo.setRegistAddressCity(stringList.get(1));
-            baseDistributorDetailsVo.setRegistAddressCounty(stringList.get(2));
-        }
-        String managementAddress = baseDistributorDetailsVo.getManagementAddress();
-        if (StringUtils.isNotBlank(managementAddress)){
-            String[] split = managementAddress.split("-");
-            List<String> stringList = Arrays.asList(split);
-            baseDistributorDetailsVo.setManagementAddressProvince(stringList.get(0));
-            baseDistributorDetailsVo.setManagementAddressCity(stringList.get(1));
-            baseDistributorDetailsVo.setManagementAddressCounty(stringList.get(2));
-        }
         return rb.success().setData(baseDistributorDetailsVo);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java

@@ -207,4 +207,6 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
     int checkByConfigName(String configName);
 
     int checkByCreateOrgSidAndConfigSid(@Param("sid1") String sid1, @Param("sid") String sid);
+
+    List<String> fetchConfigName(String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -728,4 +728,11 @@
         </where>
         ORDER BY nowCarNum DESC
     </select>
+
+    <select id="fetchConfigName" resultType="java.lang.String">
+        SELECT
+                CONCAT(configName,otherConfig) configName
+        FROM  base_model_config
+        WHERE createOrgSId = #{createOrgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -290,7 +290,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     /**
      * 车型配置分页列表(新)
      *
-     * @param pagerQuery 查询条件
      * @return
      */
   /*  public IPage<BaseModelConfigListVo> configPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
@@ -823,4 +822,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         addDonfigName(appModelConfigListVos1);
         return appModelConfigListVos;
     }
+
+    public List<String> fetchConfigName(String createOrgSid) {
+        return baseMapper.fetchConfigName(createOrgSid);
+    }
 }

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

@@ -10,6 +10,7 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -375,4 +376,8 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     String selectImage(String vehicleSid);
 
     List<AppScmWarehouseVinVo> getVinByWarehouseSid(@Param("warehouseSid") String warehouseSid);
+
+    List<AppScmInventoryRecordsVo> selectInventoryRecords(@Param("userOrgSid") String userOrgSid);
+
+    List<BaseExistingCarListVo> selExistingCar(String createOrgSid);
 }

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

@@ -13,13 +13,13 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT bv.sid,
-               bv.modelName,
-               bv.vinNo,
-               bv.engineNo,
-               bv.vehicleStateValue,
-               bv.locationName,
-               bv.libraryAge,
-               bv.modelConfigSid
+        bv.modelName,
+        bv.vinNo,
+        bv.engineNo,
+        bv.vehicleStateValue,
+        bv.locationName,
+        bv.libraryAge,
+        bv.modelConfigSid
         FROM base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -59,10 +59,10 @@
         <!--库龄（根据首次发车日期计算）-->
         bv.libraryAge
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-                 LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
-            ${ew.customSqlSegment}
+        LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+        LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
+        ${ew.customSqlSegment}
     </select>
     <!--删除或批量删除车辆信息-->
     <delete id="deleteBySids" parameterType="java.util.List">
@@ -148,16 +148,16 @@
         bvm.isValidity,
         bvm.isValidityValue
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
-                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+        LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
+        LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         WHERE bvm.sid = #{modelSid}
-          AND bmc.sid = #{modelConfigSid}
+        AND bmc.sid = #{modelConfigSid}
     </select>
     <!--导入车辆信息-->
     <insert id="saveList">
         INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
-                                 vehicleState, firstStartDate, libraryAge)
+        vehicleState, firstStartDate, libraryAge)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -186,8 +186,8 @@
     </select>
     <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         select bv.sid,
-               bv.modelSid,
-               bv.modelConfigSid,
+        bv.modelSid,
+        bv.modelConfigSid,
         <!--车架号(VIN)-->
         bv.vinNo,
         <!--发动机号/许可证号-->
@@ -246,13 +246,13 @@
     <select id="getAppCurrentCarByPageList"
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
         SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias,
-               bvm.brandName,
-               bvm.vehicleVersionValue,
-               bvm.fuelTypeValue,
-               bvm.gearboxTypeValue
+        bvm.vehicleAlias,
+        bvm.brandName,
+        bvm.vehicleVersionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -464,11 +464,11 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         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`
-            ${ew.customSqlSegment}
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        ${ew.customSqlSegment}
         ORDER BY
-            bv.priceDate desc
+        bv.priceDate desc
     </select>
 
     <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo">
@@ -552,29 +552,29 @@
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
-        SELECT DISTINCT bvm.sid                               AS modelSid,
-                        bvm.vehicleAlias                      AS modelName,
-                        bvm.brandName,
-                        bvm.carBrand                          AS brandSid,
-                        bvm.vehicleVersionValue               AS versionValue,
-                        bvm.fuelTypeValue,
-                        bvm.gearboxTypeValue,
-                        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
-                         FROM base_vehmodel_config bvc
-                         WHERE bvc.modelSid = bvm.sid
-                           AND bvc.useOrgSid = #{useOrgSid})  AS guidedPrice,
-                        (SELECT count(*)
-                         FROM base_vehmodel_config bvc2
-                         WHERE bvc2.modelSid = bvm.sid
-                           AND bvc2.useOrgSid = #{useOrgSid}) AS configNum,
-                        (SELECT count(*)
-                         FROM base_vehicle bv
-                         WHERE bv.modelSid = bvm.sid
-                           AND bv.lockedState = #{state}
-                           and bv.useOrg = #{useOrgSid})      AS nowCarNum
+        SELECT DISTINCT bvm.sid AS modelSid,
+        bvm.vehicleAlias AS modelName,
+        bvm.brandName,
+        bvm.carBrand AS brandSid,
+        bvm.vehicleVersionValue AS versionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue,
+        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
+        FROM base_vehmodel_config bvc
+        WHERE bvc.modelSid = bvm.sid
+        AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
+        (SELECT count(*)
+        FROM base_vehmodel_config bvc2
+        WHERE bvc2.modelSid = bvm.sid
+        AND bvc2.useOrgSid = #{useOrgSid}) AS configNum,
+        (SELECT count(*)
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
-                 left join base_vehmodel_config bvc on bvc.modelSid = bvm.sid
+        WHERE bv.modelSid = bvm.sid
+        AND bv.lockedState = #{state}
+        and bv.useOrg = #{useOrgSid}) AS nowCarNum
+        FROM base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        left join base_vehmodel_config bvc on bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
             <if test="useOrgSid != null and useOrgSid != ''">
@@ -775,4 +775,30 @@
         from base_vehicle bv
         where bv.location = #{warehouseSid}
     </select>
+
+    <select id="selectInventoryRecords"
+            resultType="com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo">
+        select sid,
+               vinNo        as vin,
+               locationName as warehouse,
+               location     as warehouseSid
+        from base_vehicle bv
+        where bv.useOrg = #{userOrgSid}
+    </select>
+
+    <select id="selExistingCar" resultType="com.yxt.anrui.base.api.basevehicle.BaseExistingCarListVo">
+        SELECT bv.vinNo,
+               bvm.`carBrand`        AS brandSid,
+               bvm.`brandName`,
+               bvm.`vehicleAlias`,
+               bvm.announcementModel AS noticeModel,
+               bv.priceDate,
+               bv.salesDate,
+               bv.vehicleState       AS vehicleStateKey,
+               bv.vehicleStateValue
+        FROM base_vehicle bv
+                     LEFT JOIN base_vehicle_model bvm
+                ON bv.`modelSid` = bvm.`sid`
+        WHERE bv.createOrg = #{createOrgSid}
+    </select>
 </mapper>

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

@@ -300,6 +300,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<List<BaseExistingCarListVo>> selExistingCar(String createOrgSid) {
+        return baseVehicleService.selExistingCar(createOrgSid);
+    }
+
     /**
      * 根据车架号查询现车详情
      *
@@ -593,5 +598,10 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid);
     }
 
+    @Override
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+        return baseVehicleService.selectInventoryRecords(userSid);
+    }
+
 
 }

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

@@ -1390,4 +1390,17 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid);
+        return rb.success().setData(list);
+    }
+
+    public ResultBean<List<BaseExistingCarListVo>> selExistingCar(String createOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(createOrgSid);
+        return rb.success().setData(baseExistingCarListVo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehinstall;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallMapper <br/>
+ * Description: 上装表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
+
+	//@Update("update base_vehinstall set name=#{msg} where id=#{id}")
+	//IPage<BaseVehinstallVo> voPage(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehinstall> qw);
+	
+	IPage<BaseVehinstallVo> selectPageVo(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
+	
+	List<BaseVehinstallVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
+	
+	@Select("select * from base_vehinstall")
+	List<BaseVehinstallVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
+		SELECT
+		bv.sid,
+		bvm.vehicleTypeValue,
+		bvm.installNameValue,
+		bvm.refitMethodValue,
+		bvm.refitFactory,
+		bvm.colorValue,
+		bvm.`plateMaterialValue`,
+		bv.`brandName`,
+		bv.noticeModel,
+		bv.vehModel,
+		bv.vinNo,
+		bv.vehicleStateValue,
+		bv.priceDate,
+		bv.salesDate,
+		bv.costPrice,
+		bv.guidePrice
+		FROM
+		base_vehinstall bv
+		LEFT JOIN base_vehinstallmodel bvm
+		ON bv.`mainSid` = bvm.`sid`  <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo">
+		SELECT * FROM base_vehinstall <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehinstall;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallRest <br/>
+ * Description: 上装表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "上装表")
+@RestController("com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallRest")
+@RequestMapping("v1/basevehinstall")
+public class BaseVehinstallRest implements BaseVehinstallFeign {
+
+	@Autowired
+	private BaseVehinstallService baseVehinstallService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehinstallVo> pv = baseVehinstallService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseVehinstallDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehinstallService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehinstallService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -0,0 +1,148 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehinstall;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
+import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService <br/>
+ * Description: 上装表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapper, BaseVehinstall> {
+
+	@Autowired
+	private BaseVehinstallmodelService baseVehinstallmodelService;
+
+	private QueryWrapper<BaseVehinstall> createQueryWrapper(BaseVehinstallQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseVehinstallVo> listPageVo(PagerQuery<BaseVehinstallQuery> pq) {
+		BaseVehinstallQuery query = pq.getParams();
+		QueryWrapper<BaseVehinstall> qw = new QueryWrapper<>();
+		qw.eq("bv.createOrg",query.getCreateOrgSid());
+		qw.eq("bvm.createOrgSid",query.getCreateOrgSid());
+		if (StringUtils.isNotBlank(query.getVehicleTypeKey())){
+			qw.eq("bvm.vehicleTypeKey",query.getVehicleTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getRefitMethodKey())){
+			qw.eq("bvm.refitMethodKey",query.getRefitMethodKey());
+		}
+		if (StringUtils.isNotBlank(query.getRefitFactory())){
+			qw.like("bvm.refitFactory",query.getRefitFactory());
+		}
+		if (StringUtils.isNotBlank(query.getInstallNameKey())){
+			qw.eq("bvm.installNameKey",query.getInstallNameKey());
+		}
+		if (StringUtils.isNotBlank(query.getColorKey())){
+			qw.eq("bvm.colorKey",query.getColorKey());
+		}
+		if (StringUtils.isNotBlank(query.getPlateMaterialKey())){
+			qw.eq("bvm.plateMaterialKey",query.getPlateMaterialKey());
+		}
+		if (StringUtils.isNotBlank(query.getNoticeModel())){
+			qw.like("bv.noticeModel",query.getNoticeModel());
+		}
+		if (StringUtils.isNotBlank(query.getVinNo())){
+			qw.like("bv.vinNo",query.getVinNo());
+		}
+		IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
+		IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseVehinstallDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseVehinstallDto dto){
+		BaseVehinstall entity = new BaseVehinstall();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseVehinstallDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseVehinstall entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseVehinstallDetailsVo fetchDetailsVoBySid(String sid){
+		BaseVehinstall entity = fetchBySid(sid);
+		BaseVehinstallDetailsVo vo = new BaseVehinstallDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		vo.setSid(sid);
+		String mainSid = vo.getMainSid();
+		BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);
+		vo.setBaseVehinstallmodel(baseVehinstallmodel);
+		return vo;
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehinstallmodel;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelMapper <br/>
+ * Description: 上装配置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseVehinstallmodelMapper extends BaseMapper<BaseVehinstallmodel> {
+
+	//@Update("update base_vehinstallmodel set name=#{msg} where id=#{id}")
+	//IPage<BaseVehinstallmodelVo> voPage(IPage<BaseVehinstallmodel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehinstallmodel> qw);
+	
+	IPage<BaseVehinstallmodelVo> selectPageVo(IPage<BaseVehinstallmodel> page, @Param(Constants.WRAPPER) Wrapper<BaseVehinstallmodel> qw);
+	
+	List<BaseVehinstallmodelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstallmodel> qw);
+	
+	@Select("select * from base_vehinstallmodel")
+	List<BaseVehinstallmodelVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo">
+		SELECT * FROM base_vehinstallmodel <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo">
+		SELECT * FROM base_vehinstallmodel <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehinstallmodel;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelQuery;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDto;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelRest <br/>
+ * Description: 上装配置表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "上装配置表")
+@RestController("com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelRest")
+@RequestMapping("v1/basevehinstallmodel")
+public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign {
+
+	@Autowired
+	private BaseVehinstallmodelService baseVehinstallmodelService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseVehinstallmodelVo>> listPage(@RequestBody PagerQuery<BaseVehinstallmodelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehinstallmodelVo> pv = baseVehinstallmodelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseVehinstallmodelDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehinstallmodelService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehinstallmodelService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseVehinstallmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehinstallmodelDetailsVo vo = baseVehinstallmodelService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java

@@ -0,0 +1,133 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehinstallmodel;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelQuery;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDto;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(上装配置管理) <br/>
+ * File: BaseVehinstallmodelService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService <br/>
+ * Description: 上装配置表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-22 16:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseVehinstallmodelService extends MybatisBaseService<BaseVehinstallmodelMapper, BaseVehinstallmodel> {
+
+	public PagerVo<BaseVehinstallmodelVo> listPageVo(PagerQuery<BaseVehinstallmodelQuery> pq) {
+		BaseVehinstallmodelQuery query = pq.getParams();
+		QueryWrapper<BaseVehinstallmodel> qw = new QueryWrapper<>();
+		qw.eq("createOrgSid",query.getCreateOrgSid());
+		if (StringUtils.isNotBlank(query.getVehicleTypeKey())){
+			qw.eq("vehicleTypeKey",query.getVehicleTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getRefitMethodKey())){
+			qw.eq("refitMethodKey",query.getRefitMethodKey());
+		}
+		if (StringUtils.isNotBlank(query.getRefitFactory())){
+			qw.like("refitFactory",query.getRefitFactory());
+		}
+		if (StringUtils.isNotBlank(query.getInstallNameKey())){
+			qw.eq("installNameKey",query.getInstallNameKey());
+		}
+		if (StringUtils.isNotBlank(query.getColorKey())){
+			qw.eq("colorKey",query.getColorKey());
+		}
+		if (StringUtils.isNotBlank(query.getPlateMaterialKey())){
+			qw.like("plateMaterialKey",query.getPlateMaterialKey());
+		}
+		IPage<BaseVehinstallmodel> page = PagerUtil.queryToPage(pq);
+		IPage<BaseVehinstallmodelVo> pagging = baseMapper.selectPageVo(page, qw);
+		List<BaseVehinstallmodelVo> records = pagging.getRecords();
+		for (BaseVehinstallmodelVo record : records) {
+			String wk_long = record.getWk_long();
+			String wk_wide = record.getWk_wide();
+			String wk_high = record.getWk_high();
+			record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm");
+			String plateThicknessBottom = record.getPlateThicknessBottom();
+			String plateThicknessEdge = record.getPlateThicknessEdge();
+			record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm");
+		}
+		PagerVo<BaseVehinstallmodelVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseVehinstallmodelDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseVehinstallmodelDto dto){
+		BaseVehinstallmodel entity = new BaseVehinstallmodel();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseVehinstallmodelDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseVehinstallmodel entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseVehinstallmodelDetailsVo fetchDetailsVoBySid(String sid){
+		BaseVehinstallmodel entity = fetchBySid(sid);
+		BaseVehinstallmodelDetailsVo vo = new BaseVehinstallmodelDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodeloption/BaseVehmodelOptionMapper.java

@@ -72,4 +72,7 @@ public interface BaseVehmodelOptionMapper extends BaseMapper<BaseVehmodelOption>
      * @return
      */
     List<BaseVehmodelOptionListVo> selectListOne(@Param("modelSid") String modelSid, @Param("brandSid") String brandSid);
+
+    @Select("select changeOptionName from base_vehmodel_option where modelSid = #{vehModelSid}")
+    List<String> selByVehModelSid(String vehModelSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodeloption/BaseVehmodelOptionService.java

@@ -162,4 +162,8 @@ public class BaseVehmodelOptionService extends MybatisBaseService<BaseVehmodelOp
         String price = bigDecimal.toString();
         return rb.success().setData(price);
     }
+
+    public List<String> selByVehModelSid(String vehModelSid) {
+        return baseMapper.selByVehModelSid(vehModelSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiry;
 import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -62,4 +63,7 @@ public interface BusVehicleInquiryMapper extends BaseMapper<BusVehicleInquiry> {
 	
 	@Select("select * from bus_vehicle_inquiry")
 	List<BusVehicleInquiryVo> selectListVo();
+
+	@Update("update bus_vehicle_inquiry set state = 0 where sid = #{sid}")
+    void updateConfigBySid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryRest.java

@@ -53,7 +53,7 @@ import java.util.List;
  */
 @Api(tags = "车型询价单")
 @RestController("com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryRest")
-@RequestMapping("/busvehicleinquiry")
+@RequestMapping("v1/busvehicleinquiry")
 public class BusVehicleInquiryRest implements BusVehicleInquiryFeign {
 
 	@Autowired

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java

@@ -81,11 +81,12 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
         BusVehicleInquiryQuery query = pq.getParams();
         QueryWrapper<BusVehicleInquiry> qw = new QueryWrapper<>();
         qw.eq("createOrgSid", query.getCreateOrgSid());
+        qw.eq("state",1);
         if (StringUtils.isNotBlank(query.getBrandSid())) {
             qw.eq("brandSid", query.getBrandSid());
         }
-        if (StringUtils.isNotBlank(query.getVehModelName())) {
-            qw.eq("vehModelName", query.getVehModelName());
+        if (StringUtils.isNotBlank(query.getVehModel())) {
+            qw.eq("vehModel", query.getVehModel());
         }
         String inquiryStartDate = query.getInquiryStartDate();
         String inquiryEndDate = query.getInquiryEndDate();
@@ -123,19 +124,19 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
     @Transactional(rollbackFor = Exception.class)
     public void saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) {
         BusVehicleInquiry busVehicleInquiry = new BusVehicleInquiry();
-        busVehicleInquiry.setModelSid(dto.getModelSid());
-        busVehicleInquiry.setConfigSid(dto.getConfigSid());
-        busVehicleInquiry.setModelName(dto.getModel());
+        busVehicleInquiry.setVehModelSid(dto.getModelSid());
+        busVehicleInquiry.setVehModelConfigSid(dto.getConfigSid());
+        busVehicleInquiry.setVehModel(dto.getModel());
         busVehicleInquiry.setOtherConfig(dto.getOtherConfig());
-        busVehicleInquiry.setModelBriefConfiguration(dto.getConfig());
+        busVehicleInquiry.setVehModelConfig(dto.getConfig());
         busVehicleInquiry.setMoreConfig(dto.getMoreConfig());
         String userSid = dto.getUserSid();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
         busVehicleInquiry.setInquirer(data.getStaffName());
         busVehicleInquiry.setCreateOrgSid(data.getOrgSid());
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String format = simpleDateFormat.format(new Date());
-        busVehicleInquiry.setInquiryDate(format);
+        //SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        //String format = simpleDateFormat.format(new Date());
+        busVehicleInquiry.setCreateTime(new Date());
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid());
         busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand());
         busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName());
@@ -150,22 +151,25 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
     @Transactional(rollbackFor = Exception.class)
     public void inquiryPrice(AppCarConfigSummaryDto dto) {
         BusVehicleInquiry busVehicleInquiry = new BusVehicleInquiry();
-        busVehicleInquiry.setModelSid(dto.getModelSid());
-        busVehicleInquiry.setConfigSid(dto.getConfigSid());
+        busVehicleInquiry.setVehModelSid(dto.getModelSid());
+        busVehicleInquiry.setVehModelConfigSid(dto.getConfigSid());
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid());
-        busVehicleInquiry.setModelName(baseVehicleModel.getModelName());
+        busVehicleInquiry.setVehModel(baseVehicleModel.getModelName());
         busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand());
         busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName());
         BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(dto.getConfigSid());
-        busVehicleInquiry.setModelBriefConfiguration(baseModelConfig.getConfigName());
+        busVehicleInquiry.setVehModelConfig(baseModelConfig.getConfigName());
         String userSid = dto.getUserSid();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
         busVehicleInquiry.setInquirer(data.getStaffName());
         busVehicleInquiry.setCreateOrgSid(data.getOrgSid());
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String format = simpleDateFormat.format(new Date());
-        busVehicleInquiry.setInquiryDate(format);
+        //SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        //String format = simpleDateFormat.format();
+        busVehicleInquiry.setCreateTime(new Date());
         save(busVehicleInquiry);
     }
 
+    public void updateConfigBySid(String sid) {
+        baseMapper.updateConfigBySid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOffer;
 import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -62,4 +63,13 @@ public interface BusVehicleOfferMapper extends BaseMapper<BusVehicleOffer> {
 	
 	@Select("select * from bus_vehicle_offer")
 	List<BusVehicleOfferVo> selectListVo();
+
+	@Select("select * from bus_vehicle_offer where inquirySid = #{sid}")
+	BusVehicleOffer fetchByMainSid(String sid);
+
+	@Update("update bus_vehicle_offer set state = 0, specialInstructions = #{specialInstructions},costPrice = #{costPrice},salePrice = #{salePrice},remarks = #{remarks} where sid = #{sid}")
+	void updateBySid(@Param("specialInstructions") String specialInstructions,@Param("costPrice") String costPrice,@Param("salePrice") String salePrice,@Param("remarks") String remarks,@Param("sid") String sid);
+
+	@Update("update bus_vehicle_offer set state = 0, specialInstructions = #{specialInstructions},costPrice = #{costPrice},salePrice = #{salePrice},remarks = #{remarks},vehModelConfigSid = #{vehModelConfigSid} where sid = #{sid}")
+	void updateBySid(@Param("specialInstructions") String specialInstructions,@Param("costPrice") String costPrice,@Param("salePrice") String salePrice,@Param("remarks") String remarks,@Param("vehModelConfigSid") String vehModelConfigSid,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.busvehicleoffer;
 
+import com.yxt.anrui.base.api.busvehicleoffer.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,11 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOffer;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferQuery;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferVo;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferDto;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferFeign;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -55,7 +51,7 @@ import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferFeign;
  */
 @Api(tags = "车型报价单")
 @RestController("com.yxt.anrui.base.biz.busvehicleoffer.BusVehicleOfferRest")
-@RequestMapping("/busvehicleoffer")
+@RequestMapping("v1/busvehicleoffer")
 public class BusVehicleOfferRest implements BusVehicleOfferFeign {
 
 	@Autowired
@@ -91,9 +87,17 @@ public class BusVehicleOfferRest implements BusVehicleOfferFeign {
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<BusVehicleOfferVo> fetchBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusVehicleOffer vo = busVehicleOfferService.fetchBySid(sid);
-		return rb.success().setData(vo);
+    public ResultBean<BusVehicleOfferDetailVo> fetchBySid(@PathVariable("sid") String sid){
+		return busVehicleOfferService.fetchAll(sid);
+	}
+
+	@Override
+	public ResultBean<BusVehicleOfferDetailVos> fetchAllBySid(String sid) {
+		return busVehicleOfferService.fetchAllBySid(sid);
+	}
+
+	@Override
+	public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) {
+		return busVehicleOfferService.offerSubmit(busVehicleOfferDetailVo);
 	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java

@@ -28,18 +28,26 @@ package com.yxt.anrui.base.biz.busvehicleoffer;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
+import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiry;
+import com.yxt.anrui.base.api.busvehicleoffer.*;
+import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
+import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
+import com.yxt.anrui.base.biz.basevehmodeloption.BaseVehmodelOptionService;
+import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOffer;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferQuery;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferVo;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferDto;
-import com.yxt.anrui.base.api.busvehicleoffer.BusVehicleOfferFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -60,15 +68,29 @@ import java.util.List;
 @Service
 public class BusVehicleOfferService extends MybatisBaseService<BusVehicleOfferMapper, BusVehicleOffer> {
 
+	@Autowired
+	private BusVehicleInquiryService busVehicleInquiryService;
+	@Autowired
+	private BaseModelConfigService baseModelConfigService;
+	@Autowired
+	private BaseVehicleModelService baseVehicleModelService;
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private BaseVehmodelOptionService baseVehmodelOptionService;
+	@Autowired
+	private BaseVehmodelConfigService baseVehmodelConfigService;
+
 	public PagerVo<BusVehicleOfferVo> listPageVo(PagerQuery<BusVehicleOfferQuery> pq) {
 		BusVehicleOfferQuery query = pq.getParams();
 		QueryWrapper<BusVehicleOffer> qw = new QueryWrapper<>();
 		qw.eq("createOrgSid", query.getCreateOrgSid());
+		qw.eq("state",0);
 		if (StringUtils.isNotBlank(query.getBrandSid())) {
 			qw.eq("brandSid", query.getBrandSid());
 		}
 		if (StringUtils.isNotBlank(query.getVehModelName())) {
-			qw.eq("vehModelName", query.getVehModelName());
+			qw.like("vehModelName", query.getVehModelName());
 		}
 		String offerStartDate = query.getOfferStartDate();
 		String offerEndDate = query.getOfferEndDate();
@@ -93,4 +115,262 @@ public class BusVehicleOfferService extends MybatisBaseService<BusVehicleOfferMa
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public ResultBean<BusVehicleOfferDetailVo> fetchAll(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		BusVehicleOfferDetailVo busVehicleOfferDetailVo = new BusVehicleOfferDetailVo();
+		BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(sid);
+		if (busVehicleInquiry == null){
+			return rb.setMsg("该询价单不存在");
+		}
+		busVehicleOfferDetailVo.setSid(busVehicleInquiry.getSid());
+		busVehicleOfferDetailVo.setInquirer(busVehicleInquiry.getInquirer());
+		String createBySid = busVehicleInquiry.getCreateBySid();
+		ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
+		SysUserVo sysUserVo = sysUserVoResultBean.getData();
+		if (sysUserVo == null){
+			return rb.setMsg("该用户不存在");
+		}
+		busVehicleOfferDetailVo.setPhone(sysUserVo.getMobile());
+		busVehicleOfferDetailVo.setCreateTime(busVehicleInquiry.getCreateTime());
+		busVehicleOfferDetailVo.setVehModelSid(busVehicleInquiry.getVehModelSid());
+		busVehicleOfferDetailVo.setVehModel(busVehicleInquiry.getVehModel());
+		busVehicleOfferDetailVo.setVehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
+		busVehicleOfferDetailVo.setVehModelConfig(busVehicleInquiry.getVehModelConfig());
+		busVehicleOfferDetailVo.setMoreConfig(busVehicleInquiry.getMoreConfig());
+		List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
+		String repInstr = "";
+		for (String s : stringList) {
+			repInstr += s + ",";
+		}
+		if (StringUtils.isNotBlank(repInstr)){
+			busVehicleOfferDetailVo.setRepInstr(repInstr.substring(0,repInstr.length()-1));
+		}
+		busVehicleOfferDetailVo.setOtherConfig(busVehicleInquiry.getOtherConfig());
+		busVehicleOfferDetailVo.setVehicleAlias(busVehicleInquiry.getVehModel());
+		busVehicleOfferDetailVo.setBrandSid(busVehicleInquiry.getBrandSid());
+		busVehicleOfferDetailVo.setBrandName(busVehicleInquiry.getBrandName());
+		BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleInquiry.getVehModelSid());
+		if (baseVehicleModel == null){
+			return rb.setMsg("该车型不存在");
+		}
+		busVehicleOfferDetailVo.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
+		busVehicleOfferDetailVo.setProductLineValue(baseVehicleModel.getProductLineValue());
+		busVehicleOfferDetailVo.setDriveFormValue(baseVehicleModel.getDriveFormValue());
+		busVehicleOfferDetailVo.setPowerValue(baseVehicleModel.getPowerValue());
+		busVehicleOfferDetailVo.setVehicleVersionValue(baseVehicleModel.getVehicleVersionValue());
+		busVehicleOfferDetailVo.setFuelTypeValue(baseVehicleModel.getFuelTypeValue());
+		busVehicleOfferDetailVo.setGearboxTypeValue(baseVehicleModel.getGearboxTypeValue());
+		busVehicleOfferDetailVo.setMarketSegmentsValue(baseVehicleModel.getMarketSegmentsValue());
+		busVehicleOfferDetailVo.setEngineTypeValue(baseVehicleModel.getEngineTypeValue());
+		busVehicleOfferDetailVo.setSpecifications(baseVehicleModel.getSpecifications());
+		busVehicleOfferDetailVo.setEmissionStandardValue(baseVehicleModel.getEmissionStandardValue());
+		busVehicleOfferDetailVo.setDepartmentValue(baseVehicleModel.getDepartmentValue());
+		BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(busVehicleInquiry.getVehModelConfigSid());
+		if (baseModelConfig == null){
+			return rb.setMsg("该常用配置不存在");
+		}
+		busVehicleOfferDetailVo.setCarColorKey(baseModelConfig.getCarColorKey());
+		busVehicleOfferDetailVo.setCarColor(baseModelConfig.getCarColor());
+		busVehicleOfferDetailVo.setSpecificationKey(baseModelConfig.getSpecificationKey());
+		busVehicleOfferDetailVo.setSpecification(baseModelConfig.getSpecification());
+		busVehicleOfferDetailVo.setBaffleModelKey(baseModelConfig.getBaffleModelKey());
+		busVehicleOfferDetailVo.setBaffleModel(baseModelConfig.getBaffleModel());
+		busVehicleOfferDetailVo.setSaddleKey(baseModelConfig.getSaddleKey());
+		busVehicleOfferDetailVo.setSaddle(baseModelConfig.getSaddle());
+		busVehicleOfferDetailVo.setIndependentSourcesKey(baseModelConfig.getIndependentSourcesKey());
+		busVehicleOfferDetailVo.setIndependentSources(baseModelConfig.getIndependentSources());
+		busVehicleOfferDetailVo.setSlowMachineKey(baseModelConfig.getSlowMachineKey());
+		busVehicleOfferDetailVo.setSlowMachine(baseModelConfig.getSlowMachine());
+		busVehicleOfferDetailVo.setRearAxleRatioKey(baseModelConfig.getRearAxleRatioKey());
+		busVehicleOfferDetailVo.setRearAxleRatio(baseModelConfig.getRearAxleRatio());
+		busVehicleOfferDetailVo.setSuspensionKey(baseModelConfig.getSuspensionKey());
+		busVehicleOfferDetailVo.setSuspension(baseModelConfig.getSuspension());
+		busVehicleOfferDetailVo.setWheelbaseKey(baseModelConfig.getWheelbaseKey());
+		busVehicleOfferDetailVo.setWheelbase(baseModelConfig.getWheelbase());
+		busVehicleOfferDetailVo.setFuelTankKey(baseModelConfig.getFuelTankKey());
+		busVehicleOfferDetailVo.setFuelTank(baseModelConfig.getFuelTank());
+		busVehicleOfferDetailVo.setRearViewMirrorKey(baseModelConfig.getRearViewMirrorKey());
+		busVehicleOfferDetailVo.setRearViewMirror(baseModelConfig.getRearViewMirror());
+		busVehicleOfferDetailVo.setAirConditionerKey(baseModelConfig.getAirConditionerKey());
+		busVehicleOfferDetailVo.setAirConditioner(baseModelConfig.getAirConditioner());
+		busVehicleOfferDetailVo.setSeatKey(baseModelConfig.getSeatKey());
+		busVehicleOfferDetailVo.setSeat(baseModelConfig.getSeat());
+		busVehicleOfferDetailVo.setBumperKey(baseModelConfig.getBumperKey());
+		busVehicleOfferDetailVo.setBumper(baseModelConfig.getBumper());
+		busVehicleOfferDetailVo.setMultimediaKey(baseModelConfig.getMultimediaKey());
+		busVehicleOfferDetailVo.setMultimedia(baseModelConfig.getMultimedia());
+		busVehicleOfferDetailVo.setTireSizeKey(baseModelConfig.getTireSizeKey());
+		busVehicleOfferDetailVo.setTireSize(baseModelConfig.getTireSize());
+		busVehicleOfferDetailVo.setHubMaterialKey(baseModelConfig.getHubMaterialKey());
+		busVehicleOfferDetailVo.setHubMaterial(baseModelConfig.getHubMaterial());
+		busVehicleOfferDetailVo.setTireCoverKey(baseModelConfig.getTireCoverKey());
+		busVehicleOfferDetailVo.setTireCover(baseModelConfig.getTireCover());
+		busVehicleOfferDetailVo.setConfiguringBaoKey(baseModelConfig.getConfiguringBaoKey());
+		busVehicleOfferDetailVo.setConfiguringBao(baseModelConfig.getConfiguringBao());
+		busVehicleOfferDetailVo.setPackingCaseKey(baseModelConfig.getPackingCaseKey());
+		busVehicleOfferDetailVo.setPackingCase(baseModelConfig.getPackingCase());
+		BusVehicleOffer busVehicleOfferVo = baseMapper.fetchByMainSid(busVehicleInquiry.getSid());
+		if (busVehicleOfferVo == null){
+			return rb.setMsg("该报价单不存在");
+		}
+		busVehicleOfferDetailVo.setSpecialInstructions(busVehicleOfferVo.getSpecialInstructions());
+		busVehicleOfferDetailVo.setCostPrice(busVehicleOfferVo.getCostPrice());
+		busVehicleOfferDetailVo.setSalePrice(busVehicleOfferVo.getSalePrice());
+		busVehicleOfferDetailVo.setRemarks(busVehicleOfferVo.getRemarks());
+		busVehicleOfferDetailVo.setCreateOrgSid(busVehicleInquiry.getCreateOrgSid());
+		return rb.success().setData(busVehicleOfferDetailVo);
+	}
+
+	public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) {
+		ResultBean rb = ResultBean.fireFail();
+		BusVehicleOffer busVehicleOffer = baseMapper.fetchByMainSid(busVehicleOfferDetailVo.getSid());
+		if (busVehicleOffer == null){
+			return rb.setMsg("该报价单不存在");
+		}
+		String configName = "";
+		//缓速器
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSlowMachine()) && "有".equals(busVehicleOfferDetailVo.getSlowMachine())) {
+			configName += "缓速器/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearViewMirror())) {
+			configName += busVehicleOfferDetailVo.getRearViewMirror() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireSize())) {
+			configName += busVehicleOfferDetailVo.getTireSize() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearAxleRatio())) {
+			configName += busVehicleOfferDetailVo.getRearAxleRatio() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getAirConditioner()) && "有".equals(busVehicleOfferDetailVo.getAirConditioner())) {
+			configName += "空调/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getHubMaterial())) {
+			configName += busVehicleOfferDetailVo.getHubMaterial() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBaffleModel())) {
+			configName += busVehicleOfferDetailVo.getBaffleModel() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSuspension())) {
+			configName += busVehicleOfferDetailVo.getSuspension() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSeat())) {
+			configName += busVehicleOfferDetailVo.getSeat() + "/";
+		}
+		//护轮罩
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireCover()) && "有".equals(busVehicleOfferDetailVo.getTireCover())) {
+			configName += "护轮罩/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSaddle())) {
+			configName += busVehicleOfferDetailVo.getSaddle() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getWheelbase())) {
+			configName += busVehicleOfferDetailVo.getWheelbase() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBumper())) {
+			configName += busVehicleOfferDetailVo.getBumper() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getConfiguringBao())) {
+			configName += busVehicleOfferDetailVo.getConfiguringBao() + "/";
+		}
+		//独立热源
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getIndependentSources()) && "有".equals(busVehicleOfferDetailVo.getIndependentSources())) {
+			configName += "独立热源/";
+		}
+		//油罐
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getFuelTank())) {
+			configName += busVehicleOfferDetailVo.getFuelTank() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getMultimedia()) && "有".equals(busVehicleOfferDetailVo.getMultimedia())) {
+			configName += "多媒体/";
+		}
+		//颜色
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getCarColor())) {
+			configName += busVehicleOfferDetailVo.getCarColor() + "/";
+		}
+		//驾驶室规格
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSpecification())) {
+			configName += busVehicleOfferDetailVo.getSpecification() + "/";
+		}
+		if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getPackingCase())) {
+			configName += busVehicleOfferDetailVo.getPackingCase() + "/";
+		}
+		String moreConfig = busVehicleOfferDetailVo.getMoreConfig();
+		String configName1 = configName + moreConfig;
+		List<String> stringList = baseModelConfigService.fetchConfigName(busVehicleOfferDetailVo.getCreateOrgSid());
+		if (stringList.contains(configName1)){
+			String costPrice = busVehicleOfferDetailVo.getCostPrice();
+			if (StringUtils.isBlank(costPrice)){
+				return rb.setMsg("请填写厂家结算价");
+			}
+			String salePrice = busVehicleOfferDetailVo.getSalePrice();
+			if (StringUtils.isBlank(salePrice)){
+				return rb.setMsg("请填写销售参考价");
+			}
+			baseMapper.updateBySid(busVehicleOfferDetailVo.getSpecialInstructions(),busVehicleOfferDetailVo.getCostPrice(),busVehicleOfferDetailVo.getSalePrice(),busVehicleOfferDetailVo.getRemarks(),busVehicleOffer.getSid());
+		}else {
+			BaseModelConfig baseModelConfig = new BaseModelConfig();
+			String sid = baseModelConfig.getSid();
+			BeanUtil.copyProperties(busVehicleOfferDetailVo,baseModelConfig);
+			baseModelConfig.setSid(sid);
+			baseModelConfig.setConfigName(configName);
+			baseModelConfigService.save(baseModelConfig);
+			String costPrice = busVehicleOfferDetailVo.getCostPrice();
+			if (StringUtils.isBlank(costPrice)){
+				return rb.setMsg("请填写厂家结算价");
+			}
+			String salePrice = busVehicleOfferDetailVo.getSalePrice();
+			if (StringUtils.isBlank(salePrice)){
+				return rb.setMsg("请填写销售参考价");
+			}
+			BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
+			baseVehmodelConfig.setModelSid(busVehicleOfferDetailVo.getVehModelSid());
+			baseVehmodelConfig.setConfigurationItemsSid(busVehicleOfferDetailVo.getVehModelConfigSid());
+			baseVehmodelConfig.setUseOrgSid(busVehicleOfferDetailVo.getCreateOrgSid());
+			baseVehmodelConfigService.save(baseVehmodelConfig);
+			baseMapper.updateBySid(busVehicleOfferDetailVo.getSpecialInstructions(),busVehicleOfferDetailVo.getCostPrice(),busVehicleOfferDetailVo.getSalePrice(),busVehicleOfferDetailVo.getRemarks(),baseModelConfig.getSid(),busVehicleOffer.getSid());
+			busVehicleInquiryService.updateConfigBySid(busVehicleOfferDetailVo.getSid());
+		}
+		return rb.success().setMsg("提交成功");
+	}
+
+	public ResultBean<BusVehicleOfferDetailVos> fetchAllBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		BusVehicleOffer busVehicleOffer = fetchBySid(sid);
+		String inquirySid = busVehicleOffer.getInquirySid();
+		BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(inquirySid);
+		BusVehicleOfferDetailVos busVehicleOfferDetailVos = new BusVehicleOfferDetailVos();
+		BeanUtil.copyProperties(busVehicleInquiry,busVehicleOfferDetailVos);
+		busVehicleOfferDetailVos.setXvehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
+		busVehicleOfferDetailVos.setXvehModelConfig(busVehicleInquiry.getVehModelConfig());
+		busVehicleOfferDetailVos.setXmoreConfig(busVehicleInquiry.getMoreConfig());
+		String createBySid = busVehicleInquiry.getCreateBySid();
+		ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
+		SysUserVo sysUserVo = sysUserVoResultBean.getData();
+		if (sysUserVo == null){
+			return rb.setMsg("该用户不存在");
+		}
+		busVehicleOfferDetailVos.setPhone(sysUserVo.getMobile());
+		List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
+		String repInstr = "";
+		for (String s : stringList) {
+			repInstr += s + ",";
+		}
+		if (StringUtils.isNotBlank(repInstr)){
+			busVehicleOfferDetailVos.setRepInstr(repInstr.substring(0,repInstr.length()-1));
+		}
+		String vehModelConfigSid = busVehicleOffer.getVehModelConfigSid();
+		BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(vehModelConfigSid);
+		if (baseModelConfig == null){
+			return rb.setMsg("该常用配置不存在");
+		}
+		busVehicleOfferDetailVos.setBvehModelConfigSid(vehModelConfigSid);
+		busVehicleOfferDetailVos.setBvehModelConfig(baseModelConfig.getConfigName());
+		busVehicleOfferDetailVos.setBmoreConfig(baseModelConfig.getOtherConfig());
+		busVehicleOfferDetailVos.setSpecialInstructions(busVehicleOffer.getSpecialInstructions());
+		busVehicleOfferDetailVos.setCostPrice(busVehicleOffer.getCostPrice());
+		busVehicleOfferDetailVos.setSalePrice(busVehicleOffer.getSalePrice());
+		busVehicleOfferDetailVos.setRemarks(busVehicleOffer.getRemarks());
+		return rb.success().setData(busVehicleOfferDetailVos);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -109,7 +109,6 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         if (StringUtils.isNotBlank(query.getOrderNo())) {
             qw.like("bvo.orderNo", query.getOrderNo());
         }
-
         if (StringUtils.isNotBlank(query.getOrderTypeKey())) {
             qw.like("bvo.orderTypeKey", query.getOrderTypeKey());
         }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapply.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapply.java <br/>
@@ -50,35 +52,33 @@ import lombok.Data;
 public class FinCostapply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("创建人接口")
-    private String createByName;
-	@ApiModelProperty("申请编号")
+    @ApiModelProperty("申请编号")
     private String billNo;
-	@ApiModelProperty("申请人姓名")
+    @ApiModelProperty("申请人姓名")
     private String name;
-	@ApiModelProperty("费用类型Key,数据字典")
+    @ApiModelProperty("费用类型Key,数据字典")
     private String costTypeKey;
-	@ApiModelProperty("费用类型Value")
+    @ApiModelProperty("费用类型Value")
     private String costTypeValue;
-	@ApiModelProperty("费用名称Key,数据字典")
+    @ApiModelProperty("费用名称Key,数据字典")
     private String costTitleKey;
-	@ApiModelProperty("费用名称Value")
+    @ApiModelProperty("费用名称Value")
     private String costTitleValue;
-	@ApiModelProperty("申请费用,元，小数点2位")
-    private Integer cost;
-	@ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
+    @ApiModelProperty("申请费用,元，小数点2位")
+    private BigDecimal cost;
+    @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
     private String useTypeKey;
-	@ApiModelProperty("使用方式value")
+    @ApiModelProperty("使用方式value")
     private String useTypeValue;
-	@ApiModelProperty("是否涉及车辆:1是，0否")
+    @ApiModelProperty("是否涉及车辆:1是，0否")
     private Integer isVeh;
-	@ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
+    @ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
     private Integer isOutDoor;
-	@ApiModelProperty("业务sid,可以为空")
+    @ApiModelProperty("业务sid,可以为空")
     private String busSid;
-	@ApiModelProperty("创建组织")
+    @ApiModelProperty("创建组织")
     private String createOrgSid;
-	@ApiModelProperty("使用组织")
+    @ApiModelProperty("使用组织")
     private String useOrgSid;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDetailsVo.java

@@ -49,37 +49,28 @@ import lombok.Data;
 @ApiModel(value = "fin_costapply 视图数据详情", description = "fin_costapply 视图数据详情")
 public class FinCostapplyDetailsVo implements Vo {
 
-    private String sid;
-
-	@ApiModelProperty("创建人接口")
-    private String createByName;
-	@ApiModelProperty("申请编号")
+    private static final long serialVersionUID = -954113101037446968L;
+    @ApiModelProperty("申请编号")
     private String billNo;
-	@ApiModelProperty("申请人姓名")
+    @ApiModelProperty("申请人姓名")
     private String name;
-	@ApiModelProperty("费用类型Key,数据字典")
+    @ApiModelProperty("费用类型Key,数据字典")
     private String costTypeKey;
-	@ApiModelProperty("费用类型Value")
+    @ApiModelProperty("费用类型Value")
     private String costTypeValue;
-	@ApiModelProperty("费用名称Key,数据字典")
+    @ApiModelProperty("费用名称Key,数据字典")
     private String costTitleKey;
-	@ApiModelProperty("费用名称Value")
+    @ApiModelProperty("费用名称Value")
     private String costTitleValue;
-	@ApiModelProperty("申请费用,元，小数点2位")
-    private Integer cost;
-	@ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
+    @ApiModelProperty("申请费用,元，小数点2位")
+    private String cost;
+    @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
     private String useTypeKey;
-	@ApiModelProperty("使用方式value")
+    @ApiModelProperty("使用方式value")
     private String useTypeValue;
-	@ApiModelProperty("是否涉及车辆:1是，0否")
+    @ApiModelProperty("是否涉及车辆:1是，0否")
     private Integer isVeh;
-	@ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
+    @ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
     private Integer isOutDoor;
-	@ApiModelProperty("业务sid,可以为空")
-    private String busSid;
-	@ApiModelProperty("创建组织")
-    private String createOrgSid;
-	@ApiModelProperty("使用组织")
-    private String useOrgSid;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java

@@ -27,7 +27,6 @@ package com.yxt.anrui.fin.api.fincostapply;
 
 
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -49,37 +48,31 @@ import lombok.Data;
 @ApiModel(value = "fin_costapply 数据传输对象", description = "fin_costapply 数据传输对象")
 public class FinCostapplyDto implements Dto {
 
+    private static final long serialVersionUID = 7058937610072256222L;
     private String sid;
-
-	@ApiModelProperty("创建人接口")
-   private String createByName;
-	@ApiModelProperty("申请编号")
-   private String billNo;
-	@ApiModelProperty("申请人姓名")
-   private String name;
-	@ApiModelProperty("费用类型Key,数据字典")
-   private String costTypeKey;
-	@ApiModelProperty("费用类型Value")
-   private String costTypeValue;
-	@ApiModelProperty("费用名称Key,数据字典")
-   private String costTitleKey;
-	@ApiModelProperty("费用名称Value")
-   private String costTitleValue;
-	@ApiModelProperty("申请费用,元，小数点2位")
-   private Integer cost;
-	@ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
-   private String useTypeKey;
-	@ApiModelProperty("使用方式value")
-   private String useTypeValue;
-	@ApiModelProperty("是否涉及车辆:1是，0否")
-   private Integer isVeh;
-	@ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
-   private Integer isOutDoor;
-	@ApiModelProperty("业务sid,可以为空")
-   private String busSid;
-	@ApiModelProperty("创建组织")
-   private String createOrgSid;
-	@ApiModelProperty("使用组织")
-   private String useOrgSid;
+    @ApiModelProperty(value = "用户sid")
+    private String createBySid;
+    @ApiModelProperty("申请人姓名")
+    private String name;
+    @ApiModelProperty("费用类型Key,数据字典")
+    private String costTypeKey;
+    @ApiModelProperty("费用类型Value")
+    private String costTypeValue;
+    @ApiModelProperty("费用名称Key,数据字典")
+    private String costTitleKey;
+    @ApiModelProperty("费用名称Value")
+    private String costTitleValue;
+    @ApiModelProperty("申请费用,元，小数点2位")
+    private String cost;
+    @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
+    private String useTypeKey;
+    @ApiModelProperty("使用方式value")
+    private String useTypeValue;
+    @ApiModelProperty("是否涉及车辆:1是，0否")
+    private Integer isVeh;
+    @ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
+    private Integer isOutDoor;
+    @ApiModelProperty(value = "业务sid")
+    private String busSid;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java

@@ -49,35 +49,23 @@ import lombok.Data;
 @ApiModel(value = "fin_costapply 查询条件", description = "fin_costapply 查询条件")
 public class FinCostapplyQuery implements Query {
 
-	@ApiModelProperty("创建人接口")
-    private String createByName;
-	@ApiModelProperty("申请编号")
-    private String billNo;
-	@ApiModelProperty("申请人姓名")
-    private String name;
-	@ApiModelProperty("费用类型Key,数据字典")
+    private static final long serialVersionUID = 6824724313813615982L;
+    @ApiModelProperty("费用类型Key,数据字典")
     private String costTypeKey;
-	@ApiModelProperty("费用类型Value")
+    @ApiModelProperty("费用类型Value")
     private String costTypeValue;
-	@ApiModelProperty("费用名称Key,数据字典")
+    @ApiModelProperty("费用名称Key,数据字典")
     private String costTitleKey;
-	@ApiModelProperty("费用名称Value")
+    @ApiModelProperty("费用名称Value")
     private String costTitleValue;
-	@ApiModelProperty("申请费用,元，小数点2位")
-    private Integer cost;
-	@ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
+    @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
     private String useTypeKey;
-	@ApiModelProperty("使用方式value")
-    private String useTypeValue;
-	@ApiModelProperty("是否涉及车辆:1是，0否")
-    private Integer isVeh;
-	@ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
-    private Integer isOutDoor;
-	@ApiModelProperty("业务sid,可以为空")
-    private String busSid;
-	@ApiModelProperty("创建组织")
-    private String createOrgSid;
-	@ApiModelProperty("使用组织")
-    private String useOrgSid;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "申请开始日期")
+    private String applyStartDate;
+    @ApiModelProperty(value = "申请结束日期")
+    private String applyEndDate;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapplyvehicle/FinCostapplyVehicleDetailsVo.java

@@ -27,11 +27,12 @@ package com.yxt.anrui.fin.api.fincostapplyvehicle;
 
 
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyVehicleVo.java <br/>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapplyvehicle/FinCostapplyVehicleDto.java

@@ -27,11 +27,12 @@ package com.yxt.anrui.fin.api.fincostapplyvehicle;
 
 
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyVehicleDto.java <br/>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapplyvehicle/FinCostapplyVehicleQuery.java

@@ -27,11 +27,12 @@ package com.yxt.anrui.fin.api.fincostapplyvehicle;
 
 
 import com.yxt.common.core.query.Query;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyVehicleQuery.java <br/>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapplyvehicle/FinCostapplyVehicleVo.java

@@ -27,11 +27,12 @@ package com.yxt.anrui.fin.api.fincostapplyvehicle;
 
 
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyVehicleVo.java <br/>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleCarInventoryListPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 盘库人员")
+    private String names;
+
+    @ApiModelProperty("时间段 示例 2020-02-01至2022-03-31")
+    private String date;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("盘库状态 通过1 不通过 2")
+    private String state;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageVo.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleCarInventoryListPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("合格证状态")
+    private String certificateState;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("最新盘库日期")
+    private String newInventoryDate;
+
+    @ApiModelProperty("最新存放地点")
+    private String newWarehouse;
+
+    @ApiModelProperty("最新盘库人员")
+    private String newInventoryName;
+
+    @ApiModelProperty("盘库人员Sid 除自己外另一人的sid")
+    private String inventorySid;
+
+    @ApiModelProperty("盘库人员名称 除自己外另一人的姓名")
+    private String inventoryName;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("是否显示办理按钮 不通过时显")
+    private boolean showUpdataBtn;
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryVo.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo <br/>
+ * Description: 待盘库记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
+public class AppScmVehicleStayInventoryDetailedsVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("合格证状态 有true")
+    private String certificateState;
+
+    @ApiModelProperty("本次盘库日期")
+    private String date;
+
+    @ApiModelProperty("本次存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("本次本次盘库人员")
+    private String name;
+
+    @ApiModelProperty("本次盘库状态")
+    private String state;
+
+    @ApiModelProperty("本次备注 “”/null 默认 -")
+    private String remarks;
+
+    @ApiModelProperty("上次盘库信息 无 默认null")
+    private LastInfo lastInfo;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryDto.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryDto <br/>
+ * Description: 待盘库记录 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 数据传输对象", description = "待盘库记录 数据传输对象")
+public class AppScmVehicleStayInventoryDto implements Dto {
+
+    @ApiModelProperty(value = "车架号")
+    private String mainSid;
+
+    @ApiModelProperty(value = "存放地点")
+    private String location;
+
+    @ApiModelProperty(value = "上次盘库日期")
+    private String lastData;
+
+    @ApiModelProperty(value = "上次盘库人员")
+    private String lastName;
+
+    @ApiModelProperty(value = "本次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty(value = "本次盘库人员sid")
+    private String inventorySid;
+
+    @ApiModelProperty(value = "是否有合格证")
+    private String certificate;
+
+    @ApiModelProperty(value = "是否有合格证")
+    private String certificateKey;
+
+    @ApiModelProperty(value = "状态 是否通过")
+    private String InventoryState;
+
+    @ApiModelProperty(value = "状态")
+    private String InventoryStateKey;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryVo.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo <br/>
+ * Description: 待盘库记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
+public class AppScmVehicleStayInventoryInfoVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid; // sid
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次盘库日期")
+    private String lastData;
+
+    @ApiModelProperty("上次盘库人")
+    private String lastName;
+
+    @ApiModelProperty("本次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty("本次盘库人员sid")
+    private String inventorySid;
+
+    @ApiModelProperty("是否有合格证")
+    private String certificateType;
+
+    @ApiModelProperty("是否有合格证")
+    private String certificateKey;
+
+    @ApiModelProperty("状态 是否通过")
+    private String stateType;
+
+    @ApiModelProperty("状态key")
+    private String stateKey;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/LastInfo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LastInfo implements Vo {
+
+    @ApiModelProperty("上次盘库日期")
+    private String lastDate;
+
+    @ApiModelProperty("上次盘库名称")
+    private String lastName;
+
+    @ApiModelProperty("上次存放地点")
+    private String lastWarehouse;
+
+    @ApiModelProperty("上次盘库状态")
+    private String lastState;
+
+    @ApiModelProperty("上次合格证状态")
+    private String lastCertificateState;
+
+    @ApiModelProperty("上次备注")
+    private String lastRemarks;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleInventoryFeign.java <br/>
@@ -65,14 +63,35 @@ public interface ScmVehicleInventoryFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehicleInventoryDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehicleInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-获取盘库记录列表")
+    @PostMapping("/getCarInventoryList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化盘库操作")
+    @GetMapping("/getInventory/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(@PathVariable("recordSid") String recordSid);
+
+    @ApiOperation("手机端-保存盘库操作")
+    @PostMapping("/saveInventory")
+    @ResponseBody
+    public ResultBean saveInventory(@RequestBody AppScmVehicleStayInventoryDto dto);
+
+    @ApiOperation("手机端-盘库详情")
+    @GetMapping("/getInventoryInfo/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(@PathVariable("recordSid") String recordSid);
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleInventoryFeignFallback.java <br/>
@@ -69,4 +67,25 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehicleinventory/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+		return null;
+	}
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionDetailedsVo.java

@@ -0,0 +1,9 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppScmVehiclePatrolinspectionDetailedsVo implements Vo {
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionDto.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionDto.java <br/>
+ * Class: anrui_scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionDto <br/>
+ * Description: 巡检记录 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "巡检记录 数据传输对象", description = "巡检记录 数据传输对象")
+public class AppScmVehiclePatrolinspectionDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("车架号")
+    private String mainSid; // 车架号
+    @ApiModelProperty("存放地点sid")
+    private String locationSid; // 存放地点sid
+    @ApiModelProperty("存放地点")
+    private String location; // 存放地点
+    @ApiModelProperty("合格证（有/无）")
+    private String certificate; // 合格证（有/无）
+    @ApiModelProperty("巡检日期")
+    private String patrolInspectionDate; // 巡检日期
+    @ApiModelProperty("巡检人员")
+    private String patrolInspectionName; // 巡检人员
+    @ApiModelProperty("巡检状态（通过/不通过）")
+    private String patrolInspectionState; // 巡检状态（通过/不通过）
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+    @ApiModelProperty("使用组织")
+    private String useOrgName; // 使用组织
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionInfoVo.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppScmVehiclePatrolinspectionInfoVo implements Vo {
+
+    @ApiModelProperty("记录sid")
+    private String recordSid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("巡检情况说明")
+    private String explain;
+
+    @ApiModelProperty("存在的问题及处理结果")
+    private String result;
+
+    @ApiModelProperty("相关责任人")
+    private String liableName;
+
+    @ApiModelProperty("相关责任人")
+    private String liableSid;
+
+    @ApiModelProperty("相关照片")
+    private List<String> images;
+
+    @ApiModelProperty("经纬度")
+    private String location;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppScmVehiclePatrolinspectionPageQuery implements Query {
+
+    private String userSid;
+
+    private String names;
+
+    private String useOrgSid;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppScmVehiclePatrolinspectionPageVo implements Vo {
+
+    private String sid;
+
+    private String vin;
+
+    private String newInspectionDate;
+
+    private String newInspectionName;
+
+    private String warehouse;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehiclePatrolinspectionFeign.java <br/>
@@ -65,14 +63,34 @@ public interface ScmVehiclePatrolinspectionFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehiclePatrolinspectionDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehiclePatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-获取巡检记录列表")
+    @PostMapping("/getCarInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化 巡检操作")
+    @GetMapping("/getInspection/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehiclePatrolinspectionInfoVo> getInspection(@PathVariable("recordSid") String recordSid);
+
+    @ApiOperation("手机端-保存巡检操作")
+    @PostMapping("/saveInspection")
+    @ResponseBody
+    public ResultBean saveInspection(@RequestBody AppScmVehiclePatrolinspectionDto dto);
+
+    @ApiOperation("手机端-通过巡检操作")
+    @PostMapping("/submitInspection")
+    @ResponseBody
+    public ResultBean submitInspection(@RequestBody AppScmVehiclePatrolinspectionDto dto);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java

@@ -69,4 +69,24 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehiclepatrolinspection/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehiclePatrolinspectionInfoVo> getInspection(String recordSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInspection(AppScmVehiclePatrolinspectionDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitInspection(AppScmVehiclePatrolinspectionDto dto) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/AppScmVehicleStayInventoryListPageQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.scm.api.scmvehiclestayinventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayInventoryListPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 盘库人员")
+    private String names;
+
+    @ApiModelProperty(" 存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
+    private String warehouseSid;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/AppScmVehicleStayInventoryListPageVo.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.scm.api.scmvehiclestayinventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayInventoryListPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty("上次盘库日期")
+    private String inventoryDate;
+
+    @ApiModelProperty("合格证状态")
+    private String certificateState;
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java

@@ -65,14 +65,27 @@ public interface ScmVehicleStayInventoryFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehicleStayInventoryDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehicleStayInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+    @ApiOperation("手机端-判断是否生成盘库记录")
+    @GetMapping("/getInventoryRecords/{userSid}")
+    @ResponseBody
+    public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-获取盘库列表")
+    @PostMapping("/getInventoryList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery);
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleStayInventoryFeignFallback.java <br/>
@@ -69,4 +67,16 @@ public class ScmVehicleStayInventoryFeignFallback implements ScmVehicleStayInven
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehiclestayinventory/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean getInventoryRecords(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
+    private String names;
+
+    @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
+    private String warehouseSid;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayPatrolinspectionPageVo implements Vo {
+
+    @ApiModelProperty("")
+    private String sid;
+
+    @ApiModelProperty("")
+    private String vin;
+
+    @ApiModelProperty("")
+    private String warehouse;
+
+    @ApiModelProperty("")
+    private String inspectionName;
+
+    @ApiModelProperty("")
+    private String inspectionDate;
+
+    @ApiModelProperty("")
+    private boolean state;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleStayPatrolinspectionFeign.java <br/>
@@ -65,14 +63,27 @@ public interface ScmVehicleStayPatrolinspectionFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehicleStayPatrolinspectionDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehicleStayPatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-判断是否生成巡检记录")
+    @GetMapping("/getInspectionRecords/{userSid}")
+    @ResponseBody
+    public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
+
+
+    @ApiOperation("手机端-获取巡检列表")
+    @PostMapping("/getInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery);
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java

@@ -69,4 +69,16 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehiclestaypatrolinspection/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean getInspectionRecords(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
+		return null;
+	}
+
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java

@@ -26,11 +26,11 @@
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -63,4 +63,31 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
 	
 	@Select("select * from scm_vehicle_inventory")
 	List<ScmVehicleInventoryVo> selectListVo();
+
+	/**
+	 * 手机端-获取盘库记录列表
+	 *
+	 * @param page
+	 * @param qw
+	 * @param names
+	 * @return
+	 */
+	IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(IPage<AppScmVehicleCarInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw, @Param("names") String names);
+
+	/**
+	 * 手机端-初始化盘库操作
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	AppScmVehicleStayInventoryInfoVo getInventory(@Param("recordSid") String recordSid);
+
+	/**
+	 * 手机端-盘库详情
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(@Param("recordSid") String recordSid);
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@@ -12,4 +12,58 @@
         SELECT * FROM scm_vehicle_inventory
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="getCarInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo">
+        SELECT
+        sid,
+        mainSid AS vin,
+        certificate AS certificateState,
+        InventoryState AS `state`,
+        inventorySid,
+        inventoryName,
+        remarks,
+        ( SELECT count( certificate ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) )
+        AS newInventoryDate,
+        ( SELECT count( location ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) ) AS
+        newWarehouse,
+        ( SELECT count( inventoryName ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime )
+        ) AS newInventoryName
+        FROM
+        scm_vehicle_inventory svi
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svi.mainSid,svi.InventoryName) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
+    <select id="getInventory"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryInfoVo">
+        SELECT sid,
+               mainSid        AS vin,
+               location       AS warehouse,
+               inventorySid,
+               inventoryName,
+               certificate    AS certificateType,
+               InventoryState AS stateType,
+               remarks
+        FROM scm_vehicle_inventory
+        where sid = #{recordSid}
+    </select>
+
+    <select id="getInventoryInfo"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryDetailedsVo">
+        SELECT mainSid           AS vin,
+               certificateKey    AS certificateState,
+               InventoryDate     AS `date`,
+               location          AS warehouse,
+               inventoryName     AS `name`,
+               InventoryStateKey AS state,
+               remarks
+        FROM scm_vehicle_inventory
+        where sid = #{recordSid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java

@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -92,4 +95,36 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
 		ScmVehicleInventoryDetailsVo vo = scmVehicleInventoryService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
+		if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+			new ResultBean<>().success().setMsg("用户sid不能为空");
+		}
+		PagerVo<AppScmVehicleCarInventoryListPageVo> page = new PagerVo<>();
+		IPage<AppScmVehicleCarInventoryListPageVo> iPage = scmVehicleInventoryService.getCarInventoryList(pagerQuery);
+		PagerVo<AppScmVehicleCarInventoryListPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+		return new ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>>().success().setData(pagerVo);
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
+		ResultBean rb = ResultBean.fireFail();
+		AppScmVehicleStayInventoryInfoVo vo = scmVehicleInventoryService.getInventory(recordSid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleInventoryService.AppScmVehicleStayInventoryDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+		ResultBean rb = ResultBean.fireFail();
+		AppScmVehicleStayInventoryDetailedsVo vo = scmVehicleInventoryService.getInventoryInfo(recordSid);
+		return rb.success().setData(vo);
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -28,7 +28,11 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -36,9 +40,9 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -55,6 +59,13 @@ import java.util.List;
  */
 @Service
 public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInventoryMapper, ScmVehicleInventory> {
+
+	@Autowired
+	SysStaffOrgFeign sysStaffOrgFeign;
+
+	@Autowired
+	BaseVehicleFeign baseVehicleFeign;
+
 	private QueryWrapper<ScmVehicleInventory> createQueryWrapper(ScmVehicleInventoryQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -102,4 +113,78 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	/**
+	 * 手机端-获取盘库记录列表
+	 *
+	 * @param pagerQuery
+	 * @return
+	 */
+	public IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
+		IPage<AppScmVehicleCarInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+		String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+		pagerQuery.getParams().setUseOrgSid(useOrgSid);
+		QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
+		AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
+		IPage<AppScmVehicleCarInventoryListPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
+		return iPage;
+	}
+
+	/**
+	 * 手机端-获取盘库记录列表 查询条件
+	 *
+	 * @param query
+	 * @return
+	 */
+	private QueryWrapper<AppScmVehicleCarInventoryListPageVo> appCarQueryWrapper(AppScmVehicleCarInventoryListPageQuery query) {
+		QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+			qw.eq("svi.createOrgSid", query.getUseOrgSid());
+		}
+		if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+			qw.eq("svi.locationSid", query.getWarehouseSid());
+		}
+		if (StringUtils.isNotBlank(query.getState())) {
+			qw.eq("svi.InventoryState", query.getState());
+		}
+		return qw;
+	}
+
+	/**
+	 * 手机端-初始化盘库操作
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	public AppScmVehicleStayInventoryInfoVo getInventory(String recordSid) {
+		AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid);
+		return vo;
+	}
+
+	/**
+	 * 手机端-保存盘库操作
+	 *
+	 * @param dto
+	 * @return
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public ResultBean AppScmVehicleStayInventoryDto(AppScmVehicleStayInventoryDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
+		ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
+		BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
+		save(scmVehicleInventory);
+		return rb.success().setMsg("保存成功");
+	}
+
+	/**
+	 * 手机端-盘库详情
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	public AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(String recordSid) {
+		AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid);
+		return vo;
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -26,11 +26,11 @@
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +53,31 @@ import java.util.List;
 @Mapper
 public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehiclePatrolinspection> {
 
-	//@Update("update scm_vehicle_patrolinspection set name=#{msg} where id=#{id}")
-	//IPage<ScmVehiclePatrolinspectionVo> voPage(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehiclePatrolinspection> qw);
-	
-	IPage<ScmVehiclePatrolinspectionVo> selectPageVo(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
-	
-	List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
-	
-	@Select("select * from scm_vehicle_patrolinspection")
-	List<ScmVehiclePatrolinspectionVo> selectListVo();
+    //@Update("update scm_vehicle_patrolinspection set name=#{msg} where id=#{id}")
+    //IPage<ScmVehiclePatrolinspectionVo> voPage(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehiclePatrolinspection> qw);
+
+    IPage<ScmVehiclePatrolinspectionVo> selectPageVo(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
+
+    List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
+
+    @Select("select * from scm_vehicle_patrolinspection")
+    List<ScmVehiclePatrolinspectionVo> selectListVo();
+
+    /**
+     * 手机端-获取巡检记录列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw, @Param("names") String names);
+
+    /**
+     * 手机端-初始化 巡检操作
+     *
+     * @param recordSid
+     * @return
+     */
+    AppScmVehiclePatrolinspectionInfoVo getInspection(@Param("recordSid") String recordSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -14,4 +14,27 @@
         SELECT * FROM scm_vehicle_patrolinspection
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="getCarInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
+        SELECT
+        sid,
+        mainSid as vin,
+        location as warehouse,
+        FROM
+        scm_vehicle_patrolinspection svp
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svp.mainSid,svp.patrolInspectionDate ,svp.location) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
+    <select id="getInspection"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionInfoVo">
+
+
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java

@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -91,4 +94,36 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
         ScmVehiclePatrolinspectionDetailsVo vo = scmVehiclePatrolinspectionService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmVehiclePatrolinspectionPageVo> page = new PagerVo<>();
+        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = scmVehiclePatrolinspectionService.getCarInventoryList(pagerQuery);
+        PagerVo<AppScmVehiclePatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>>().success().setData(pagerVo);
+    }
+
+    @Override
+    public ResultBean<AppScmVehiclePatrolinspectionInfoVo> getInspection(String recordSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppScmVehiclePatrolinspectionInfoVo vo = scmVehiclePatrolinspectionService.getInspection(recordSid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehiclePatrolinspectionService.saveInspection(dto);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean submitInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehiclePatrolinspectionService.submitInspection(dto);
+        return rb.success();
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -37,9 +38,9 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -56,51 +57,121 @@ import java.util.List;
  */
 @Service
 public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVehiclePatrolinspectionMapper, ScmVehiclePatrolinspection> {
-	private QueryWrapper<ScmVehiclePatrolinspection> createQueryWrapper(ScmVehiclePatrolinspectionQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<ScmVehiclePatrolinspectionVo> listPageVo(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
-		ScmVehiclePatrolinspectionQuery query = pq.getParams();
-		QueryWrapper<ScmVehiclePatrolinspection> qw = createQueryWrapper(query);
-		IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
-		IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(ScmVehiclePatrolinspectionDto dto){
+
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+
+    private QueryWrapper<ScmVehiclePatrolinspection> createQueryWrapper(ScmVehiclePatrolinspectionQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmVehiclePatrolinspectionVo> listPageVo(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
+        ScmVehiclePatrolinspectionQuery query = pq.getParams();
+        QueryWrapper<ScmVehiclePatrolinspection> qw = createQueryWrapper(query);
+        IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmVehiclePatrolinspectionDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(ScmVehiclePatrolinspectionDto dto){
-		ScmVehiclePatrolinspection entity = new ScmVehiclePatrolinspection();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(ScmVehiclePatrolinspectionDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmVehiclePatrolinspectionDto dto) {
+        ScmVehiclePatrolinspection entity = new ScmVehiclePatrolinspection();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmVehiclePatrolinspectionDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		ScmVehiclePatrolinspection entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public ScmVehiclePatrolinspectionDetailsVo fetchDetailsVoBySid(String sid){
-		ScmVehiclePatrolinspection entity = fetchBySid(sid);
-		ScmVehiclePatrolinspectionDetailsVo vo = new ScmVehiclePatrolinspectionDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        ScmVehiclePatrolinspection entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmVehiclePatrolinspectionDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmVehiclePatrolinspection entity = fetchBySid(sid);
+        ScmVehiclePatrolinspectionDetailsVo vo = new ScmVehiclePatrolinspectionDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    /**
+     * 手机端-获取巡检记录列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+        IPage<AppScmVehiclePatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
+        AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
+        return iPage;
+    }
+
+    /**
+     * 手机端-获取巡检记录列表 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<AppScmVehiclePatrolinspectionPageVo> appCarQueryWrapper(AppScmVehiclePatrolinspectionPageQuery query) {
+        QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("svi.createOrgSid", query.getUseOrgSid());
+        }
+        return qw;
+    }
+
+    /**
+     * 手机端-初始化 巡检操作
+     *
+     * @param recordSid
+     * @return
+     */
+    public AppScmVehiclePatrolinspectionInfoVo getInspection(String recordSid) {
+        AppScmVehiclePatrolinspectionInfoVo vo = baseMapper.getInspection(recordSid);
+        return vo;
+    }
+
+    /**
+     * 手机端-保存巡检操作
+     *
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean saveInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+
+        return rb.success();
+    }
+
+    /**
+     * 手机端-通过巡检操作
+     *
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean submitInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.success();
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java

@@ -26,11 +26,15 @@
 package com.yxt.anrui.scm.biz.scmvehiclestayinventory;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventory;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryDetailedsVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryInfoVo;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -54,13 +58,25 @@ import java.util.List;
 @Mapper
 public interface ScmVehicleStayInventoryMapper extends BaseMapper<ScmVehicleStayInventory> {
 
-	//@Update("update scm_vehicle_stay_inventory set name=#{msg} where id=#{id}")
-	//IPage<ScmVehicleStayInventoryVo> voPage(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleStayInventory> qw);
-	
-	IPage<ScmVehicleStayInventoryVo> selectPageVo(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
-	
-	List<ScmVehicleStayInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
-	
-	@Select("select * from scm_vehicle_stay_inventory")
-	List<ScmVehicleStayInventoryVo> selectListVo();
+    //@Update("update scm_vehicle_stay_inventory set name=#{msg} where id=#{id}")
+    //IPage<ScmVehicleStayInventoryVo> voPage(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleStayInventory> qw);
+
+    IPage<ScmVehicleStayInventoryVo> selectPageVo(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
+
+    List<ScmVehicleStayInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
+
+    @Select("select * from scm_vehicle_stay_inventory")
+    List<ScmVehicleStayInventoryVo> selectListVo();
+
+    /**
+     * 手机端-获取盘库列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(IPage<AppScmVehicleStayInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw, @Param("names") String names);
+
+
 }