From a5df7f2ba39986cb010f1e345f33287e4608b4ed Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 6 Jan 2023 16:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasePurchaseSystem.java | 64 ++++++++ .../BasePurchaseSystemDetailsVo.java | 65 ++++++++ .../BasePurchaseSystemDto.java | 65 ++++++++ .../BasePurchaseSystemFeign.java | 88 +++++++++++ .../BasePurchaseSystemFeignFallback.java | 82 ++++++++++ .../BasePurchaseSystemQuery.java | 57 +++++++ .../BasePurchaseSystemVo.java | 65 ++++++++ .../base/api/basevehicle/BaseVehicleVo.java | 9 ++ .../api/basevehicleout/BaseVehicleOut.java | 7 + .../BaseVehicleOutDetailsVo.java | 7 + .../api/basevehicleout/BaseVehicleOutDto.java | 7 + .../BasePurchaseSystemMapper.java | 75 +++++++++ .../BasePurchaseSystemMapper.xml | 13 ++ .../BasePurchaseSystemRest.java | 108 +++++++++++++ .../BasePurchaseSystemService.java | 143 ++++++++++++++++++ .../base/biz/basevehicle/BaseVehicleRest.java | 43 ++++++ .../basevehicleout/BaseVehicleOutService.java | 102 +++++++++---- 17 files changed, 967 insertions(+), 33 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java new file mode 100644 index 0000000000..6c068cbc2f --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystem.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem
+ * Description: 采购系统管理表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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; // 采购系统名称 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java new file mode 100644 index 0000000000..4c13bea73f --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemVo.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo
+ * Description: 采购系统管理表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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; // 采购系统名称 + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java new file mode 100644 index 0000000000..b1fa14753b --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemDto.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDto
+ * Description: 采购系统管理表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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; // 采购系统名称 + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java new file mode 100644 index 0000000000..d8fb04592d --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemFeign.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign
+ * Description: 采购系统管理表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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> listPage(@RequestBody PagerQuery 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 fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据分公司sid查询采购系统名称") + @GetMapping("/fetchDetailsByUseOrgSid/{useOrgSid}") + @ResponseBody + public ResultBean> fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid); + + @ApiOperation("根据部门sid查询采购系统名称") + @GetMapping("/fetchDetailsByDeptSid/{deptSid}") + @ResponseBody + public ResultBean fetchDetailsByDeptSid(@PathVariable("deptSid") String deptSid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java new file mode 100644 index 0000000000..1404a07d25 --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeignFallback
+ * Description: 采购系统管理表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign { + + @Override + public ResultBean> listPage(PagerQuery 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 fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/basepurchasesystem/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) { + return null; + } + + @Override + public ResultBean fetchDetailsByDeptSid(String deptSid) { + return null; + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemQuery.java new file mode 100644 index 0000000000..d2b6480476 --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemQuery.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemQuery
+ * Description: 采购系统管理表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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; // 采购系统名称 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java new file mode 100644 index 0000000000..d18ad3f2c2 --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemVo.java
+ * Class: com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo
+ * Description: 采购系统管理表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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; // 采购系统名称 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index 87d5ca8863..e9d8291661 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/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; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java index fa5bf16f60..bf17ece0f1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java +++ b/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; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java index e119f079c3..d927711431 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java +++ b/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; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index 998ee8a8a1..8cbdd6dbaa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/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; // 是否要修改客户 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java new file mode 100644 index 0000000000..84a87ae5c4 --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemMapper.java
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper
+ * Description: 采购系统管理表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BasePurchaseSystemMapper extends BaseMapper { + + //@Update("update base_purchase_system set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_purchase_system") + List selectListVo(); + + @Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}") + List 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); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml new file mode 100644 index 0000000000..7745c293b1 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java new file mode 100644 index 0000000000..90668d8066 --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest
+ * Description: 采购系统管理表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @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> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) { + return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid); + } + + @Override + public ResultBean fetchDetailsByDeptSid(String deptSid) { + return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid); + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java new file mode 100644 index 0000000000..3b4dd67b34 --- /dev/null +++ b/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(采购系统管理)
+ * File: BasePurchaseSystemService.java
+ * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService
+ * Description: 采购系统管理表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-01-06 09:27:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BasePurchaseSystemService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(BasePurchaseSystemQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BasePurchaseSystemQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getUseOrgSid())){ + qw.eq("useOrgSid",query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())){ + qw.like("purchaseSystemName",query.getPurchaseSystemName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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> fetchDetailsByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid); + return rb.success().setData(basePurchaseSystemDetailsVos); + } + + public ResultBean fetchDetailsByDeptSid(String deptSid) { + ResultBean rb = ResultBean.fireFail(); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid); + return rb.success().setData(basePurchaseSystemDetailsVo); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 50e5bc0eae..6915a8fc95 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/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> pagerList(@RequestBody PagerQuery 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 pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 2e41b1a174..fc840ba203 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/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 vehicleOut(BaseVehicleOutDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -79,43 +87,71 @@ public class BaseVehicleOutService extends MybatisBaseService 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 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 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 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 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