Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+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: BasePurchaseSystem.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表", description = "采购系统管理表")
+@TableName("base_purchase_system")
+public class BasePurchaseSystem extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo <br/>
+ * Description: 采购系统管理表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 视图数据详情", description = "采购系统管理表 视图数据详情")
+public class BasePurchaseSystemDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto <br/>
+ * Description: 采购系统管理表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 数据传输对象", description = "采购系统管理表 数据传输对象")
+public class BasePurchaseSystemDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+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: BasePurchaseSystemFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购系统管理表")
+@FeignClient(
+        contextId = "anrui-base-BasePurchaseSystem",
+        name = "anrui-base",
+        path = "v1/basepurchasesystem",
+        fallback = BasePurchaseSystemFeignFallback.class)
+public interface BasePurchaseSystemFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BasePurchaseSystemVo>> listPage(@RequestBody PagerQuery<BasePurchaseSystemQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BasePurchaseSystemDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据分公司sid查询采购系统名称")
+    @GetMapping("/fetchDetailsByUseOrgSid/{useOrgSid}")
+    @ResponseBody
+    public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid);
+
+    @ApiOperation("根据部门sid查询采购系统名称")
+    @GetMapping("/fetchDetailsByDeptSid/{deptSid}")
+    @ResponseBody
+    public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(@PathVariable("deptSid") String deptSid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+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: BasePurchaseSystemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeignFallback <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign {
+
+	@Override
+	public ResultBean<PagerVo<BasePurchaseSystemVo>> listPage(PagerQuery<BasePurchaseSystemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basepurchasesystem/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BasePurchaseSystemDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basepurchasesystem/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basepurchasesystem/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basepurchasesystem/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(String useOrgSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
+		return null;
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery <br/>
+ * Description: 采购系统管理表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 查询条件", description = "采购系统管理表 查询条件")
+public class BasePurchaseSystemQuery implements Query {
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basepurchasesystem;
+
+
+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: BasePurchaseSystemVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo <br/>
+ * Description: 采购系统管理表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购系统管理表 视图数据对象", description = "采购系统管理表 视图数据对象")
+public class BasePurchaseSystemVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+	@ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+	@ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
+
+}

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

@@ -239,4 +239,13 @@ public class BaseVehicleVo implements Vo {
     private String carModel;
     @ApiModelProperty(value = "细分市场")
     private String marketSegmentsValue;
+
+    @ApiModelProperty("上装/挂车")
+    private String szOrGC;
+    @ApiModelProperty("上装/挂车配置")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@@ -81,4 +81,11 @@ public class BaseVehicleOut extends BaseEntity {
     private String middleCodeTwo;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("上装/挂车")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@@ -60,4 +60,11 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String saleDate;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("上装/挂车")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@@ -70,6 +70,13 @@ public class BaseVehicleOutDto implements Dto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
+    @ApiModelProperty("上装/挂车")
+    private String trailerOrInstall;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("总成交价")
+    private String totalDealPrice;
+
     @ApiModelProperty("是否要修改客户")
     private String isUpdateOrInsertCrm; // 是否要修改客户
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepurchasesystem;
+
+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 com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(采购系统管理) <br/>
+ * File: BasePurchaseSystemMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem> {
+
+	//@Update("update base_purchase_system set name=#{msg} where id=#{id}")
+	//IPage<BasePurchaseSystemVo> voPage(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) QueryWrapper<BasePurchaseSystem> qw);
+	
+	IPage<BasePurchaseSystemVo> selectPageVo(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);
+	
+	List<BasePurchaseSystemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);
+	
+	@Select("select * from base_purchase_system")
+	List<BasePurchaseSystemVo> selectListVo();
+
+	@Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}")
+	List<BasePurchaseSystemDetailsVo> fetchDetailsByUseOrgSid(String useOrgSid);
+
+	@Select("select * from base_purchase_system where deptSid = #{deptSid}")
+	BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(String deptSid);
+
+	@Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}")
+	BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(@Param("deptSid") String deptSid,@Param("sid") String sid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.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.basepurchasesystem.BasePurchaseSystemMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
+		SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
+		SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepurchasesystem;
+
+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.basepurchasesystem.BasePurchaseSystem;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+
+/**
+ * Project: anrui-base(采购系统管理) <br/>
+ * File: BasePurchaseSystemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest <br/>
+ * Description: 采购系统管理表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购系统管理表")
+@RestController("com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest")
+@RequestMapping("v1/basepurchasesystem")
+public class BasePurchaseSystemRest implements BasePurchaseSystemFeign {
+
+	@Autowired
+	private BasePurchaseSystemService basePurchaseSystemService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BasePurchaseSystemVo>> listPage(@RequestBody PagerQuery<BasePurchaseSystemQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BasePurchaseSystemVo> pv = basePurchaseSystemService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BasePurchaseSystemDto dto){
+		return basePurchaseSystemService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		basePurchaseSystemService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(String useOrgSid) {
+		return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid);
+	}
+
+	@Override
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
+		return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java

@@ -0,0 +1,143 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basepurchasesystem;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
+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.basepurchasesystem.BasePurchaseSystem;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(采购系统管理) <br/>
+ * File: BasePurchaseSystemService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService <br/>
+ * Description: 采购系统管理表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-01-06 09:27:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSystemMapper, BasePurchaseSystem> {
+	private QueryWrapper<BasePurchaseSystem> createQueryWrapper(BasePurchaseSystemQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BasePurchaseSystemVo> listPageVo(PagerQuery<BasePurchaseSystemQuery> pq) {
+		BasePurchaseSystemQuery query = pq.getParams();
+		QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getUseOrgSid())){
+			qw.eq("useOrgSid",query.getUseOrgSid());
+		}
+		if (StringUtils.isNotBlank(query.getPurchaseSystemName())){
+			qw.like("purchaseSystemName",query.getPurchaseSystemName());
+		}
+		IPage<BasePurchaseSystem> page = PagerUtil.queryToPage(pq);
+		IPage<BasePurchaseSystemVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BasePurchaseSystemVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public ResultBean saveOrUpdateDto(BasePurchaseSystemDto dto){
+		ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+			BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid());
+			if (basePurchaseSystemDetailsVo == null){
+				this.insertByDto(dto);
+				return rb.success().setMsg("添加成功");
+			}
+            return rb.setMsg("该部门下已存在采购系统，请重新选择");
+        }
+		BasePurchaseSystem basePurchaseSystem = fetchBySid(dtoSid);
+		if (basePurchaseSystem == null){
+			return rb.setMsg("该采购系统信息不存在");
+		}
+		BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid(), dtoSid);
+		if (basePurchaseSystemDetailsVo == null){
+			this.updateByDto(dto);
+			return rb.success().setMsg("修改成功");
+		}
+		return rb.setMsg("该部门下已存在采购系统，请重新选择");
+	}
+	
+	public void insertByDto(BasePurchaseSystemDto dto){
+		BasePurchaseSystem entity = new BasePurchaseSystem();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BasePurchaseSystemDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BasePurchaseSystem entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BasePurchaseSystemDetailsVo fetchDetailsVoBySid(String sid){
+		BasePurchaseSystem entity = fetchBySid(sid);
+		BasePurchaseSystemDetailsVo vo = new BasePurchaseSystemDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(String useOrgSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<BasePurchaseSystemDetailsVo> basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid);
+		return rb.success().setData(basePurchaseSystemDetailsVos);
+	}
+
+	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
+		ResultBean rb = ResultBean.fireFail();
+		BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid);
+		return rb.success().setData(basePurchaseSystemDetailsVo);
+	}
+}

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

@@ -10,20 +10,28 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationService;
+import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
+import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
+import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
+import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.anrui.base.common.enums.CertificState;
@@ -124,6 +132,14 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     private BaseManufacturerBankService baseManufacturerBankService;
     @Autowired
     private ScmWarehouseFeign scmWarehouseFeign;
+    @Autowired
+    private BaseTrailerService baseTrailerService;
+    @Autowired
+    private BaseVehinstallService baseVehinstallService;
+    @Autowired
+    private BaseTrailerModelService baseTrailerModelService;
+    @Autowired
+    private BaseVehinstallmodelService baseVehinstallmodelService;
 
     @Override
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
@@ -194,6 +210,33 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             String createOrgSid = record.getCreateOrgSid();
             BaseVehmodelVo data = baseVehmodelConfigService.selectOne(modelSid, modelConfigSid, createOrgSid).getData();
             record.setManufactorSettlementPrice(data.getManufactorSettlementPrice());
+            String sid = record.getSid();
+            BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerService.fetchByVehSid(sid);
+            BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(vinNo, createOrgSid);
+            if (baseTrailerDetailsVo != null){
+                BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailerDetailsVo.getTrailerModelSid());
+                String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
+                String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
+                String appearanceSizeHigh = baseTrailerModel.getAppearanceSizeHigh();
+                String appearanceSizeTotalHigh = baseTrailerModel.getAppearanceSizeTotalHigh();
+                String trailerTypeValue = baseTrailerModel.getTrailerTypeValue();
+                StringBuilder trailerModel = new StringBuilder();
+                trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")");
+                record.setSzOrGC("挂车");
+                record.setTrailerOrInstall(trailerModel.toString());
+                record.setTrailerOrInstallDealPrice(baseTrailerModel.getSaleGuidancePrice());
+            }else if (baseVehinstallDetailsVo != null){
+                BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstallDetailsVo.getMainSid());
+                String wk_long = baseVehinstallmodel.getWk_long();
+                String wk_wide = baseVehinstallmodel.getWk_wide();
+                String wk_high = baseVehinstallmodel.getWk_high();
+                String installName = baseVehinstallmodel.getInstallNameValue();
+                StringBuilder vehinstallmodel = new StringBuilder();
+                vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
+                record.setSzOrGC("上装");
+                record.setTrailerOrInstall(vehinstallmodel.toString());
+                record.setTrailerOrInstallDealPrice(baseVehinstallDetailsVo.getGuidePrice());
+            }
         }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -15,6 +15,10 @@ import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -66,6 +70,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private BaseTrailerService baseTrailerService;
     @Autowired
     private BaseVehinstallService baseVehinstallService;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -79,43 +87,71 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             String vinNo = String.join(",", count);
             return rb.setMsg(vinNo + "车辆不满足出库条件");
         }*/
-
-        String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-        Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
-        if (!aBoolean){
-            Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
-            if (!aBoolean1){
+        String vinSid = dto.getVinSid();
+        BdCustomer bdCustomer = new BdCustomer();
+        SysOrganizationVo sysOrganizationVo = null;
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData();
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
+            BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
+            if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
+                String payTypeKey = busSalesOrderDetailsVo.getPayTypeKey();
+                if ("1".equals(payTypeKey)){
+                    Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                    if (!aBoolean){
+                        List<BdCustomer> bdCustomers = new ArrayList<>();
+                        sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+                        bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+                        bdCustomer.setFName(dto.getCustomerName() + dto.getMobile());
+                        String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                        if (FNumber1.length() > 30){
+                            FNumber1 = FNumber1.substring(0,30);
+                            bdCustomer.setFNumber(FNumber1);
+                        }else {
+                            bdCustomer.setFNumber(FNumber1);
+                        }
+                        bdCustomer.setFShortName(dto.getConcatNo());
+                        bdCustomers.add(bdCustomer);
+                        finKingDeeFeign.draftBdCustomers(bdCustomers);
+                    }
+                }
+            }else {
+                String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
+                if (!aBoolean){
+                    Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                    if (!aBoolean1){
+                        List<BdCustomer> bdCustomers = new ArrayList<>();
+                        sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+                        bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+                        bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
+                        String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                        if (FNumber1.length() > 30){
+                            FNumber1 = FNumber1.substring(0,30);
+                            bdCustomer.setFNumber(FNumber1);
+                        }else {
+                            bdCustomer.setFNumber(FNumber1);
+                        }
+                        bdCustomer.setFShortName(dto.getConcatNo());
+                        bdCustomers.add(bdCustomer);
+                        finKingDeeFeign.draftBdCustomers(bdCustomers);
+                    }else {
+                        b = true;
+                        return rb.success().setData(b);
+                    }
+                }
+                //修改客户简称为合同编号
                 List<BdCustomer> bdCustomers = new ArrayList<>();
-                BdCustomer bdCustomer = new BdCustomer();
-                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
-                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
                 bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
-                String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-                if (FNumber1.length() > 30){
-                    FNumber1 = FNumber1.substring(0,30);
-                    bdCustomer.setFNumber(FNumber1);
-                }else {
-                    bdCustomer.setFNumber(FNumber1);
-                }
                 bdCustomer.setFShortName(dto.getConcatNo());
+                bdCustomer.setFNumber(FNumber);
+                bdCustomer.setOldFNumber(FNumber);
+                sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
                 bdCustomers.add(bdCustomer);
-                finKingDeeFeign.draftBdCustomers(bdCustomers);
-            }else {
-                b = true;
-                return rb.success().setData(b);
+                finKingDeeFeign.saveBdCustomers(bdCustomers);
             }
         }
-        //修改客户简称为合同编号
-        List<BdCustomer> bdCustomers = new ArrayList<>();
-        BdCustomer bdCustomer = new BdCustomer();
-        bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
-        bdCustomer.setFShortName(dto.getConcatNo());
-        bdCustomer.setFNumber(FNumber);
-        bdCustomer.setOldFNumber(FNumber);
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
-        bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-        bdCustomers.add(bdCustomer);
-        finKingDeeFeign.saveBdCustomers(bdCustomers);
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
@@ -181,8 +217,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             log.error(e.getMessage());
         }
         //推送金蝶上装/挂车销售出库单
-        /*SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
-        ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);*/
+        SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
+        finKingDeeFeign.draftSalOutStock(salOutStock);
         return rb.success();
     }