Merge remote-tracking branch 'origin/master'

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

@@ -2051,7 +2051,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         BaseVehicleSelectVo details = baseMapper.details(vehicleSid);
         Date salesDate= details.getSalesDate();
         String settlementStatus = details.getSettlementStatus();
-        if(salesDate!=null&&VehicleState.BuyoutEnum.PRE_BUYOUT.getCode().equals(settlementStatus)){
+        if(salesDate!=null||VehicleState.BuyoutEnum.PRE_BUYOUT.getCode().equals(settlementStatus)){
             return rb.success().setData(true);
         }
         return rb.success().setData(false);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBank.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+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-fin(安瑞财务) <br/>
+ * File: FinManufacturerBank.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank <br/>
+ * Description: 公司开户账号表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公司开户账号表", description = "公司开户账号表")
+@TableName("fin_manufacturer_bank")
+public class FinManufacturerBank extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("银行账号")
+    private String bankAccount;
+	@ApiModelProperty("开户银行")
+    private String depositBank;
+	@ApiModelProperty("账户名称")
+    private String accountName;
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey;
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue;
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets;
+	@ApiModelProperty("开户行地址")
+    private String bankAddress;
+	@ApiModelProperty("联行号")
+    private String paymentLines;
+	@ApiModelProperty("银行代码")
+    private String swiftCode;
+	@ApiModelProperty("币种")
+    private String currency;
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid;
+	@ApiModelProperty("分公司名称")
+    private String useOrgName;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo <br/>
+ * Description: 公司开户账号表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公司开户账号表 视图数据详情", description = "公司开户账号表 视图数据详情")
+public class FinManufacturerBankDetailsVo implements Vo {
+
+    private String sid;
+
+	@ApiModelProperty("银行账号")
+    private String bankAccount;
+	@ApiModelProperty("开户银行")
+    private String depositBank;
+	@ApiModelProperty("账户名称")
+    private String accountName;
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey;
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue;
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets;
+	@ApiModelProperty("开户行地址")
+    private String bankAddress;
+	@ApiModelProperty("联行号")
+    private String paymentLines;
+	@ApiModelProperty("银行代码")
+    private String swiftCode;
+	@ApiModelProperty("币种")
+    private String currency;
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid;
+	@ApiModelProperty("分公司名称")
+    private String useOrgName;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankDto.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDto <br/>
+ * Description: 公司开户账号表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公司开户账号表 数据传输对象", description = "公司开户账号表 数据传输对象")
+public class FinManufacturerBankDto implements Dto {
+
+    private String sid;
+
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+    @ApiModelProperty("开户银行")
+    private String depositBank;
+    @ApiModelProperty("账户名称")
+    private String accountName;
+    @ApiModelProperty("账户类型key")
+    private String dueBankKey;
+    @ApiModelProperty("账户类型value")
+    private String dueBankValue;
+    @ApiModelProperty("银行网点")
+    private String bankingOutlets;
+    @ApiModelProperty("开户行地址")
+    private String bankAddress;
+    @ApiModelProperty("联行号")
+    private String paymentLines;
+    @ApiModelProperty("银行代码")
+    private String swiftCode;
+    @ApiModelProperty("币种")
+    private String currency;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+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.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankFeign.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign <br/>
+ * Description: 公司开户账号表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "公司开户账号表")
+@FeignClient(
+        contextId = "anrui-fin-FinManufacturerBank",
+        name = "anrui-fin",
+        path = "v1/finmanufacturerbank",
+        fallback = FinManufacturerBankFeignFallback.class)
+public interface FinManufacturerBankFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<FinManufacturerBankVo>> listPage(@RequestBody PagerQuery<FinManufacturerBankQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody FinManufacturerBankDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinManufacturerBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+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;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback <br/>
+ * Description: 公司开户账号表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeign {
+
+	@Override
+	public ResultBean<PagerVo<FinManufacturerBankVo>> listPage(PagerQuery<FinManufacturerBankQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finmanufacturerbank/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(FinManufacturerBankDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finmanufacturerbank/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finmanufacturerbank/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<FinManufacturerBankDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finmanufacturerbank/fetchDetailsBySid无法访问");
+	}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankQuery.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankQuery <br/>
+ * Description: 公司开户账号表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公司开户账号表 查询条件", description = "公司开户账号表 查询条件")
+public class FinManufacturerBankQuery implements Query {
+
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+    @ApiModelProperty("开户银行")
+    private String depositBank;
+    @ApiModelProperty("账户名称")
+    private String accountName;
+    @ApiModelProperty("账户类型key")
+    private String dueBankKey;
+    @ApiModelProperty("账户类型value")
+    private String dueBankValue;
+    @ApiModelProperty("银行网点")
+    private String bankingOutlets;
+    @ApiModelProperty("开户行地址")
+    private String bankAddress;
+    @ApiModelProperty("联行号")
+    private String paymentLines;
+    @ApiModelProperty("银行代码")
+    private String swiftCode;
+    @ApiModelProperty("币种")
+    private String currency;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo <br/>
+ * Description: 公司开户账号表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公司开户账号表 视图数据对象", description = "公司开户账号表 视图数据对象")
+public class FinManufacturerBankVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+    @ApiModelProperty("开户银行")
+    private String depositBank;
+    @ApiModelProperty("账户名称")
+    private String accountName;
+    @ApiModelProperty("账户类型key")
+    private String dueBankKey;
+    @ApiModelProperty("账户类型value")
+    private String dueBankValue;
+    @ApiModelProperty("银行网点")
+    private String bankingOutlets;
+    @ApiModelProperty("开户行地址")
+    private String bankAddress;
+    @ApiModelProperty("联行号")
+    private String paymentLines;
+    @ApiModelProperty("银行代码")
+    private String swiftCode;
+    @ApiModelProperty("币种")
+    private String currency;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finmanufacturerbank;
+
+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.fin.api.finmanufacturerbank.FinManufacturerBank;
+import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankMapper.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankMapper <br/>
+ * Description: 公司开户账号表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FinManufacturerBankMapper extends BaseMapper<FinManufacturerBank> {
+
+	//@Update("update fin_manufacturer_bank set name=#{msg} where id=#{id}")
+	//IPage<FinManufacturerBankVo> voPage(IPage<FinManufacturerBank> page, @Param(Constants.WRAPPER) QueryWrapper<FinManufacturerBank> qw);
+	
+	IPage<FinManufacturerBankVo> selectPageVo(IPage<FinManufacturerBank> page, @Param(Constants.WRAPPER) Wrapper<FinManufacturerBank> qw);
+	
+	List<FinManufacturerBankVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinManufacturerBank> qw);
+	
+	@Select("select * from fin_manufacturer_bank")
+	List<FinManufacturerBankVo> selectListVo();
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.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.fin.biz.finmanufacturerbank.FinManufacturerBankMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo">
+		SELECT * FROM fin_manufacturer_bank <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo">
+		SELECT * FROM fin_manufacturer_bank <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finmanufacturerbank;
+
+import com.yxt.anrui.fin.api.finmanufacturerbank.*;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankRest <br/>
+ * Description: 公司开户账号表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "公司开户账号表")
+@RestController("com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankRest")
+@RequestMapping("v1/finmanufacturerbank")
+public class FinManufacturerBankRest implements FinManufacturerBankFeign {
+
+    @Autowired
+    private FinManufacturerBankService finManufacturerBankService;
+
+    @Override
+    public ResultBean<PagerVo<FinManufacturerBankVo>> listPage(@RequestBody PagerQuery<FinManufacturerBankQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinManufacturerBankVo> pv = finManufacturerBankService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean save(@RequestBody FinManufacturerBankDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        finManufacturerBankService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        finManufacturerBankService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean<FinManufacturerBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinManufacturerBankDetailsVo vo = finManufacturerBankService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finmanufacturerbank;
+
+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.fin.api.finmanufacturerbank.FinManufacturerBank;
+import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankQuery;
+import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo;
+import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo;
+import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDto;
+import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(安瑞财务) <br/>
+ * File: FinManufacturerBankService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService <br/>
+ * Description: 公司开户账号表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-03 15:00:11 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinManufacturerBankService extends MybatisBaseService<FinManufacturerBankMapper, FinManufacturerBank> {
+	private QueryWrapper<FinManufacturerBank> createQueryWrapper(FinManufacturerBankQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<FinManufacturerBank> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<FinManufacturerBankVo> listPageVo(PagerQuery<FinManufacturerBankQuery> pq) {
+		FinManufacturerBankQuery query = pq.getParams();
+		QueryWrapper<FinManufacturerBank> qw = createQueryWrapper(query);
+		IPage<FinManufacturerBank> page = PagerUtil.queryToPage(pq);
+		IPage<FinManufacturerBankVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<FinManufacturerBankVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(FinManufacturerBankDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(FinManufacturerBankDto dto){
+		FinManufacturerBank entity = new FinManufacturerBank();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(FinManufacturerBankDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		FinManufacturerBank entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public FinManufacturerBankDetailsVo fetchDetailsVoBySid(String sid){
+		FinManufacturerBank entity = fetchBySid(sid);
+		FinManufacturerBankDetailsVo vo = new FinManufacturerBankDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

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

@@ -51,6 +51,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -92,7 +94,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         if (StringUtils.isNotBlank(query.getLocationSid())) {
             qw.eq("svsi.locationSid", query.getLocationSid());
         }
-        qw.eq("bv.vehicleState","0001").or().eq("bv.vehicleState","0003");
+        qw.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0003");
         IPage<ScmVehicleStayInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleStayInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmVehicleStayInventoryVo> p = PagerUtil.pageToVo(pagging, null);
@@ -146,15 +148,18 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         if (scmVehicleStayInventoryVos.size() > 0) {
             return rb.setMsg("生成盘库记录失败，请查看是否有未盘库的记录");
         }
-        for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
-            ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
-            scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin());
-            scmVehicleStayInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
-            scmVehicleStayInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
-            scmVehicleStayInventory.setInventoryName("");
-            scmVehicleStayInventory.setInventoryDate("");
-            scmVehicleStayInventory.setCreateOrgSid(orgSid);
-            save(scmVehicleStayInventory);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
+                ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
+                scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin());
+                scmVehicleStayInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
+                scmVehicleStayInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
+                scmVehicleStayInventory.setInventoryName("");
+                scmVehicleStayInventory.setInventoryDate("");
+                scmVehicleStayInventory.setCreateOrgSid(orgSid);
+                save(scmVehicleStayInventory);
+            }
         }
         return rb.success();
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -144,15 +145,18 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
             return rb.setMsg("生成巡检记录失败，请查看是否有未巡检的记录");
         }
         List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
-        for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
-            ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = new ScmVehicleStayPatrolinspection();
-            scmVehicleStayPatrolinspection.setMainSid(appScmInventoryRecordsVo.getVin());
-            scmVehicleStayPatrolinspection.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
-            scmVehicleStayPatrolinspection.setLocation(appScmInventoryRecordsVo.getWarehouse());
-            scmVehicleStayPatrolinspection.setModelSid(appScmInventoryRecordsVo.getModelSid());
-            scmVehicleStayPatrolinspection.setModelName(appScmInventoryRecordsVo.getModelName());
-            scmVehicleStayPatrolinspection.setCreateOrgSid(orgSid);
-            save(scmVehicleStayPatrolinspection);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
+                ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = new ScmVehicleStayPatrolinspection();
+                scmVehicleStayPatrolinspection.setMainSid(appScmInventoryRecordsVo.getVin());
+                scmVehicleStayPatrolinspection.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
+                scmVehicleStayPatrolinspection.setLocation(appScmInventoryRecordsVo.getWarehouse());
+                scmVehicleStayPatrolinspection.setModelSid(appScmInventoryRecordsVo.getModelSid());
+                scmVehicleStayPatrolinspection.setModelName(appScmInventoryRecordsVo.getModelName());
+                scmVehicleStayPatrolinspection.setCreateOrgSid(orgSid);
+                save(scmVehicleStayPatrolinspection);
+            }
         }
         return rb.success();
     }

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue

@@ -98,7 +98,7 @@
                 <span>{{ scope.row.location }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售指导价(元)" align="center">
+            <el-table-column label="厂家结算价(元)" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue

@@ -70,6 +70,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
@@ -123,7 +128,7 @@
 <script>
 import req from '@/api/supplychain/cheliangneigou'
 import { getListOrg, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons.js'
-import configuration from '@/views/supplychain/cheliangpaichan/chexingbyconfiguration'
+import configuration from './chexingselect'
 import vehicle from './vehicleselect'
 
 export default {
@@ -296,7 +301,7 @@ export default {
       }
       if (this.formobj.shuntingTypeValue === '调入') {
         this.viewState = 2
-        this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles)
+        this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.sellerOrgSid)
       } else {
         this.viewState = 3
         this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles)
@@ -342,6 +347,7 @@ export default {
             configName: e.configName, // 常用配置名称
             configSid: e.configSid, // 常用配置sid
             freight: '', // 运费
+            guidedPrice: '',
             freightUndertakerName: '', // 运费承担方名称
             freightUndertakerSid: '', // 运费承担方sid
             inventoryLocationName: e.location, // 库存地点名称
@@ -370,6 +376,7 @@ export default {
             configName: e.configName, // 常用配置名称
             configSid: e.configSid, // 常用配置sid
             freight: '', // 运费
+            guidedPrice: '',
             freightUndertakerName: '', // 运费承担方名称
             freightUndertakerSid: '', // 运费承担方sid
             inventoryLocationName: '', // 库存地点名称

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue

@@ -50,6 +50,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/chexingselect.vue

@@ -0,0 +1,189 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>车型常用列表</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="100px">
+              <el-form-item label="车型:">
+                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="常用配置:">
+                <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh"  size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="车型" align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" header-align="center" align="left">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(元)" width="200" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/kucunguanli/price'
+
+export default {
+  name: "chexingxuanze",
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      userOrgSid: '',
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          vehicleAlias: '',
+          configName: '',
+          useOrgSid: '',
+          vehicleStateValue: '',
+          sidList: []
+        },
+        total: 1
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.useOrgSid = this.userOrgSid
+      req.configurationlistPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 10
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.configName = ''
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.vehicleStateValue = ''
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          vehicleAlias: element.vehicleAlias,
+          modelSid: element.modelSid,
+          configName: element.configName,
+          configSid: element.configSid,
+          guidedPrice: element.guidedPrice
+        })
+      })
+      this.sids = aa
+    },
+    showData(value, orgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push({
+            modelSid: value[i].vehicleSid,
+            configSid: value[i].configSid
+          })
+        }
+        this.listQuery.params.sidList = aa
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.userOrgSid = orgSid
+      this.getList()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        console.log('勾选的车辆信息',this.sids)
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条车型记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/relation/xuanzecheliang.vue

@@ -98,7 +98,7 @@
                 <span>{{ scope.row.location }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售指导价(元)" align="center">
+            <el-table-column label="厂家结算价(元)" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/chexingselect.vue

@@ -0,0 +1,189 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>车型常用列表</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="100px">
+              <el-form-item label="车型:">
+                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="常用配置:">
+                <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh"  size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="车型" align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" header-align="center" align="left">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(元)" width="200" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/kucunguanli/price'
+
+export default {
+  name: "chexingxuanze",
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      userOrgSid: '',
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          vehicleAlias: '',
+          configName: '',
+          useOrgSid: '',
+          vehicleStateValue: '',
+          sidList: []
+        },
+        total: 1
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.useOrgSid = this.userOrgSid
+      req.configurationlistPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 10
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.configName = ''
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.vehicleStateValue = ''
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          vehicleAlias: element.vehicleAlias,
+          modelSid: element.modelSid,
+          configName: element.configName,
+          configSid: element.configSid,
+          guidedPrice: element.guidedPrice
+        })
+      })
+      this.sids = aa
+    },
+    showData(value, orgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push({
+            modelSid: value[i].vehicleSid,
+            configSid: value[i].configSid
+          })
+        }
+        this.listQuery.params.sidList = aa
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.userOrgSid = orgSid
+      this.getList()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        console.log('勾选的车辆信息',this.sids)
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条车型记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue

@@ -52,6 +52,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue

@@ -52,6 +52,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue

@@ -52,6 +52,12 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span v-if="shuntingVisible">{{ scope.row.guidedPrice }}</span>
+                <el-input v-if="shuntingTypeVisible" v-model="scope.row.guidedPrice" clearable placeholder=""></el-input>
+              </template>
+            </el-table-column>
             <el-table-column v-if="shuntingTypeVisible" label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue

@@ -52,6 +52,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue

@@ -69,6 +69,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
@@ -122,7 +127,7 @@
 <script>
 import req from '@/api/supplychain/cheliangneigou'
 import { getListOrg, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons.js'
-import configuration from '@/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration'
+import configuration from './chexingselect'
 import vehicle from './vehicleselect'
 
 export default {
@@ -308,7 +313,7 @@ export default {
       }
       if (this.formobj.shuntingTypeValue === '调入') {
         this.viewState = 2
-        this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles)
+        this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.sellerOrgSid)
       } else {
         this.viewState = 3
         this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles)
@@ -343,6 +348,7 @@ export default {
             configName: e.configName, // 常用配置名称
             configSid: e.configSid, // 常用配置sid
             freight: '', // 运费
+            guidedPrice: '',
             freightUndertakerName: '', // 运费承担方名称
             freightUndertakerSid: '', // 运费承担方sid
             inventoryLocationName: e.location, // 库存地点名称
@@ -371,6 +377,7 @@ export default {
             configName: e.configName, // 常用配置名称
             configSid: e.configSid, // 常用配置sid
             freight: '', // 运费
+            guidedPrice: '',
             freightUndertakerName: '', // 运费承担方名称
             freightUndertakerSid: '', // 运费承担方sid
             inventoryLocationName: '', // 库存地点名称

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue

@@ -50,6 +50,11 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售指导价(元)" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>

anrui-system-ui/src/components/flow/flowRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--流程流转记录-->
-    <el-card>
+    <el-card style="overflow: auto;height: 600px">
       <el-col :span="24">
         <div>
           <div style="width:50%;float:left;">
@@ -96,5 +96,6 @@ export default {
 .el-tag {
   white-space: normal;
   height: auto;
+  line-height: 20px;
 }
 </style>

anrui-system-ui/src/views/Home/Home.vue

@@ -375,6 +375,7 @@
         list-style: none;
         width: 25%;
         text-align: center;
+        position: relative;
 
         img {
           width: 70px;
@@ -488,6 +489,7 @@
   }
   .mark {
     position: absolute;
-    top: 54px;
+    top: 48px;
+    right: 87px;
   }
 </style>

anrui-system-ui/src/views/flow/doneList.vue

@@ -106,7 +106,7 @@
     <!-- End查看页面-->
 
     <!-- 编辑信息 -->
-    <el-dialog title="审批记录" :visible.sync="editDialog" width="60%">
+    <el-dialog title="审批记录" :visible.sync="editDialog" width="80%" style="overflow: hidden">
       <!--流程流转记录-->
       <flow-records :xmlData="xmlData" :taskData="taskList" :flowRecordList="flowRecordList"></flow-records>
     </el-dialog>

anrui-system-ui/src/views/flow/todoList.vue

@@ -105,7 +105,7 @@
     <!-- End办理页面-->
 
     <!-- 编辑信息页面 -->
-    <el-dialog title="审批记录" :visible.sync="editDialog" width="80%" >
+    <el-dialog title="审批记录" :visible.sync="editDialog" width="80%" style="overflow: hidden">
       <flow-records :xmlData="xmlData" :taskData="taskList" :flowRecordList="flowRecordList"></flow-records>
     </el-dialog>
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeign.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.baseInfo;
+
+import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeignFallback;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui-scm(供应链) <br/>
+ * File: ScmVehinspectItemFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign <br/>
+ * Description: 验车单中的检查表项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "供应链待阅数量")
+@FeignClient(
+        contextId = "anrui-terminal-AppScmVehinspectItem",
+        name = "anrui-terminal",
+        path = "supplychain/v1/baseInfo",
+        fallback = AppScmVehinspectItemFeignFallback.class)
+public interface AppScmBaseInfoFeign {
+
+
+    @ApiOperation("获取供应链各业务模块待办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(@PathVariable("userSid") String userSid);
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoFeignFallback.java

@@ -0,0 +1,55 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.baseInfo;
+
+import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeign;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: anrui-scm(供应链) <br/>
+ * File: ScmVehinspectItemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeignFallback <br/>
+ * Description: 验车单中的检查表项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppScmBaseInfoFeignFallback implements AppScmBaseInfoFeign {
+
+
+    @Override
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.api.supplychain.baseInfo;
+
+import com.itextpdf.text.pdf.PRAcroForm;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmBaseInfoVo implements Vo {
+    private static final long serialVersionUID = 7209750242078279372L;
+
+    @ApiModelProperty("验车代办数量")
+    private String inspectedCarNum;
+
+    @ApiModelProperty("入库代办数量")
+    private String storageCarNum;
+
+    @ApiModelProperty("移位代办数量")
+    private String moveCarNum;
+
+    @ApiModelProperty("盘库代办数量")
+    private String inventoryCarNum;
+
+    @ApiModelProperty("巡检代办数量")
+    private String inspectinoCarNum;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoRest.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.baseInfo;
+
+import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign;
+import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeign;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto;
+import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo;
+import com.yxt.anrui.terminal.biz.supplychain.carInspected.AppScmVehinspectItemService;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Project: anrui-scm(供应链) <br/>
+ * File: ScmVehinspectItemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemRest <br/>
+ * Description: 验车单中的检查表项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Controller
+@RequestMapping("supplychain/v1/baseInfo")
+public class AppScmBaseInfoRest implements AppScmBaseInfoFeign {
+
+    @Autowired
+    AppScmBaseInfoService appScmBaseInfoService;
+
+    @Override
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
+        return appScmBaseInfoService.getToDoNum(userSid);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.terminal.biz.supplychain.baseInfo;
+
+import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign;
+import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign;
+import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoVo;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppScmBaseInfoService {
+
+    @Autowired
+    ScmVehicleExamineFeign scmVehicleExamineFeign;
+    @Autowired
+    ScmVehicleEnterlibraryFeign scmVehicleEnterlibraryFeign;
+    @Autowired
+    ScmVehicleGressionFeign scmVehicleGressionFeign;
+    @Autowired
+    ScmVehicleStayInventoryFeign scmVehicleStayInventoryFeign;
+    @Autowired
+    ScmVehicleStayPatrolinspectionFeign scmVehicleStayPatrolinspectionFeign;
+
+
+    public ResultBean<AppScmBaseInfoVo> getToDoNum(String userSid) {
+        ResultBean<AppScmBaseInfoVo> rb = ResultBean.fireFail();
+        AppScmBaseInfoVo appScmBaseInfoVo = new AppScmBaseInfoVo();
+        String inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid).getData();
+        String storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData();
+        String moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData();
+        String inventoryCarNum = scmVehicleStayInventoryFeign.getToDoNum(userSid).getData();
+        String inspectinoCarNum = scmVehicleStayPatrolinspectionFeign.getToDoNum(userSid).getData();
+        appScmBaseInfoVo.setInspectedCarNum(inspectedCarNum);
+        appScmBaseInfoVo.setStorageCarNum(storageCarNum);
+        appScmBaseInfoVo.setMoveCarNum(moveCarNum);
+        appScmBaseInfoVo.setInventoryCarNum(inventoryCarNum);
+        appScmBaseInfoVo.setInspectinoCarNum(inspectinoCarNum);
+        return rb.success().setData(appScmBaseInfoVo);
+    }
+
+}

doc/databases/fin_tables.sql

@@ -887,22 +887,22 @@ CREATE TABLE `fin_notes_receivable_order`
     `salesOrg`              varchar(64)          DEFAULT NULL COMMENT '销售组织',
     `salesDepartment`       varchar(64)          DEFAULT NULL COMMENT '销售部门',
     `salesGroup`            varchar(64)          DEFAULT NULL COMMENT '销售组',
-    `salesman`             varchar(64) DEFAULT NULL COMMENT '销售员',
-    `settlementState`      varchar(64) DEFAULT NULL COMMENT '结算状态',
-    `dataState`            varchar(64) DEFAULT NULL COMMENT '数据状态',
-    `receivingBank`        varchar(64) DEFAULT NULL COMMENT '收款银行',
-    `proBankAcc`           varchar(64) DEFAULT NULL COMMENT '收款银行账号',
-    `receivingAccountName` varchar(64) DEFAULT NULL COMMENT '收款账户名称',
-    `receivingBankAddress` varchar(64) DEFAULT NULL COMMENT '收款银行地址',
-    `payingBank`           varchar(64) DEFAULT NULL COMMENT '付款银行',
-    `payingBankAcc`        varchar(64) DEFAULT NULL COMMENT '付款银行账号',
-    `payingAccountName`    varchar(64) DEFAULT NULL COMMENT '付款账户名称',
-    `payingBankAddress`    varchar(64) DEFAULT NULL COMMENT '付款银行地址',
-    `baseCurrency`         varchar(64) DEFAULT NULL COMMENT '本位币',
-    `exchangeRateType`     varchar(64) DEFAULT NULL COMMENT '汇率类型',
-    `exchangeRate`         varchar(64) DEFAULT NULL COMMENT '汇率',
-    `endorsementDate`      DATE        DEFAULT NULL COMMENT '背书日期',
-    `endorser`             varchar(64) DEFAULT NULL COMMENT '背书人（前手）',
+    `salesman`              varchar(64)          DEFAULT NULL COMMENT '销售员',
+    `settlementState`       varchar(64)          DEFAULT NULL COMMENT '结算状态',
+    `dataState`             varchar(64)          DEFAULT NULL COMMENT '数据状态',
+    `receivingBank`         varchar(64)          DEFAULT NULL COMMENT '收款银行',
+    `proBankAcc`            varchar(64)          DEFAULT NULL COMMENT '收款银行账号',
+    `receivingAccountName`  varchar(64)          DEFAULT NULL COMMENT '收款账户名称',
+    `receivingBankAddress`  varchar(64)          DEFAULT NULL COMMENT '收款银行地址',
+    `payingBank`            varchar(64)          DEFAULT NULL COMMENT '付款银行',
+    `payingBankAcc`         varchar(64)          DEFAULT NULL COMMENT '付款银行账号',
+    `payingAccountName`     varchar(64)          DEFAULT NULL COMMENT '付款账户名称',
+    `payingBankAddress`     varchar(64)          DEFAULT NULL COMMENT '付款银行地址',
+    `baseCurrency`          varchar(64)          DEFAULT NULL COMMENT '本位币',
+    `exchangeRateType`      varchar(64)          DEFAULT NULL COMMENT '汇率类型',
+    `exchangeRate`          varchar(64)          DEFAULT NULL COMMENT '汇率',
+    `endorsementDate`       DATE                 DEFAULT NULL COMMENT '背书日期',
+    `endorser`              varchar(64)          DEFAULT NULL COMMENT '背书人（前手）',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
@@ -1000,4 +1000,36 @@ CREATE TABLE `fin_item`
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
-  DEFAULT CHARSET = utf8 COMMENT ='费用项目表';
+  DEFAULT CHARSET = utf8 COMMENT ='费用项目表';
+
+
+DROP TABLE IF EXISTS `fin_manufacturer_bank`;
+CREATE TABLE `fin_manufacturer_bank`
+(
+    `id`             int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`            varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`    int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`       int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`          int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`       int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`        varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`    varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`    varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `bankAccount`    VARCHAR(64)          DEFAULT NULL COMMENT '银行账号',
+    `depositBank`    VARCHAR(64)          DEFAULT NULL COMMENT '开户银行',
+    `accountName`    VARCHAR(64)          DEFAULT NULL COMMENT '账户名称',
+    `dueBankKey`     varchar(64)          DEFAULT NULL COMMENT '账户类型key',
+    `dueBankValue`   varchar(64)          DEFAULT NULL COMMENT '账户类型value',
+    `bankingOutlets` varchar(64)          DEFAULT NULL COMMENT '银行网点',
+    `bankAddress`    varchar(64)          DEFAULT NULL COMMENT '开户行地址',
+    `paymentLines`   varchar(64)          DEFAULT NULL COMMENT '联行号',
+    `swiftCode`      varchar(64)          DEFAULT NULL COMMENT '银行代码',
+    `currency`       varchar(64)          DEFAULT NULL COMMENT '币种',
+    `useOrgSid`      varchar(64)          DEFAULT NULL COMMENT '分公司sid',
+    `useOrgName`     varchar(64)          DEFAULT NULL COMMENT '分公司名称',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='公司开户账号表';