diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java index e9a9eeec61..99748e0e1c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java @@ -60,5 +60,4 @@ public class BaseBrandletpricepowimit extends BaseEntity { private String useOrgName; // 分公司名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java index ff3e17f6ff..8316c274a9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java @@ -64,6 +64,8 @@ public class BaseBrandletpricepowimitDto implements Dto { private String useOrgName; // 分公司名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("事业部sid") + private String sybOrgSid; // 事业部sid @ApiModelProperty("角色让价权限") private List baseRoleletpricepowimits; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchSystemVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchSystemVo.java new file mode 100644 index 0000000000..ef71c7dea9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchSystemVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.base.api.basepurchasesystem; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/6 17:13 + * @Description + */ +@Data +public class BasePurchSystemVo implements Vo { + private static final long serialVersionUID = -6059479664434626360L; + @ApiModelProperty("采购系统sid") + private String sid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; +} 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/basetrailer/BaseTrailerDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java index 33ac1a9e41..903e7e5314 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java @@ -86,7 +86,8 @@ public class BaseTrailerDto implements Dto { private String useOrgSid; @ApiModelProperty("分公司名称") private String useOrgName; - + @ApiModelProperty("部门sid") + private String departmentSid; @ApiModelProperty("发票照片") private List invoicePic; @ApiModelProperty("合格证照片") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java index 5ff47c22e7..af5aaa525d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java @@ -51,8 +51,8 @@ public class BaseTrailerQuery implements Query { @ApiModelProperty("挂车车架号") private String vinNo; - @ApiModelProperty("车辆品牌sid") - private String carBrand; // 车辆品牌sid + @ApiModelProperty("车辆品牌名称") + private String carBrandName; // 车辆品牌名称 @ApiModelProperty("车辆型号") private String carModelName; // 车辆型号 @ApiModelProperty("厂商sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java index 9417d61ea3..16e728f950 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java @@ -50,8 +50,6 @@ import lombok.Data; public class BaseTrailerModel extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("车辆品牌sid") - private String brandSid; // 车辆品牌sid @ApiModelProperty("车辆品牌名称") private String brandName; // 车辆品牌名称 @ApiModelProperty("车辆型号名称") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java index 056814dbce..859de68f5d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java @@ -51,8 +51,6 @@ public class BaseTrailerModelDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("车辆品牌sid") - private String brandSid; // 车辆品牌sid @ApiModelProperty("车辆品牌名称") private String brandName; // 车辆品牌名称 @ApiModelProperty("车辆型号名称") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java index af6cbfc033..2c349b3143 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java @@ -51,8 +51,6 @@ public class BaseTrailerModelDto implements Dto { private String sid; // sid - @ApiModelProperty("车辆品牌sid") - private String brandSid; // 车辆品牌sid @ApiModelProperty("车辆品牌名称") private String brandName; // 车辆品牌名称 @ApiModelProperty("车辆型号sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java index 2bc53e9a67..0922ccf30f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java @@ -49,8 +49,8 @@ import lombok.Data; @ApiModel(value = "挂车车型表 查询条件", description = "挂车车型表 查询条件") public class BaseTrailerModelQuery implements Query { - @ApiModelProperty("车辆品牌sid") - private String brandSid; // 车辆品牌sid + @ApiModelProperty("车辆品牌名称") + private String brandName; // 车辆品牌名称 @ApiModelProperty("车辆型号名称") private String carModelName; // 车辆型号名称 @ApiModelProperty("厂商sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java index cceef32043..72ad743a01 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java @@ -51,8 +51,6 @@ public class BaseTrailerModelVo implements Vo { private String sid; // sid - @ApiModelProperty("车辆品牌sid") - private String brandSid; // 车辆品牌sid @ApiModelProperty("车辆品牌名称") private String brandName; // 车辆品牌名称 @ApiModelProperty("车辆型号sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 6fa2607cb6..d9c5cacf2b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -476,4 +477,8 @@ public interface BaseVehicleFeign { @ResponseBody public ResultBean> saleOrderVin(@RequestBody PagerQuery query); + @ApiOperation("根据车辆sid获取采购系统信息") + @GetMapping("/getSystem") + @ResponseBody + ResultBean getSystem(@RequestParam("sid")String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 8aa983ceed..9238c87ad2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -381,6 +382,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean getSystem(String sid) { + return null; + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid,List list) { return null; 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-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java index 7c37b156d0..3c1016bc55 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallDto.java @@ -81,5 +81,6 @@ public class BaseVehinstallDto implements Dto { private String useOrgSid; // 使用组织 @ApiModelProperty("创建组织") private String createOrg; // 创建组织 - + @ApiModelProperty("部门sid") + private String departmentSid; // 部门sid } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java index 074edd717c..d841ecc690 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.api.busvehicleorder; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -122,4 +123,9 @@ public interface BusVehicleOrderFeign { @PutMapping("/updateState") ResultBean updateLockNum(@RequestParam("sid")String sid,@RequestParam("num")String num); + @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段") + @GetMapping("/getDetails") + @ResponseBody + ResultBean getDetails(@RequestParam("sid")String sid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java index e4e78c29e2..e122fdecfe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.api.busvehicleorder; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -117,5 +118,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { return null; } + @Override + public ResultBean getDetails(String sid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java index d1cd3580db..b79636a103 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java @@ -15,7 +15,7 @@ public enum ContractTemplateEnum { CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"), VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"), ENTRUSTPICKUPAUTHORIZATION("entrust_pickup_authorization", "委托提车授权书"), - CONTRACTALL("contract_all", "合同其他附件"), + CONTRACTALL("contract_all", "合同整体"), ; /** diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java index d0e52cc20d..17bdfc7a96 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java @@ -17,7 +17,7 @@ public class InvoicMessageContractVo implements Vo { @ApiModelProperty("开票类型") private String type; @ApiModelProperty("开票金额") - private String invoicMoney; + private String money; @ApiModelProperty("开票名称") - private String invoicName; + private String name; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index ec3f38812d..229ce320fa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -21,6 +21,7 @@ public enum BillTypeEnum { JYDDCLYD("JYDDCLYD","简易订单车辆预定"), XSDDHT("XSDDHT","销售订单合同"), XSDD("XSDD","销售订单"), + SKD("SKD","款项确认"), ; private String billType; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java index 7e2938e889..015bdca710 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java @@ -110,6 +110,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); for (BaseBrandletpricepowimitVo record : pagging.getRecords()) { @@ -122,7 +123,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); @@ -184,8 +185,8 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 432ab32eb0..ac89843dc9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -356,8 +356,8 @@ public class BaseModelModpriceService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 61cca268ab..13436a8654 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -37,14 +37,12 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo; -import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService; -import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.BillTypeEnum; @@ -495,7 +493,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); -// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return resultBean1; } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步 @@ -519,8 +516,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); -// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return rb; } else { @@ -612,7 +608,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); @@ -831,7 +830,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); -// String msgSid = getMessage(data, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return resultBean; } else { 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/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index f3beca8b71..516a2f1d50 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java @@ -81,4 +81,7 @@ public interface BaseTrailerMapper extends BaseMapper { * @return */ IPage searchPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Select("select * from base_trailer where vehSid = #{sid}") + BaseTrailerDetailsVo fetchByVehSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 26ec1059ca..503958db6f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -26,18 +26,24 @@ package com.yxt.anrui.base.biz.basetrailer; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basetrailer.*; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; @@ -46,6 +52,12 @@ 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.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; +import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -56,6 +68,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -90,16 +103,24 @@ public class BaseTrailerService extends MybatisBaseService createQueryWrapper(BaseTrailerQuery query) { // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bt.useOrgSid",query.getUseOrgSid()); + qw.eq("bt.useOrgSid", query.getUseOrgSid()); if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("bt.vinNo", query.getVinNo()); } - if (StringUtils.isNotBlank(query.getCarBrand())) { - qw.eq("btm.brandSid", query.getCarBrand()); + if (StringUtils.isNotBlank(query.getCarBrandName())) { + qw.eq("btm.brandName", query.getCarBrandName()); } if (StringUtils.isNotBlank(query.getSettlementSid())) { qw.eq("btm.manufacturerSid", query.getSettlementSid()); @@ -165,7 +186,7 @@ public class BaseTrailerService extends MybatisBaseService invoicePic = new ArrayList<>(); List certificatePic = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { - if (commonAppendixVo.getAttachType().equals("挂车发票照片")){ + if (commonAppendixVo.getAttachType().equals("挂车发票照片")) { String filePath = commonAppendixVo.getFilePath(); String urlPrefix = fileUploadComponent.getUrlPrefix(); filePath = urlPrefix + filePath; commonAppendixVo.setFilePath(filePath); invoicePic.add(commonAppendixVo); - }else if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){ + } else if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { String filePath = commonAppendixVo.getFilePath(); String urlPrefix = fileUploadComponent.getUrlPrefix(); filePath = urlPrefix + filePath; @@ -242,6 +263,52 @@ public class BaseTrailerService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()); + SysOrganizationVo vo = sysOrganizationVoResultBean.getData(); + if (vo != null) { + stkInStock.setFPurchaseOrgId(vo.getOrgCode()); + //分配目标组织:TOrgId (必填项) + stkInStock.setTOrgId(vo.getOrgCode()); + } + //供应商:FSupplierId (必填项) + String trailerModelSid = baseTrailer.getTrailerModelSid(); + BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid); + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseTrailerModel.getManufacturerSid()); + stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode()); + //物料列表:FInStockEntry (必填项) + List fInStockEntry = new ArrayList<>(); + StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); + //单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价 + sf.setFPrice(baseTrailer.getSettlementPrice().toString()); + //车辆类型 + sf.setCllx("61"); + sf.setCllxType("sellChannel"); + //批号:FLot + sf.setFLot(baseTrailer.getVinNo()); + //物料编码:FMaterialId (必填项) + sf.setFMaterialId(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G"); + //仓库:FStockId + sf.setFStockId("ARZSCK"); + //物料分组 + sf.setWlfz("99.02"); + //存货类别 + sf.setFCategoryIDKey("005"); + sf.setFCategoryIDType("purchaseOrderType"); + fInStockEntry.add(sf); + stkInStock.setFInStockEntry(fInStockEntry); + try { + finKingDeeFeign.draftStkInStock(stkInStock); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setMsg("保存成功"); } @@ -315,4 +382,8 @@ public class BaseTrailerService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("useOrgSid",query.getUseOrgSid()); - if (StringUtils.isNotBlank(query.getBrandSid())){ - qw.eq("brandSid",query.getBrandSid()); + if (StringUtils.isNotBlank(query.getBrandName())){ + qw.eq("brandName",query.getBrandName()); } if (StringUtils.isNotBlank(query.getCarModelName())){ qw.like("carModelName",query.getCarModelName()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 1d7794a513..4a4ce726d0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -486,4 +488,7 @@ public interface BaseVehicleMapper extends BaseMapper { AppBaseConfigOrderCarVo getStockModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg); String selectByfMaterialID(String fMaterialID); + + + BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index aae6dd08f2..c7fa21bb9e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1557,4 +1557,8 @@ WHERE vinNo like concat('%', #{fMaterialID}, '%') LIMIT 1 + + \ 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..717d8cacbc 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,29 @@ 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.basepurchasesystem.BasePurchSystemVo; +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 +133,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 +211,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); @@ -1255,6 +1299,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean getSystem(String sid) { + return baseVehicleService.getSystem(sid); + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid, List list) { return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 22ef001e6a..84833c9abb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery; @@ -3547,4 +3548,11 @@ public class BaseVehicleService extends MybatisBaseService getSystem(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicle baseVehicle = fetchBySid(sid); + BasePurchSystemVo basePurchSystemVo = baseMapper.getSystem(baseVehicle.getUseOrgSid(),baseVehicle.getPurchaseSystemSid()); + return rb.success().setData(basePurchSystemVo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 837768ce1b..8677749531 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -152,7 +152,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -192,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid); @@ -316,17 +316,17 @@ public class BaseVehicleActualSalesService extends MybatisBaseService busVehicleApplyDetailList = dto.getDetailsList(); busVehicleApplyDetailList.removeAll(Collections.singleton(null)); List stringList = new ArrayList<>(); if (!busVehicleApplyDetailList.isEmpty()) { for (BaseVehicleActualDetailsDto d : busVehicleApplyDetailList) { - String vinNo = d.getVinNo(); + String vinNo = d.getVinNo(); //根据车型查询品牌是否一致 BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(vinNo, useOrgSid); String brandSid = baseVehicle.getCarBrandSid(); - if(!dto.getCarBrandSid().equals(brandSid)){ + if (!dto.getCarBrandSid().equals(brandSid)) { return rb.setMsg("选择的车辆的品牌与选择的品牌不一致"); } stringList.add(brandSid); @@ -497,8 +497,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) { + if ("未售买断申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); //更新未售买断状态为未买断 //更新车辆状态为未买断 @@ -675,12 +677,21 @@ public class BaseVehicleActualSalesService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(baseVehicleActualSales.getProcInstId()); + String nextName = listResultBean.getData().get(0).getName_(); + if ("未售买断申请".equals(nextName)) { //更新车辆状态为未买断 String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode(); String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks(); updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue); } + /*if (query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())) { + //更新车辆状态为未买断 + String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode(); + String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks(); + updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue); + }*/ return rb.success().setData(resultBean.getData()); } } 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 bf8668aa5f..9c7b7fc8cf 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 @@ -5,11 +5,20 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicleout.*; +import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; +import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto; import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService; +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; @@ -57,6 +66,14 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -70,43 +87,69 @@ 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("已终止")) { + payTypeKey = busSalesOrderDetailsVo.getPayTypeKey(); + break; + } + } + //取付款方式是否为全款（1全款） + if ("1".equals(payTypeKey)) { + Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); + if (!aBoolean) { List bdCustomers = new ArrayList<>(); - BdCustomer bdCustomer = new BdCustomer(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); + 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.setFName(dto.getCustomerName() + dto.getMobile()); + bdCustomer.setFNumber(dto.getCustomerNo()); + //bdCustomer.setFShortName(dto.getConcatNo()); bdCustomers.add(bdCustomer); finKingDeeFeign.draftBdCustomers(bdCustomers); - }else { - b = true; - return rb.success().setData(b); } + } 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.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8)); + bdCustomer.setFShortName(dto.getConcatNo()); + bdCustomer.setFNumber(FNumber); + bdCustomer.setOldFNumber(FNumber); + sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); + bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode()); + bdCustomers.add(bdCustomer); + 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) { @@ -151,12 +194,14 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + salOutStock.setF_PAEZ_AssistantType("payType"); + salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey()); + //中介单位 + salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne()); + //物料列表 + List fEntityList = new ArrayList<>(); + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + fEntity.setFPrice(baseTrailerDetailsVo.getDealPrice()); + //物料编码 + fEntity.setFMaterialID(baseTrailerDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "G"); + //仓库id + fEntity.setFStockID(baseVehicle.getLocationCode()); + //销售折让 + if (StringUtils.isNotBlank(dto.getSalesAllowance())) { + fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance()); + } + if (StringUtils.isNotBlank(dto.getGiftsDescription())) { + fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription()); + } + //返利金额 + fEntity.setF_PAEZ_Decimal("0"); + String remarks = dto.getRemarks(); + String note = ""; + if (StringUtils.isNotBlank(remarks)) { + note = note + remarks; + } + //备注 + if (StringUtils.isNotBlank(dto.getMiddleOne())) { + if (StringUtils.isNotBlank(dto.getMiddleTwo())) { + if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) { + if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString()); + } else { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"; +// fEntity.setFEntrynote(note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"); + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString()); + } + + } else { + if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { + note = note + " 返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne() + } + } + + } else { + if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString()); + } + } + } else { + if (StringUtils.isNotBlank(dto.getMiddleTwo())) { + if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString()); + } + } + + } + if (StringUtils.isNotBlank(note)) { + fEntity.setFEntrynote(note); + } + fEntityList.add(fEntity); + if (fEntityList.size() > 0) { + salOutStock.setFEntity(fEntityList); + return salOutStock; + } else { + return null; + } + } else if (baseVehinstallDetailsVo != null) { + //日期 + salOutStock.setFDate(DateUtil.today()); + //分公司id + salOutStock.setFSaleOrgId(baseVehicle.getOrgCode()); + //客户 + salOutStock.setFCustomerID(dto.getCustomerNo()); + //销售部门id + String orgDeptSid = dto.getOrgSid(); + ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + salOutStock.setF_PAEZ_AssistantType("payType"); + salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey()); + //中介单位 + salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne()); + //物料列表 + List fEntityList = new ArrayList<>(); + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + fEntity.setFPrice(baseVehinstallDetailsVo.getCostPrice()); + //物料编码 + fEntity.setFMaterialID(baseVehinstallDetailsVo.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ"); + //仓库id + fEntity.setFStockID(baseVehicle.getLocationCode()); + //销售折让 + if (StringUtils.isNotBlank(dto.getSalesAllowance())) { + fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance()); + } + if (StringUtils.isNotBlank(dto.getGiftsDescription())) { + fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription()); + } + //返利金额 + fEntity.setF_PAEZ_Decimal("0"); + String remarks = dto.getRemarks(); + String note = ""; + if (StringUtils.isNotBlank(remarks)) { + note = note + remarks; + } + //备注 + if (StringUtils.isNotBlank(dto.getMiddleOne())) { + if (StringUtils.isNotBlank(dto.getMiddleTwo())) { + if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) { + if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "," + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString()); + } else { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString()); + } + + } else { + if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { + note = note + " 返利情况：" + dto.getMiddleTwo() + dto.getRebateMoneyTwo() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyTwo()).toString());//dto.getRebateMoneyOne() + } + } + + } else { + if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString()); + } + } + } else { + if (StringUtils.isNotBlank(dto.getMiddleTwo())) { + if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) { + note = note + " 返利情况：" + dto.getMiddleOne() + dto.getRebateMoneyOne() + "。"; + //返利金额 + fEntity.setF_PAEZ_Decimal(new BigDecimal(dto.getRebateMoneyOne()).toString()); + } + } + + } + if (StringUtils.isNotBlank(note)) { + fEntity.setFEntrynote(note); + } + fEntityList.add(fEntity); + if (fEntityList.size() > 0) { + salOutStock.setFEntity(fEntityList); + return salOutStock; + } else { + return null; + } + } + return null; + } + public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) { ResultBean rb = ResultBean.fireFail(); String isUpdateOrInsertCrm = dto.getIsUpdateOrInsertCrm(); List bdCustomers = new ArrayList<>(); BdCustomer bdCustomer = new BdCustomer(); - if ("是".equals(isUpdateOrInsertCrm)){ + if ("是".equals(isUpdateOrInsertCrm)) { String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8); - if (FNumber.length() > 30){ - FNumber = FNumber.substring(0,30); + if (FNumber.length() > 30) { + FNumber = FNumber.substring(0, 30); bdCustomer.setFNumber(FNumber); - }else { + } else { bdCustomer.setFNumber(FNumber); } SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); @@ -195,15 +440,15 @@ public class BaseVehicleOutService extends MybatisBaseService 30){ - FNumber1 = FNumber1.substring(0,30); + if (FNumber1.length() > 30) { + FNumber1 = FNumber1.substring(0, 30); bdCustomer.setFNumber(FNumber1); - }else { + } else { bdCustomer.setFNumber(FNumber1); } bdCustomer.setFShortName(dto.getConcatNo()); @@ -488,8 +733,8 @@ public class BaseVehicleOutService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java index f08138670b..3f31b58c91 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java @@ -29,6 +29,7 @@ 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.basevehinstall.BaseVehinstallDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -64,4 +65,7 @@ public interface BaseVehinstallMapper extends BaseMapper { List selectListVo(String createOrgSid); List selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin); + + @Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}") + BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java index 25cbe97c85..55f4e123ac 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java @@ -25,6 +25,18 @@ *********************************************************/ package com.yxt.anrui.base.biz.basevehinstall; +import cn.hutool.core.date.DateUtil; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; +import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; +import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; +import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,6 +46,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery; @@ -42,6 +55,8 @@ import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign; +import javax.annotation.Resource; + /** * Project: anrui-base(上装配置管理)
* File: BaseVehinstallFeignFallback.java
@@ -62,6 +77,14 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { @Autowired private BaseVehinstallService baseVehinstallService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private BaseVehinstallmodelService baseVehinstallmodelService; + @Autowired + private BaseManufacturerService baseManufacturerService; + @Resource + private FinKingDeeFeign finKingDeeFeign; @Override @ApiOperation("根据条件分页查询数据的列表") @@ -97,6 +120,54 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { return rb.setMsg("请填写销售指导价"); } baseVehinstallService.saveOrUpdateDto(dto); + if (StringUtils.isBlank(dto.getSid())){ + StkInStock stkInStock = new StkInStock(); + //入库日期:FDate (必填项) + stkInStock.setFDate(DateUtil.now()); + //采购部门:FPurchaseDeptId (必填项) + String departmentSid = dto.getDepartmentSid(); + SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData(); + stkInStock.setFPurchaseDeptId(data.getOrgCode()); + //采购组织:FPurchaseOrgId (必填项) + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()); + SysOrganizationVo vo = sysOrganizationVoResultBean.getData(); + if (vo != null) { + stkInStock.setFPurchaseOrgId(vo.getOrgCode()); + //分配目标组织:TOrgId (必填项) + stkInStock.setTOrgId(vo.getOrgCode()); + } + //供应商:FSupplierId (必填项) + String mainSid = dto.getMainSid(); + BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid); + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid()); + stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode()); + //物料列表:FInStockEntry (必填项) + List fInStockEntry = new ArrayList<>(); + StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); + //单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价 + sf.setFPrice(dto.getCostPrice()); + //车辆类型 + sf.setCllx("61"); + sf.setCllxType("sellChannel"); + //批号:FLot + sf.setFLot(dto.getVinNo()); + //物料编码:FMaterialId (必填项) + sf.setFMaterialId(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ"); + //仓库:FStockId + sf.setFStockId("ARZSCK"); + //物料分组 + sf.setWlfz("99.02"); + //存货类别 + sf.setFCategoryIDKey("005"); + sf.setFCategoryIDType("purchaseOrderType"); + fInStockEntry.add(sf); + stkInStock.setFInStockEntry(fInStockEntry); + try { + finKingDeeFeign.draftStkInStock(stkInStock); + } catch (Exception e) { + e.printStackTrace(); + } + } return rb.success(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index 52971ade42..1b23e09665 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java @@ -213,4 +213,8 @@ public class BaseVehinstallService extends MybatisBaseService selectByOrgSidAndVin(String orgSid, String vin) { return baseMapper.selectByOrgSidAndVin(orgSid,vin); } + + public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) { + return baseMapper.fetchByVinNoAndOrgSid(vinNo,createOrgSid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 2c0808e81b..5a1a63a8ec 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -611,8 +611,8 @@ public class BusVehicleApplyService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextName = listResultBean.getData().get(0).getName_(); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java index 0bb61a8069..99c21a3867 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java @@ -30,9 +30,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleorder.*; -import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -119,4 +120,8 @@ public interface BusVehicleOrderMapper extends BaseMapper { void updateState(String vehicleOrderSid); int updateLockNum(@Param("sid") String sid, @Param("num") String num); + + BasePurchSystemVo getDetails(@Param("createOrgSid") String createOrgSid,@Param("deptSid") String deptSid); + + BusVehicleApply selectApply(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml index 0c20ab25d5..f7af46556a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml @@ -215,4 +215,12 @@ update bus_vehicle_order set lockingNum = #{num} where sid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java index e5da88ffd9..6dff08ad7c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java @@ -26,9 +26,8 @@ package com.yxt.anrui.base.biz.busvehicleorder; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; -import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; import com.yxt.anrui.base.api.busvehicleorder.*; import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; @@ -223,4 +222,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign { return busVehicleOrderService.updateLockNum(sid,num); } + @Override + public ResultBean getDetails(String sid) { + return busVehicleOrderService.getDetails(sid); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index f6a7d8b535..05e304cfb7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -30,9 +30,11 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo; import com.yxt.anrui.base.api.basevehicle.ConfigInfoSpanSize; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; import com.yxt.anrui.base.api.busvehicleorder.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; @@ -539,4 +541,11 @@ public class BusVehicleOrderService extends MybatisBaseService getDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleApply busVehicleApply = baseMapper.selectApply(sid); + BasePurchSystemVo vo = baseMapper.getDetails(busVehicleApply.getCreateOrgSid(),busVehicleApply.getOrgDeptSid()); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 4cb30ce26d..369785f120 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.*; @@ -758,13 +759,29 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { String ftl = ""; + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + //查询台数 + String num = priceInfo.getNumber(); + //单台成交价 + String transactionPrice = priceInfo.getSingleFinalPrice(); + String remarks = ""; if ("现车".equals(appOrderDetailsVo.getOrderType())) { //获取模板 ftl = "existingvehicles"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + } } else { //获取模板 ftl = "orderacar"; + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; } + map.put("remarks", remarks); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); @@ -783,6 +800,49 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { + String ftl = ""; + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + //查询台数 + String num = priceInfo.getNumber(); + //单台成交价 + String transactionPrice = priceInfo.getSingleFinalPrice(); + String remarks = ""; + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + //获取模板 + ftl = "existingvehicles"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + } + } else { + //获取模板 + ftl = "orderacar"; + remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。"; + } + map.put("remarks", remarks); + + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成文件名 + String pdfName = "新车买卖合同2_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + return pdfName; + } + /** * 生成 新车买卖合同(现车) （空）pdf * @@ -818,6 +878,10 @@ public class CommonContractService extends MybatisBaseService stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价： 元。"; + } } else { // 订车获取模板 ftl = "orderacar_black"; + remarks = "主车" + num + "台，单台成交价： 元。"; } + map.put("remarks", remarks); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); @@ -849,6 +922,55 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { + String url = ""; + map.put("totalPrice", ""); + map.put("priceRemarks", ""); + map.put("depositTotal", ""); + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + //查询台数 + String num = priceInfo.getNumber(); + String remarks = ""; + String ftl = ""; + // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） + if ("1".equals(dto.getDiscountKey())) { + // 现车 + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + //获取模板 + ftl = "existingvehicles_black"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getVinList(); + if (stringList.size() > 0) { + remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList); + } else { + remarks = "主车" + num + "台，单台成交价： 元。"; + } + } else { + // 订车获取模板 + ftl = "orderacar_black"; + remarks = "主车" + num + "台，单台成交价： 元。"; + } + map.put("remarks", remarks); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成合同文件名 + String pdfName = "新车买卖空白合同2_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + url = pdfName; + } + return url; + } + private String getReceiveCar(Map map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; //查询销售订单的现车 @@ -888,9 +1010,9 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid()); + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid()); if (invoicingDetailsVoResultBean.getData() != null) { - map.put("createOrgName", invoicingDetailsVoResultBean.getData().getUseOrgName()); + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); invoicName = invoicingDetailsVoResultBean.getData().getName(); } //查询销售订单的现车 @@ -901,10 +1023,12 @@ public class CommonContractService extends MybatisBaseService 0) { for (int i = 0; i < stringList.size(); i++) { InvoicMessageContractVo vo = new InvoicMessageContractVo(); - vo.setVinNo(stringList.get(i)); + if (stringList.get(i).length() > 8) { + vo.setVinNo(stringList.get(i).substring(stringList.get(i).length() - 8)); + } else { + vo.setVinNo(stringList.get(i)); + } vo.setType(appOrderDetailsVo.getInvoiceType()); - vo.setInvoicMoney(priceInfo.getSingleFinalPrice()); - vo.setInvoicName(invoicName); invoicMessageContractVos.add(vo); } } @@ -1538,16 +1662,22 @@ public class CommonContractService extends MybatisBaseService discountList = appOrderDetailsVo.getDiscountList(); + discountDetail = "优惠说明：赠送价值" + appOrderDetailsVo.getTotaldiscount() + "元优惠包。包括"; + for (int iii = 0; iii < discountList.size(); iii++) { + AppOrderDiscountListVo vv = discountList.get(iii); + String discountName = vv.getDiscountName(); + if (iii == discountList.size() - 1) { + discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName +vv.getNumber()+ "份（每份包含" + vv.getDiscountExplain()+"）。"; + } else { + discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName +vv.getNumber()+ "份（每份包含" + vv.getDiscountExplain()+"），"; + } + } + map.put("discountDetail", discountDetail); + } //保险说明 - String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。"; + String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfoMessage() + "。"; //车价合计 String totalPrice = priceInfo.getTotalPrice(); String priceRemarks = ""; @@ -1578,9 +1723,16 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid()); - if (invoicingDetailsVoResultBean.getData() != null) { - map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); - }else{ - return rb.setMsg("请先完善公司开票信息"); + if(StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())){ + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } else { + return rb.setMsg("请先完善公司开票信息"); + } } map.put("customerName", customerName); map.put("mobile", mobile); map.put("idNo", idNo); map.put("modelName", modelName); map.put("modelConfig", modelConfig); - map.put("remarks", remarks); - if(appOrderDetailsVo.getInsuranceState()){ + if ("1".equals(appOrderDetailsVo.getIsInsurance())) { map.put("insuranceInfo", insuranceInfo); } map.put("totalPrice", totalPrice); map.put("priceRemarks", priceRemarks); map.put("depositTotal", depositTotal); - map.put("address", address);*/ + map.put("address", address); //生成合同编号 String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid()); map.put("contractNo", contractNo); @@ -1618,36 +1771,20 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { + /* Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); + Future future1_2 = pool.submit(() -> { + return genCarSaleContract2(dto, map, appOrderDetailsVo); + });*/ PrintConfirmVo printConfirmVo = null; String urlAll = ""; - /*if (StringUtils.isNotBlank(future1.get())) { - printConfirmVo = new PrintConfirmVo(); - if ("现车".equals(appOrderDetailsVo.getOrderType())) { - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); - } else { - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); - } - printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future1.get()); - list.add(printConfirmVo); - url = future1.get(); - } - Future future2 = pool.submit(() -> { + /* Future future2 = pool.submit(() -> { return genCarSaleContractBlank(dto, map, appOrderDetailsVo); }); - if (StringUtils.isNotBlank(future2.get())) { - printConfirmVo = new PrintConfirmVo(); - if ("现车".equals(appOrderDetailsVo.getOrderType())) { - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); - } else { - printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName())); - } - printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get()); - list.add(printConfirmVo); - url = url + "," + future2.get(); - } + Future future2_2 = pool.submit(() -> { + return genCarSaleContractBlank2(dto, map, appOrderDetailsVo); + }); //接收车辆委托书 Future future4 = pool.submit(() -> { return getReceiveCar(map, appOrderDetailsVo); @@ -1674,6 +1811,30 @@ public class CommonContractService extends MybatisBaseService filesList = new ArrayList<>(); + if (future1 != null) { + if (StringUtils.isNotBlank(future1.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); + filesList.add(file); + } + } + if (future1_2 != null) { + if (StringUtils.isNotBlank(future1_2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get()); + filesList.add(file); + } + } + if (future2 != null) { + if (StringUtils.isNotBlank(future2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); + filesList.add(file); + } + } + if (future2_2 != null) { + if (StringUtils.isNotBlank(future2_2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get()); + filesList.add(file); + } + } //合并pdf文件 if (future8 != null) { if (StringUtils.isNotBlank(future8.get())) { @@ -1689,7 +1850,7 @@ public class CommonContractService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) { + if ("销售专员申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); @@ -2187,8 +2352,8 @@ public class CommonContractService extends MybatisBaseService qw = new QueryWrapper<>(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); String staffSid = sysUserVo.getStaffSid(); - qw.eq("staffSid",staffSid); - if (StringUtils.isNotBlank(params.getNames())){ + qw.eq("staffSid", staffSid); + if (StringUtils.isNotBlank(params.getNames())) { qw.and(wrapper -> wrapper.like("contractNo", params.getNames()).or().like("partyB", params.getNames())); } IPage page = PagerUtil.queryToPage(query); diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl index 7fd5d8cc29..618f663d43 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl @@ -796,7 +796,7 @@ - ${createOrgName1!} + ${createOrgName1!} @@ -906,7 +906,7 @@ - ${createDate!} + ${createDate!} @@ -1533,18 +1533,18 @@ - - + + - - + + - 年 月 日 年 月 日 + 年 月 日 年 月 日 <#-- diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl index 55112e7fd5..fca0470298 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl @@ -579,7 +579,7 @@ - ${createOrgName!} + ${createOrgName!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index 22476ed678..57fd867b9c 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -1044,6 +1044,7 @@ + <#if insuranceInfo??> @@ -1067,6 +1068,7 @@ ${insuranceInfo!} + @@ -1284,7 +1286,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 @@ -1409,7 +1411,7 @@ - 甲方： 乙方： + 甲方： 乙方： @@ -1468,7 +1470,7 @@ - + @@ -1504,7 +1506,7 @@ - + <#-- @@ -1522,7 +1524,7 @@ - + @@ -1530,7 +1532,7 @@ - + --> @@ -1539,7 +1541,7 @@ - 地址： + 地址： @@ -1559,7 +1561,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index c4d478c782..4ed6204ce3 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -1203,7 +1203,7 @@ - 元 ${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 @@ -1286,7 +1286,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 @@ -1411,7 +1411,7 @@ - 甲方： 乙方： + 甲方： 乙方： @@ -1506,7 +1506,7 @@ - + <#-- @@ -1532,7 +1532,7 @@ - + --> @@ -1541,7 +1541,7 @@ - 地址： + 地址： @@ -1561,7 +1561,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl index 839cdf6814..e648acf8a3 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl @@ -582,7 +582,7 @@ - + <#-- @@ -593,7 +593,7 @@ - + --> @@ -602,7 +602,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -669,7 +669,7 @@ - + @@ -682,23 +682,23 @@ - - - - - + + + + + - + - + - + - + @@ -722,12 +722,13 @@ - + - + + @@ -750,11 +751,12 @@ - + - + + @@ -777,10 +779,10 @@ - + - + @@ -805,12 +807,13 @@ - + - + + @@ -833,165 +836,168 @@ <#list invoicList as invoic> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${invoic_index+1} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${invoic.vinNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${invoic.type!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${invoic.invoicMoney!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${invoic.invoicName!} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic_index+1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.type!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.money!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.name!} + + + + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl index 49ad511027..0f1786f8fe 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl @@ -640,7 +640,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -1342,7 +1342,7 @@ - 年 月 日 + 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl index 52c3a44b7e..1cc2c83b97 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl @@ -900,7 +900,7 @@ - ${customerName!} + ${customerName!} @@ -919,7 +919,7 @@ - ${mobile!} + ${mobile!} @@ -1257,7 +1257,7 @@ - ${totalPrice!} + ${totalPrice!} @@ -1317,7 +1317,7 @@ - ${depositTotal!} + ${depositTotal!} @@ -1358,7 +1358,7 @@ - ${address!} + ${address!} @@ -1409,7 +1409,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 @@ -1535,7 +1535,7 @@ - 甲方： 乙方： + 甲方： 乙方： @@ -1630,7 +1630,7 @@ - + <#-- @@ -1656,7 +1656,7 @@ - + --> @@ -1665,7 +1665,7 @@ - 地址： + 地址： @@ -1685,7 +1685,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl index 5401c3687f..2eb00280cd 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl @@ -1257,7 +1257,7 @@ - ${totalPrice!} + ${totalPrice!} @@ -1317,7 +1317,7 @@ - ${depositTotal!} + ${depositTotal!} @@ -1326,7 +1326,7 @@ - 元 ${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 + 元${depositRemarks!}，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。 @@ -1358,7 +1358,7 @@ - ${address!} + ${address!} @@ -1409,7 +1409,7 @@ - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 + 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落户手续的后果由乙方承担。 @@ -1535,7 +1535,7 @@ - 甲方： 乙方： + 甲方： 乙方： @@ -1630,7 +1630,7 @@ - + <#-- @@ -1656,7 +1656,7 @@ - + --> @@ -1665,7 +1665,7 @@ - 地址： + 地址： @@ -1685,7 +1685,7 @@ - 年 月 日 年 月 日 + 年 月 日 年 月 日 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl index fedf9df2f2..a7e85ae9cd 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl @@ -622,7 +622,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -1157,7 +1157,7 @@ - ${vinNo!} + ${vinNo!} @@ -1171,6 +1171,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1307,7 +1451,7 @@ - 年 + 年 @@ -1326,7 +1470,7 @@ - 月 + 月 @@ -1345,7 +1489,7 @@ - 日至 + 日至 @@ -1364,7 +1508,7 @@ - 年 + 年 @@ -1383,7 +1527,7 @@ - 月 + 月 @@ -1402,7 +1546,7 @@ - 日 + 日 diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js index 67a9ac0e5c..e753d29f43 100644 --- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js +++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js @@ -25,3 +25,20 @@ export function selectByZjcAndUseOrgIsNull() { method: 'get' }) } + +// 获取分公司 +export function getListOrg(data) { + return request({ + url: '/portal/v1/sysorganization/getListOrg', + method: 'get', + params: data + }) +} + +// 根据分公司Sid获取分公司下所有的部门 +export function getListDeptByOrgSid(data) { + return request({ + url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data, + method: 'GET' + }) +} diff --git a/anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js b/anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js new file mode 100644 index 0000000000..3d65ffd94b --- /dev/null +++ b/anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' +import qs from 'qs' + +// 根据条件分页查询数据的列表 已改 +export function pagerList(data) { + return request({ + url: '/base/v1/basepurchasesystem/listPage', + data: data, + method: 'post', + headers: { 'Content-Type': 'application/json' } + }) +} + +// 新增保存 已改 +export function save(data) { + return request({ + url: '/base/v1/basepurchasesystem/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + +// 删除 已改 +export function delBySids(data) { + return request({ + url: '/base/v1/basepurchasesystem/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + +// 详情以及修改回显 已改 +export function fetchDetailsBySid(data) { + return request({ + url: '/base/v1/basepurchasesystem/fetchDetailsBySid/' + data, + method: 'get', + params: qs.stringify(data) + }) +} diff --git a/anrui-base/anrui-base-ui/src/router/index.js b/anrui-base/anrui-base-ui/src/router/index.js index 2dc0d01e06..8878f65604 100644 --- a/anrui-base/anrui-base-ui/src/router/index.js +++ b/anrui-base/anrui-base-ui/src/router/index.js @@ -360,8 +360,22 @@ export const constantRoutes = [ meta: { title: '资料清单',noCache: true, } }] }, - - + // 8、采购系统 + { + path: '/caigouxitong', + component: Layout, + redirect: '/caigouxitong', + meta: { title: '采购系统' }, + children: [ + { + path: '/caigouxitong/purchasingsystem', + component: () => + import('@/views/caigouxitong/purchasingsystem.vue'), + name: 'PurchasingSystem', + meta: { title: '采购系统', noCache: true } + } + ] + }, { path: '/404', component: () => diff --git a/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue new file mode 100644 index 0000000000..2c83f8d0f3 --- /dev/null +++ b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue @@ -0,0 +1,283 @@ + + + + diff --git a/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue new file mode 100644 index 0000000000..275ab4597a --- /dev/null +++ b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 66b7944f60..1f82fdc0e6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -143,12 +143,12 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean> listExaminePage(@RequestBody PagerQuery pq); - @ApiOperation("提交车库移库审批流程") + @ApiOperation("提交出库审批流程") @PostMapping("/submitDeliveredApply") @ResponseBody public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto); - @ApiOperation("App-提交车库移库审批流程") + @ApiOperation("App-提交出库审批流程") @PostMapping("/submitAppDeliveredApply") @ResponseBody public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java index 0c8a869505..9846b98ebb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java @@ -126,4 +126,11 @@ public class BusSalesOrder extends BaseEntity { private String licensePlateKey; @ApiModelProperty("是否包牌") private String licensePlateValue; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + + @ApiModelProperty("补充说明附件") + private String imagesFile; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index e42c2e0042..420d2af44b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -188,7 +188,12 @@ public interface BusSalesOrderFeign { @ResponseBody ResultBean updateNodesBySid(@RequestBody AppOrderRemarkDto dto); - @ApiOperation("更新销售订单补充说明") + @ApiOperation("初始化销售订单补充说明") + @GetMapping("/getOrderRemarksInfo") + @ResponseBody + ResultBean getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid); + + @ApiOperation("更新销售订单合同编号") @PutMapping("/updateContractNoBySid") @ResponseBody ResultBean updateContractNoBySid(@RequestBody AppOrderContractNoDto dto); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index d656ba09ea..4d35308cb6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -165,6 +165,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { return null; } + @Override + public ResultBean getOrderRemarksInfo(String saleOrderSid) { + return null; + } + @Override public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java index e998b4a39b..3c4cd328c1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java @@ -26,4 +26,9 @@ public class AppNowCarListVo implements Vo { @ApiModelProperty("上装sid") private String topSid; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java index fea792fed5..04bb888d6a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java @@ -24,4 +24,9 @@ public class AppNowCarVo implements Vo { private String virtual; @ApiModelProperty("上装配置sid") private String topSid; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java index 3db8529f26..16a74aaa1b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarListVo.java @@ -31,5 +31,10 @@ public class AppReadyCarListVo implements Vo { private String topSid; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java index 8e659528e1..cb9acc6665 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppReadyCarVo.java @@ -32,4 +32,9 @@ public class AppReadyCarVo implements Vo { @ApiModelProperty("上装配置sid") private String topSid; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index f5ba187926..ec40963d31 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -102,5 +102,18 @@ public class AppOrderDetailsVo implements Vo { //中介人2 private SubmitVo intermediary2; + @ApiModelProperty("是否包含保险：0不包含，1包括") + private String isInsurance; + @ApiModelProperty("合同中的保险说明") + private String insuranceInfoMessage; + + @ApiModelProperty("合同中的上装信息") + private String topMessage; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java index e7e49c0222..f7e8a37a4c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java @@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/6/8 9:54 @@ -17,4 +19,7 @@ public class AppOrderRemarkDto implements Dto { @ApiModelProperty(value = "备注说明") private String remarks; + + @ApiModelProperty("补充说明附件") + private List images; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderRemarksVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderRemarksVo.java new file mode 100644 index 0000000000..0e7d938bc3 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderRemarksVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/1/7 14:30 + * @Description + */ +@Data +public class OrderRemarksVo implements Vo { + private static final long serialVersionUID = -5111561669820677541L; + + @ApiModelProperty(value = "销售订单sid") + private String saleOrderSid; + + @ApiModelProperty(value = "补充说明") + private String remarks; + + @ApiModelProperty("补充说明附件") + private List images; + + private String imagesFile; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index a27df091e4..6f3c5e1fcc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -2256,8 +2256,8 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { + if ("销售专员申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); @@ -2280,8 +2282,10 @@ public class BusMainDepositService extends MybatisBaseService { ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { + if ("销售专员申请".equals(nextName)) { //更新已选择的车架号的状态为未锁定 AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); @@ -2323,9 +2327,11 @@ public class BusMainDepositService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) { + if ("销售专员申请".equals(nextName)) { //更新已选择的车架号的状态为未锁定 AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); if (appBusDepositVehicleDetailVo != null) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 288b34ebcd..54c358bad7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -190,4 +190,8 @@ public interface BusSalesOrderMapper extends BaseMapper { int updateMakeUp(@Param("sid") String salesOrderSid, @Param("isTop") String i); int updateMakeUp1(String salesOrderSid); + + int updatePurchaseSystem(@Param("purchaseSystemName") String purchaseSystemName, @Param("purchaseSystemSid") String purchaseSystemSid, @Param("salesOrderSid") String salesOrderSid); + + int updateImages(@Param("imagesFile") String imagesFile, @Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 7e1c887c5e..153cea5713 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -207,7 +207,9 @@ bo.payType, bo.useOrgSid, bo.licensePlateValue, - bo.staffSid + bo.staffSid, + bo.purchaseSystemSid, + bo.purchaseSystemName from bus_sales_order bo where sid = #{sid} @@ -303,4 +305,15 @@ set isTop = NULL where sid = #{salesOrderSid} + + + update bus_sales_order + set purchaseSystemName = #{purchaseSystemName}, + purchaseSystemSid = #{purchaseSystemSid} + where sid = #{salesOrderSid} + + + + update bus_sales_order set imagesFile = #{imagesFile} where sid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index f153799f5a..8e5ac54d71 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -236,6 +236,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return busSalesOrderService.updateNodesBySid(dto); } + @Override + public ResultBean getOrderRemarksInfo(String saleOrderSid) { + return busSalesOrderService.getOrderRemarksInfo(saleOrderSid); + } + @Override public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) { return busSalesOrderService.updateContractNoBySid(dto); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6b83e39e8b..9e33a9505b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitF import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery; @@ -80,6 +81,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDt import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; @@ -1183,8 +1185,10 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId1); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) { + if ("销售订单申请".equals(nextName)) { ResultBean details = getSaleOrderDetails(query.getBusinessSid()); AppOrderDetailsVo vo = details.getData(); if ("现车".equals(vo.getOrderType())) { @@ -1209,59 +1213,31 @@ public class BusSalesOrderService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - busSalesOrder.set(fetchBySid(query.getBusinessSid())); - String procId = busSalesOrder.get().getProcInstId(); - Future future1 = pool.submit(() -> { - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - ufVo.setProcInsId(procId); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap((Map) variables.get("app")); - messageFlowableQuery.setBusinessSid(query.getBusinessSid()); - messageFlowableQuery.setModuleName("销售订单申请"); - ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); - List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); - if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } - - messageFlowableQuery.setMsgTitle("销售订单"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - }); - /*Future future2 = pool.submit(() -> { - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.get().getStaffSid())) { - ResultBean details = getSaleOrderDetails(query.getBusinessSid()); - AppOrderDetailsVo vo = details.getData(); - if ("现车".equals(vo.getOrderType())) { - //更新已选择的车架号的状态为未锁定 - List list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid()); - BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); - busMainDepositUpdateQuery.setVinSidList(list); - busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); - busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); - baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); - } - } - });*/ - } catch (Exception e) { - e.printStackTrace(); + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcInsId(procId1); + messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap((Map) variables.get("app")); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("销售订单申请"); + ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); + String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); + List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); + String nextName2 = listResultBean2.getData().get(0).getName_(); +// if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) { + if ("销售订单申请".equals(nextName2)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } + messageFlowableQuery.setMsgTitle("销售订单"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + return rb.success(); } @@ -1366,8 +1342,10 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) { + if ("销售订单申请".equals(nextName)) { ResultBean details = getSaleOrderDetails(query.getBusinessSid()); AppOrderDetailsVo vo = details.getData(); if ("现车".equals(vo.getOrderType())) { @@ -1498,7 +1476,7 @@ public class BusSalesOrderService extends MybatisBaseService vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid()); + if(vehicleSelectVoResultBean.getData() != null){ + BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); + //采购系统sid + String purchaseSystemSid = baseVehicleSelectVo.getSid(); + //采购系统名称 + String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName(); + appNowCarVo.setPurchaseSystemSid(purchaseSystemSid); + appNowCarVo.setPurchaseSystemName(purchaseSystemName); + } appNowCars.add(appNowCarVo); } @@ -1881,6 +1870,17 @@ public class BusSalesOrderService extends MybatisBaseService vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid()); + if(vehicleSelectVoResultBean.getData() != null){ + BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); + //采购系统sid + String purchaseSystemSid = baseVehicleSelectVo.getSid(); + //采购系统名称 + String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName(); + appNowCarVo.setPurchaseSystemSid(purchaseSystemSid); + appNowCarVo.setPurchaseSystemName(purchaseSystemName); + } appNowCars.add(appNowCarVo); } } @@ -1914,6 +1914,17 @@ public class BusSalesOrderService extends MybatisBaseService getDetails = busVehicleOrderFeign.getDetails(applyListVo.getSid()); + if(getDetails.getData() != null){ + BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData(); + //采购系统sid + String purchaseSystemSid = actualAndOrgDeptVo.getSid(); + //采购系统名称 + String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName(); + appReadyCarVo.setPurchaseSystemSid(purchaseSystemSid); + appReadyCarVo.setPurchaseSystemName(purchaseSystemName); + } appReadyCar.add(appReadyCarVo); } appCarInfo.setReadyCar(appReadyCar); @@ -2091,6 +2102,17 @@ public class BusSalesOrderService extends MybatisBaseService vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid()); + if(vehicleSelectVoResultBean.getData() != null){ + BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); + //采购系统sid + String purchaseSystemSid = baseVehicleSelectVo.getSid(); + //采购系统名称 + String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName(); + appNowCarVo.setPurchaseSystemSid(purchaseSystemSid); + appNowCarVo.setPurchaseSystemName(purchaseSystemName); + } appNowCars.add(appNowCarVo); } } @@ -2109,6 +2131,17 @@ public class BusSalesOrderService extends MybatisBaseService vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid()); + if(vehicleSelectVoResultBean.getData() != null){ + BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); + //采购系统sid + String purchaseSystemSid = baseVehicleSelectVo.getSid(); + //采购系统名称 + String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName(); + appNowCarVo.setPurchaseSystemSid(purchaseSystemSid); + appNowCarVo.setPurchaseSystemName(purchaseSystemName); + } appNowCars.add(appNowCarVo); } } @@ -2142,6 +2175,17 @@ public class BusSalesOrderService extends MybatisBaseService getDetails = busVehicleOrderFeign.getDetails(applyListVo.getSid()); + if(getDetails.getData() != null){ + BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData(); + //采购系统sid + String purchaseSystemSid = actualAndOrgDeptVo.getSid(); + //采购系统名称 + String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName(); + appReadyCarVo.setPurchaseSystemSid(purchaseSystemSid); + appReadyCarVo.setPurchaseSystemName(purchaseSystemName); + } appReadyCar.add(appReadyCarVo); } } @@ -2362,6 +2406,11 @@ public class BusSalesOrderService extends MybatisBaseService images = dto.getImages(); + if(images.size()>0){ + String imagesFile = images.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + int i = baseMapper.updateImages(imagesFile,sid); + } //根据销售订单sid更新补充说明字段 int i = baseMapper.updateNodesBySid(dto.getRemarks(), sid); return rb.success().setMsg("保存成功"); @@ -2726,6 +2775,7 @@ public class BusSalesOrderService extends MybatisBaseService discountList = busSalesOrderDiscountService.selectDiscount(sid); @@ -3531,4 +3630,20 @@ public class BusSalesOrderService extends MybatisBaseService getOrderRemarksInfo(String saleOrderSid) { + /*ResultBean rb = ResultBean.fireFail(); + OrderRemarksVo vo = baseMapper.getOrderRemarksInfo(saleOrderSid); + String imageFile = vo.getImagesFile(); + if(StringUtils.isNotBlank(imageFile)){ + List imagesFile = Arrays. + + } + return rb.success().setData(vo);*/ + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java index 31cce71ea1..59d6f87554 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java @@ -81,4 +81,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index d44affc286..d6cb820872 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -248,4 +248,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService { + @Autowired + private BaseVehicleFeign baseVehicleFeign; + @Autowired + private BusSalesOrderService busSalesOrderService; + public void saveVehicle(List list, String sid) { if (list.size() > 0) { for (int i = 0; i < list.size(); i++) { @@ -82,7 +92,21 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectAppDetailsVoBySaleOrderSid(String saleOrderSid) { - return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + List voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + voList.removeAll(Collections.singleton(null)); + for (AppNowCarListVo vv : voList){ + ResultBean vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vv.getCarSid()); + if(vehicleSelectVoResultBean.getData() != null){ + BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); + //采购系统sid + String purchaseSystemSid = baseVehicleSelectVo.getSid(); + //采购系统名称 + String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName(); + vv.setPurchaseSystemSid(purchaseSystemSid); + vv.setPurchaseSystemName(purchaseSystemName); + } + } + return voList; /* List stringList = baseMapper.selectVehicleList(saleOrderSid); List appNowCars = new ArrayList<>(); for (BusSalesOrderVehicle busSalesOrderVehicle : stringList) { @@ -97,6 +121,19 @@ public class BusSalesOrderVehicleService extends MybatisBaseService nowCarList, String salesOrderSid) { if (nowCarList.size() > 0) { + String linkSid = nowCarList.get(0).getLinkSid(); + //根据车辆sid查询采购系统sid和采购系统名称 + ResultBean vehicleSelectVoResultBean = baseVehicleFeign.getSystem(linkSid); + if(vehicleSelectVoResultBean.getData() != null){ + BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData(); + //采购系统sid + String purchaseSystemSid = baseVehicleSelectVo.getSid(); + //采购系统名称 + String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName(); + //根据销售订单sid更新采购系统sid和采购系统名称 + busSalesOrderService.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid); + + } for (int i = 0; i < nowCarList.size(); i++) { AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList.get(i); if (appBusSalesOrderVehicleDto != null) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java index e5838f3eb7..e9d4bb13f2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java @@ -26,14 +26,20 @@ package com.yxt.anrui.buscenter.biz.bussalesvehicleorder; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; +import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppReadyCarListVo; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -52,6 +58,10 @@ import java.util.List; @Service public class BusSalesVehicleOrderService extends MybatisBaseService { + @Autowired + private BusSalesOrderService busSalesOrderService; + @Autowired + private BusVehicleOrderFeign busVehicleOrderFeign; public void saveOrder(List vehicleList, String sid) { if (vehicleList.size() > 0) { for (int i = 0; i < vehicleList.size(); i++) { @@ -86,7 +96,24 @@ public class BusSalesVehicleOrderService extends MybatisBaseService selectAppDetailsVoBySaleOrderSid(String saleOrderSid) { - return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + List voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + voList.removeAll(Collections.singleton(null)); + if(!voList.isEmpty()){ + for (AppReadyCarListVo vv : voList){ + //根据采购订单查询采购系统的sid和采购系统的名称 + ResultBean getDetails = busVehicleOrderFeign.getDetails(vv.getSid()); + if(getDetails.getData() != null){ + BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData(); + //采购系统sid + String purchaseSystemSid = actualAndOrgDeptVo.getSid(); + //采购系统名称 + String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName(); + vv.setPurchaseSystemSid(purchaseSystemSid); + vv.setPurchaseSystemName(purchaseSystemName); + } + } + } + return voList; /* List stringList = baseMapper.selectVehicleList(saleOrderSid); List appReadyCar = new ArrayList<>(); for (BusSalesVehicleOrder busSalesVehicleOrder : stringList) { @@ -101,6 +128,18 @@ public class BusSalesVehicleOrderService extends MybatisBaseService readyCarList, String salesOrderSid) { if (readyCarList.size() > 0) { + String linkSid = readyCarList.get(0).getLinkSid(); + //根据采购订单查询采购系统的sid和采购系统的名称 + ResultBean getDetails = busVehicleOrderFeign.getDetails(linkSid); + if(getDetails.getData() != null){ + BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData(); + //采购系统sid + String purchaseSystemSid = actualAndOrgDeptVo.getSid(); + //采购系统名称 + String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName(); + //根据销售订单sid更新采购系统sid和采购系统名称 + busSalesOrderService.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid); + } for (int i = 0; i < readyCarList.size(); i++) { AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList.get(i); BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).docx b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).docx deleted file mode 100644 index 312a826d6c..0000000000 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).docx +++ /dev/null @@ -1,28 +0,0 @@ - 新车买卖合同（现车） - -甲方(出卖方) ： ${name} -乙方(买受方）： ${customerName} - 乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下： - 标的车辆基本信息 - - 品牌型号 - 车架号 - 备注 - 1 -${car_brand} -${car_vinNo} - ${car_remarks} -二、单台车的车价为 ${monry} 元（大写 ${money1} ） - 三、乙方向甲方交纳订金 ${money2} 元，乙方提车时交清全部车款。甲方未收到全款前， -车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的，甲方有权将车辆收回并处置。 -四、车辆交付地点 ${address} ，乙方自提。 -五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 -六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 -七、乙方交纳订金后在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 -乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 -八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - 九、本合同双方签字或盖章之时生效。 - - 甲方：分公司名称（打印） 乙方： 客户签字 - 年 月 日 年 月 日 - diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).ftl deleted file mode 100644 index 611deae823..0000000000 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(现车).ftl +++ /dev/null @@ -1,2410 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新车买卖合同（现车） - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方(出卖方) ： - - - - - - - - - - - - - - - - - - - - - - - - ${partyA} - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方(买受方）： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${partyB} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方从甲方以全款方式购买现车，现将双方权利和义务约定如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - 标的车辆基本信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 品牌型号 - - - - - - - - - - - - - - - - - - - - - - 车架号 - - - - - - - - - - - - - - - - - - - - - - 备注 - - - - - <#list carList as car> - - - - - - - - - - - - - - - - - - - - - - - ${car_index+1} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${car.brand} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${car.vinNo} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${car.remarks} - - - - - - - - - - - - - - - - - - - - - - - - - - - - 二、单台车的车价为 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${unitPrice} - - - - - - - - - - - - - - - - - - - - - - - - 元（大写 - - - - - - - - - - - - - - - - ${price} - - - - - - - - - - - - - - - ） - - - - - - - - - - - - - - - - - - 三、乙方向甲方交纳订金 - - - - - - - - - - - - - - - - - - - - - - - - ${money} - - - - - - - - - - - - - - - 元，乙方提车时交清全部车款。甲方未收到全款前， - - - - - - - - - - - - - - - - - - 车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的，甲方有权将车辆收回并处置。 - - - - - - - - - - - - - - - - - 四、车辆交付地点 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${address} - - - - - - - - - - - - - - - ，乙方自提。 - - - - - - - - - - - - - - - - - 五、 - - - - - - - - 乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 - - - - - - - - - - - - - - - - - - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 - - - - - - - - - - - - - - - - 七、乙方交纳订金后在 - - - - - - - 10 - - - - - - - 日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 - - - - - - - - - - - - - - - - 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 - - - - - - - - - - - - - - - - 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - - - - - - - - - - - - - - - - - - - - - - 九、本合同双方签字或盖章之时生效。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方： - - - - - - - - 分公司名称（打印） - - - - - - - - - - - - - - 乙方： - - - - - - - - - - - - - - 客户签字 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 年 - - - - - - - - - - - - - - - - 月 - - - - - - - - - - - - - - - - 日 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 年 - - - - - - - - - - - - - - - - 月 - - - - - - - - - - - - - - - - 日 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 孟哲 - - - 孟哲 - 2 - 2022-01-06T05:54:00Z - 2022-01-06T05:54:00Z - - - - - - - - 0 - 1 - 148 - 845 - Microsoft Office Word - 0 - 7 - 1 - false - - false - 992 - false - false - 16.0000 - - - - \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).docx b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).docx deleted file mode 100644 index 755b61b243..0000000000 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).docx +++ /dev/null @@ -1,54 +0,0 @@ - 新车买卖合同（订车） - -甲方(出卖方) ： ${name} -乙方(买受方）： ${customerName} - 乙方从甲方以全款方式订购车辆 台，现将双方权利和义务约定如下： - 甲方按照乙方要求订购排产的车辆型号及配置要求如下： - ${carModel} - ${brand} - ${manName} - ${color} - ${engineType} - - - - - - ${gearboxType} - ${rearAxle} - ${capacity} - ${displament} -${power} - - - - - - ${driveForm} - ${airCondit} -${tyreSpecifi} - 开门 - 举升方式 - - - - - - 货厢尺寸 -外廓尺寸：长 宽 高 -板材材质： 板材厚度： -其他说明： -其他配置要求：${config} -二、单台车的车价为 元（大写 ） -三、乙方向甲方交纳订金 元，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的，甲方有权将车辆收回并处置。 -四、车辆交付地点 ，乙方自提。 -五、乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 -六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 -七、甲方通知乙方提车后，乙方在10日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 -乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 -八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - 九、本合同双方签字或盖章之时生效。 - - 甲方： 乙方： - 年 月 日 年 月 日 - diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).ftl deleted file mode 100644 index c8aa65913a..0000000000 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/新车买卖合同(订车).ftl +++ /dev/null @@ -1,3458 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 新车买卖合同（订车） - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方(出卖方) ： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${partyA} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方(买受方）： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${partyB} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 乙方从甲方以全款方式订购车辆 - - - - - - - - - - - - - - - - - - - 台，现将双方权利和义务约定如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方按照乙方要求订购排产的车辆型号及配置要求如下： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 车辆型号 - - - - - - - - - - - - - - - - - - - - - - - - - - 品牌 - - - - - - - - - - - - - - - - - - - - - - - - - - 生产厂家 - - - - - - - - - - - - - - - - - - - - - - - - - - 车身颜色 - - - - - - - - - - - - - - - - - - - - - - - - - - 发动机型号 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${carModel} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${brand} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${color} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${engineType} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 变速箱 - - - - - - - - - - - - - - - - - - - - - - - - - - 后桥及速比 - - - - - - - - - - - - - - - - - - - - - - - - - - 驾驶室 - - - - - - - - - - - - - - - - - - - - - - - - - - 排放 - - - - - - - - - - - - - - - - - - - - - - - - - - 功率（马力） - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${gearboxType} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${rearAxle} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${apacity} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${displament} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${power} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 驱动形式 - - - - - - - - - - - - - - - - - - - - - - - - - - 空调 - - - - - - - - - - - - - - - - - - - - - - - - - - 轮胎 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${driveForm} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${airCondit} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tyreSpecifi} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 货厢尺寸 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 外廓尺寸：长 - - - - - - - - - - - - - - - - - 宽 - - - - - - - - - - - - - - - - - 高 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 板材材质： - - - - - - - - - - - - - - - - - 板材厚度： - - - - - - - - - - - - - - - - - - - - 其他说明： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 其他配置要求： - - - - - - - - - - - - - - - - ${config} - - - - - - - - - - - - - - - - - - - - - - 二、单台车的车价为 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${unitPrice} - - - - - - - - - - - - - - - - - - - - - - - - - - - 元（大写 - - - - - - - - - - - - - - - - - - ${price} - - - - - - - - - - - - - - - - - ） - - - - - - - - - - - - - - - - - - - 三、乙方向甲方交纳订金 - - - - - - - - - - - - - - - - - - ${money} - - - - - - - - - - - - - - - - - 元，乙方提车时交清全部车款。甲方未收到全款前，车辆所有权归甲方所有。乙方欠款提车后未按照约定时间交清全部款项的，甲方有权将车辆收回并处置。 - - - - - - - - - - - - - - - - - - - 四、车辆交付地点 - - - - - - - - - - - - - - - - - - ${address} - - - - - - - - - - - - - - - - - ，乙方自提。 - - - - - - - - - - - - - - - - - - - 五、 - - - - - - - - - 乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验收无异议的，甲方向乙方交付车钥匙，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方承担。乙方提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 - - - - - - - - - - - - - - - - - - - - 六、甲方负责提供车辆合格证及发票，因国家政策调整等原因致使无法办理落实手续的后果由乙方承担。 - - - - - - - - - - - - - - - - - - 七、甲方通知乙方提车后，乙方在 - - - - - - - - 10 - - - - - - - - 日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另行处置，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 - - - - - - - - - - - - - - - - - - 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行。 - - - - - - - - - - - - - - - - - - 八、本合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 - - - - - - - - - - - - - - - - - - - - - - - - - 九、本合同双方签字或盖章之时生效。 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 甲方： - - - - - - - - - - - - - - - - 乙方： - - - - - - - - - - - - - - - - - - - - - - - - - - 年 - - - - - - - - - - - - - - - - 月 - - - - - - - - - - - - - - - - 日 - - - - - - - - - - - - - - - - 年 - - - - - - - - - - - - - - - - 月 - - - - - - - - - - - - - - - - 日 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 孟哲 - - - 孟哲 - 2 - 2022-02-08T01:12:00Z - 2022-02-08T01:12:00Z - - - - - - - - 0 - 2 - 195 - 1118 - Microsoft Office Word - 0 - 9 - 2 - false - - false - 1311 - false - false - 16.0000 - - - - \ No newline at end of file diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js index bfc96fa673..c1b55ac875 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js @@ -81,3 +81,20 @@ export function selectNameByOrg(data) { params: data }) } + +// 根据分公司Sid获取分公司下所有的部门 +export function getListDeptByOrgSid(data) { + return request({ + url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data, + method: 'GET' + }) +} + +// 根据当前用户orgSidPath的管理层级获取相应的信息（集团获取所有分公司信息、事业部获取旗下的分公司信息、分公司获取该分公司的信息） +export function selectOrgByLevel(data) { + return request({ + url: '/base/v1/basevehicleout/selectOrgByLevel', + method: 'post', + params: data + }) +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js index 801897569d..82bbab1e30 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -171,21 +171,6 @@ const codemenu = [ meta: { title: '开票信息管理', noCache: true } }] }, - // 开票信息维护 - { - path: '/billinginformation', - component: Layout, - redirect: '/billinginformation', - meta: { - title: '开票信息维护' - }, - children: [{ - path: '/billinginformation/kaipiaoxinxiweihu', - component: () => import('@/views/anruifinmanagement/billinginformation/kaipiaoxinxiweihu/kaipiaoxinxiweihu.vue'), - name: 'kaipiaoxinxiweihu', - meta: { title: '开票信息维护', noCache: true } - }] - }, // 费用申请管理编辑 { path: '/feiyongguanliFlow/feiyongguanli/feiyongEdit', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue index d1aa9076de..ff3701f1a5 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue @@ -20,13 +20,23 @@ 分公司 - + + + 采购系统 + + + + + + + + @@ -85,7 +95,7 @@ - - diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index c0bcbf0a42..6d0f934114 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -47,83 +47,77 @@
- + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index 6b35a289fd..56a9bb9673 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -38,28 +38,28 @@ - + *收款银行账号 - + - + 收款银行名称 - + {{ formobj.receivingName }} - + *收款银行 - + {{ formobj.collectionBank }} @@ -107,7 +107,7 @@ - + @@ -133,44 +133,56 @@ 打款凭证 - + {{ item.name }} - - 汇款确认书 - + - -
+ + + + + + + + + + + + + + + + + + + +
+
+ 查询 + 重置 +
- - - - - - - - - - - -
- 查询 - 重置 -
+ 余额:
+
+ + + + +
应收未收款款项明细
@@ -183,7 +195,7 @@ {{ scope.row.contractNo }} - + @@ -216,17 +228,8 @@
- +
-
- - - - -
- 余额: -
-
已选应收款项明细
@@ -239,12 +242,12 @@ {{ scope.row.contractNo }} - + - + @@ -254,24 +257,29 @@ {{ scope.row.customerPhone }} - + - + - + + + + @@ -296,6 +304,7 @@ export default { data() { return { viewTitle: '', + dialogStatus: '', overduereceivableKey: 0, selectedreceivableKey: 1, receiptBank_list: [], @@ -339,7 +348,8 @@ export default { customerName: '', customerPhone: '', sids: [], - createBySid: '' + createBySid: '', + vinNo: '' }, rules: { collectionBankNum: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }], @@ -350,7 +360,8 @@ export default { payAccount: [{ required: true, message: '付款账号不能为空', trigger: 'blur' }] }, submitdisabled: false, - balance: '' // 余额 + balance: '', // 余额 + balanceCopy: '' // 计算余额时使用(针对已选应收款项明细表中认款金额多次输入导致余额计算错误) } }, methods: { @@ -426,7 +437,17 @@ export default { this.formobj.collectionTypeKey = aa.value }, changeCollectionMoney() { - this.balance = this.formobj.collectionMoney + if (this.dialogStatus === '') { + this.balance = this.formobj.collectionMoney + this.balanceCopy = this.formobj.collectionMoney + } + }, + changeMoney(row) { + if (row.subscriptionMoney !== '') { + row.surplusReceivable = parseFloat(row.currentReceivableMoney) - parseFloat(row.subscriptionMoney) + } else { + row.surplusReceivable = '' + } }, changeSubscriptionMoney() { let subscriptionMoney = '0' @@ -469,7 +490,7 @@ export default { return u }) }) - this.balance = parseInt(this.balance) - parseInt(resNum) + this.balance = parseInt(this.balanceCopy) - parseInt(resNum) }, getlist() { this.listQuery.createBySid = window.sessionStorage.getItem('userSid') @@ -488,7 +509,8 @@ export default { customerName: '', customerPhone: '', sids: [], - createBySid: '' + createBySid: '', + vinNo: '' } this.getlist() }, @@ -508,10 +530,12 @@ export default { showEdit(row) { this.DataDictionary() this.viewTitle = '【编辑】收款确认申请' + this.dialogStatus = 'edit' fetchDetailBySid(row.sid).then(resp => { - if (resp.code === '200') { + if (resp.success) { this.formobj = resp.data this.balance = this.formobj.balance + this.balanceCopy = this.formobj.balance this.getlist() this.forbidden = true if (this.formobj.paymentVoucherAppendixs.length > 0) { @@ -587,6 +611,13 @@ export default { if (this.formobj.collectionMoney === '') { this.$message({ showClose: true, type: 'error', message: '请先填写收款金额' }) } else { + var nowDate = new Date() + var date = { + year: nowDate.getFullYear(), + month: nowDate.getMonth() + 1, + day: nowDate.getDate() + } + var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day) this.formobj.finSelectedReceivablesDetaileds.push({ createByName: window.sessionStorage.getItem('name'), contractSid: row.contractSid, @@ -600,7 +631,8 @@ export default { currentReceivableMoney: row.currentReceivableMoney, lastSubscriptionMoney: '', subscriptionMoney: '', - subscriptionDate: '', + surplusReceivable: '', + subscriptionDate: dayDate, collSid: '', receivablesSid: row.sid, sid: row.sid @@ -622,6 +654,9 @@ export default { paymentVoucherUrl_list.push(this.formobj.paymentVoucherAppendixs[i].filePath) } this.formobj.paymentVoucherUrl = paymentVoucherUrl_list.join(',') + } else { + this.$message({ showClose: true, type: 'error', message: '请上传打款凭证' }) + return } if (this.formobj.remittanceConfirmationAppendixs.length > 0) { var remittanceConfirmationUrl_list = [] @@ -629,6 +664,13 @@ export default { remittanceConfirmationUrl_list.push(this.formobj.remittanceConfirmationAppendixs[b].filePath) } this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',') + } else { + for (var k = 0; k < this.formobj.finSelectedReceivablesDetaileds.length; k++) { + if (this.formobj.finSelectedReceivablesDetaileds[k].customerName !== this.formobj.payerName) { + this.$message({ showClose: true, type: 'error', message: '请上传汇款确认书' }) + return + } + } } this.formobj.userSid = window.sessionStorage.getItem('userSid') this.$refs['form_obj'].validate((valid) => { @@ -638,6 +680,8 @@ export default { if (resp.success) { this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -691,6 +735,8 @@ export default { this.$refs['remittance'].show(this.list2) }) this.balance = '' + this.balanceCopy = '' + this.dialogStatus = '' this.$refs['form_obj'].resetFields() this.$emit('doback') } @@ -699,6 +745,9 @@ export default { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue index bd46140ef1..0058d3cf3c 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue @@ -8,7 +8,7 @@
收款确认申请
- + 申请部门 @@ -36,90 +36,90 @@ - - 收款银行账号 + + 收款银行账号 - + - {{ formobj.collectionBankNum }} + {{ formobj.collectionBankNum }} - - 收款银行名称 + + 收款银行名称 - + - {{ formobj.receivingName }} + {{ formobj.receivingName }} - - 收款银行 + + 收款银行 - + - {{ formobj.collectionBank }} + {{ formobj.collectionBank }} - 收款金额(元) + 收款金额(元) - {{ formobj.collectionMoney }} + {{ formobj.collectionMoney }} - 收款日期 + 收款日期 - {{ formobj.collectionDate }} + {{ formobj.collectionDate }} - 收款方式 + 收款方式 - {{ formobj.collectionTypeValue }} + {{ formobj.collectionTypeValue }} - 付款方 + 付款方 - {{ formobj.payerName }} + {{ formobj.payerName }} - 付款账号后4位 + 付款账号后4位 - {{ formobj.payAccount }} + {{ formobj.payAccount }} - 付款银行 + 付款银行 - {{ formobj.payBank }} + {{ formobj.payBank }} - 备注 + 备注 - {{ formobj.remarks }} + {{ formobj.remarks }} @@ -270,4 +270,24 @@ export default { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java index dd4b382e7a..e2e0806d18 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -57,5 +59,9 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo { @ApiModelProperty("付款账号后4位") private String payAccount; + @ApiModelProperty("单据编号") + @JsonProperty("collectionBillId") + private String billNo; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java index 5f84d557d0..5fe06125e8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java @@ -83,5 +83,8 @@ public class AppFinCollectionConfirmationInitVo implements Vo { @ApiModelProperty("申请人名称") private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java index 470a33016f..fee12c69bf 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java @@ -53,5 +53,7 @@ public class AppFinCollectionConfirmationPageVo implements Vo { @ApiModelProperty("申请人") private String createByName; + private String billNo; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 85becd17dd..00a4a68ff6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -108,4 +108,6 @@ public class FinCollectionConfirmation extends BaseEntity { private String accountSid; @ApiModelProperty("申请部门sid") private String createDeptSid; + @ApiModelProperty("单据编号") + private String billNo; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java index 7068636fa0..687ea30531 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java @@ -103,5 +103,8 @@ public class FinCollectionConfirmationDetailsVo implements Vo { @ApiModelProperty("付款银行") private String payBank; + @ApiModelProperty("单据编号") + private String billNo; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java index da07ed47db..2f6d6de5d7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java @@ -89,4 +89,7 @@ public class FinCollectionConfirmationVo implements Vo { @ApiModelProperty("申请人") private String createByName; + + @ApiModelProperty("单据编号") + private String billNo; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java index dbf97d30f5..2854b7058f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicing.java @@ -66,5 +66,8 @@ public class FinCompanyInvoicing extends BaseEntity { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java index 240a9d7022..517e7d08e5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java @@ -67,5 +67,8 @@ public class FinCompanyInvoicingDetailsVo implements Vo { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java index ec2a2171df..b358566af2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDto.java @@ -67,5 +67,8 @@ public class FinCompanyInvoicingDto implements Dto { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java index 73e8be3a70..be577e3824 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java @@ -80,4 +80,9 @@ public interface FinCompanyInvoicingFeign { @GetMapping("/fetchDetailsByUseOrgSid/{useOrgSid}") @ResponseBody public ResultBean fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid); + + @ApiOperation("根据分公司和采购系统查询") + @GetMapping("/getDetailsByUseOrgAndSystem") + @ResponseBody + public ResultBean getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid")String useOrgSid,@RequestParam("systemSid")String systemSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index e7e7af389b..97c06917fc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -74,4 +74,9 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { return null; } + + @Override + public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java index 14ef105fb8..69bb17f07b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java @@ -51,5 +51,8 @@ public class FinCompanyInvoicingQuery implements Query { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - + @ApiModelProperty("组织全路径") + private String orgSidPath; // 组织全路径 + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java index dfda732144..792ea446ba 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java @@ -67,5 +67,8 @@ public class FinCompanyInvoicingVo implements Vo { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; // 采购系统sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; // 采购系统名称 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentDto.java new file mode 100644 index 0000000000..ef0317a1c4 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentDto.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.fin.api.finpaymentrecord; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/1/6 11:17 + * @Description + */ +@Data +public class FinPaymentDto implements Dto { + private static final long serialVersionUID = -4017935428217046179L; + + private List sids; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java index 727c489f4e..2b573df11c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java @@ -31,10 +31,10 @@ 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.*; - -import java.util.List; -import java.util.Map; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; /** * Project: anrui-fin(财务)
@@ -81,4 +81,9 @@ public interface FinPaymentrecordFeign { @PostMapping("/createPdf") @ResponseBody public ResultBean createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName); + + @ApiOperation("无需付款按钮") + @PostMapping("/updateAllState") + @ResponseBody + ResultBean updateAllState(@RequestBody FinPaymentDto dto); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java index 985103e06e..fc05fa27c8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java @@ -75,4 +75,9 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign { public ResultBean createPdf(String sid,String userName) { return null; } + + @Override + public ResultBean updateAllState(FinPaymentDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java index 1459f37fd5..1360a0b51d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java @@ -39,5 +39,5 @@ public class FinPaymentrecordUpdateDto implements Dto { private String payWayValue; @ApiModelProperty(value = "付款凭证") - private String payFile; + private List payFiles; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java index 257577f210..01c8b400ac 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-fin(财务)
* File: FinPaymentrecordVo.java
@@ -79,6 +81,8 @@ public class FinPaymentrecordVo implements Vo { @ApiModelProperty(value = "金额") private Integer cost; @ApiModelProperty(value = "付款凭证") + private List payFiles; + private String payFile; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java new file mode 100644 index 0000000000..6a5dc7fe2f --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/SelectCustomerVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/4 9:45 + * @Description + */ +@Data +public class SelectCustomerVo implements Vo { + private static final long serialVersionUID = 4691661516865204703L; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户联系方式") + private String customerPhone; + @ApiModelProperty("客户sid") + private String customerSid; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index 6e2e85cc1c..a163959d0e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java @@ -70,4 +70,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query { private String createBySid; // 业务员sid @ApiModelProperty("应收款项sid") private String[] sids; // 应收款项sid + + private String vinNo; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index 6b24622feb..23315ce634 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -188,5 +188,4 @@ public interface FinKingDeeFeign { @PostMapping("/updateBDEmpinfo") @ResponseBody public ResultBean updateBDEmpinfo(@RequestBody @Valid BDEmpinfo bdEmpinfo); - } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeOrgAndDeptCode.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeOrgAndDeptCode.java new file mode 100644 index 0000000000..7f25dc5807 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeOrgAndDeptCode.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.fin.api.kingdee.kingdeeUtils; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class KingDeeOrgAndDeptCode { + + @ApiModelProperty("分公司编码") + @NotBlank(message = "分公司编码不能为空") + private String orgCode; // 分公司编码 + @ApiModelProperty("其他编码") + private String otherCode; // 其他编码 + @ApiModelProperty("部门编码") + private String deptCode; // 部门编码 +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeUtils.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeUtils.java new file mode 100644 index 0000000000..e36dff0dbf --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeUtils.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.fin.api.kingdee.kingdeeUtils; + +public class KingDeeUtils { + + /** + * 陕汽绵阳富创-陕汽成都礼贤财务分公司编码、其他编码、部门编码合并 + * @return + */ + public static KingDeeOrgAndDeptCode orgAndDeptCodeMerge(KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode) { + String orgCode = kingDeeOrgAndDeptCode.getOrgCode(); + String otherCode = kingDeeOrgAndDeptCode.getOtherCode(); + String deptCode = kingDeeOrgAndDeptCode.getDeptCode(); + if ("119".equals(orgCode)){ + kingDeeOrgAndDeptCode.setOrgCode("112"); + if ("01.119".equals(otherCode)){ + kingDeeOrgAndDeptCode.setOtherCode("01.112"); + } + if ("134".equals(deptCode)){ + kingDeeOrgAndDeptCode.setDeptCode("103"); + }else if ("139".equals(deptCode)){ + kingDeeOrgAndDeptCode.setDeptCode("99"); + }else if ("137".equals(deptCode)){ + kingDeeOrgAndDeptCode.setDeptCode("96"); + }else if ("138".equals(deptCode)){ + kingDeeOrgAndDeptCode.setDeptCode("106"); + }else if ("136".equals(deptCode) || "135".equals(deptCode)){ + kingDeeOrgAndDeptCode.setDeptCode("132"); + } + } + return kingDeeOrgAndDeptCode; + } +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java index 108387d02d..b1036d19bc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java @@ -103,9 +103,9 @@ public class SalOutStock { public String FStockID; /** * 销售单位:FSalUnitID - */ @JsonProperty("FSalUnitID") + */ /*@JsonProperty("FSalUnitID") @NotBlank - public String FSalUnitID; + public String FSalUnitID;*/ /** * 销售折让:F_PAEZ_Decimal3 */ @JsonProperty("F_PAEZ_Decimal3") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index f32f3962d3..1b445b4b14 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -107,4 +107,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper getList(@Param("stringList") List stringList, @Param("createBySid") String createBySid, @Param("useOrgSid") String useOrgSid); FinCollectionConfirmation selectByBusSid(String virtualOrderSid); + + String selectNum(String bill); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index a6f0ea29a7..d012be7d14 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -35,7 +35,8 @@ receivingName, payAccount, payBank, - createByName + createByName, + billNo FROM fin_collection_confirmation @@ -64,7 +65,8 @@ payAccount, payBank, accountSid, - createByName + createByName, + billNo FROM fin_collection_confirmation WHERE sid = #{collectionBillSid} AND useOrgSid = #{useOrgSid} @@ -82,7 +84,8 @@ paymentVoucherUrl, remarks, payAccount, - receivingName + receivingName, + billNo FROM fin_collection_confirmation WHERE sid = #{collectionBillSid} @@ -117,4 +120,12 @@ + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 9953b7a4e6..f7ba3d4cf2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -38,7 +38,10 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; @@ -49,14 +52,13 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; 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.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill; @@ -138,6 +140,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -249,6 +253,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.SKD.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + public ResultBean saveAllDto(FinCollectionConfirmationDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -261,21 +282,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); - if (paymentVoucherAppendixs.size() == 0) { + /*if (paymentVoucherAppendixs.size() == 0) { return rb.setMsg("请上传打款凭证附件"); - } + }*/ List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); - if (remittanceConfirmationAppendixs.size() == 0) { + /*if (remittanceConfirmationAppendixs.size() == 0) { return rb.setMsg("请上传汇款确认书附件"); - } + }*/ if (finSelectedReceivablesDetailedDtos.size() > 0) { for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { if (StringUtils.isBlank(v.getSubscriptionMoney())) { return rb.setMsg("认款金额不允许为空"); } - if (StringUtils.isBlank(v.getSubscriptionDate())) { + /* if (StringUtils.isBlank(v.getSubscriptionDate())) { return rb.setMsg("认款申请日期不能为空"); - } + }*/ } @@ -331,6 +352,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { @@ -390,6 +417,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService payFiles = dto.getPayFiles(); if (payFiles.size() > 0) { @@ -913,7 +944,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) > 0) { return rb.setMsg("认款金额不允许超过收款金额"); } if (subscriptionMoneyAll.compareTo(finCollectionConfirmation.getCollectionMoney()) != 0) { @@ -1186,6 +1217,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); + List voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "车款"); + //查询是否含有车架号 + List stringsVin = voListv.stream().filter(v->StringUtils.isNotBlank(v.getVIN())).map(v->v.getVIN()).collect(Collectors.toList()); + stringsVin.removeAll(Collections.singleton(null)); + if(finSelectedReceivablesDetailedVos1.size()>0){ + if (!stringsVin.isEmpty()) { + //查询根据客户名称和手机号有哪些客户 + List customerList = finSelectedReceivablesDetailedService.selectCustomerList(sid, 1, "车款"); + for (SelectCustomerVo vo : customerList) { + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), vo.getCustomerName(), vo.getCustomerPhone(),vo.getCustomerSid(),sid); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + fEntityList = new ArrayList<>(); + String uncollSid = ""; + //查询该客户的车架号不为空的情况 + List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); + vinListVo.removeAll(Collections.singleton(null)); + if(!vinListVo.isEmpty()){ + for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8)); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + uncollSid = vvvv.getReceivablesSid(); + } + } + //查询该客户的车架号为空的情况 + FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "车款", vo.getCustomerName(), vo.getCustomerPhone()); + if(vvVo != null){ + uncollSid = vvVo.getReceivablesSid(); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + } + + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(uncollSid); + if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("001"); + } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("002"); + } + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); + } + + } else { + fEntityList = new ArrayList<>(); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); + if (!finSelectedReceivablesDetailedVos1.isEmpty()) { + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { + //先推送客户 + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(),finSelectedReceivablesDetailedVo.getCustomerSid(),sid); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid()); + if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("001"); + } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("002"); + } + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); + } + } + } + + } + + + /* List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); if (!finSelectedReceivablesDetailedVos1.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1){ + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone()); + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); //往来单位 arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); //结算方式 freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDType("customerPayType"); -// BigDecimal bigAll = finSelectedReceivablesDetailedVos1.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); //收款金额 freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); //登记日期 @@ -1315,9 +1457,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); + if(finSelectedReceivablesDetailedVos2.size()>0){ + voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金"); + //查询是否含有车架号 + stringsVin = voListv.stream().filter(v->StringUtils.isNotBlank(v.getVIN())).map(v->v.getVIN()).collect(Collectors.toList()); + stringsVin.removeAll(Collections.singleton(null)); + if (!stringsVin.isEmpty()) { + //查询根据客户名称和手机号有哪些客户 + List customerList = finSelectedReceivablesDetailedService.selectCustomerList(sid, 1, "订金"); + for (SelectCustomerVo vo : customerList) { + //先推送客户 + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), vo.getCustomerName(), vo.getCustomerPhone(),vo.getCustomerSid(),sid); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + fEntityList = new ArrayList<>(); + //查询该客户的车架号不为空的情况 + List vinListVo = finSelectedReceivablesDetailedService.selectVinListVo(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); + vinListVo.removeAll(Collections.singleton(null)); + if(!vinListVo.isEmpty()){ + for (FinSelectedReceivablesDetailedVo vvvv : vinListVo) { + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length()-8)); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + } + } + + //查询该客户的车架号为空的情况 + FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV(sid, 1, "订金", vo.getCustomerName(), vo.getCustomerPhone()); + if(vvVo != null){ + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + } + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + arReceivebill.setF_PAEZ_AssistantKey("006"); + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); + + } + } else { + fEntityList = new ArrayList<>(); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); + if (!finSelectedReceivablesDetailedVos2.isEmpty()) { + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) { + //先推送客户 + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(),finSelectedReceivablesDetailedVo.getCustomerSid(),sid); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); +// BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + arReceivebill.setF_PAEZ_AssistantKey("006"); + ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill); + } + } + } } //推送订金 - List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); + /*List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); fEntityList = new ArrayList<>(); freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); if (!finSelectedReceivablesDetailedVos2.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2){ + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) { //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(),finSelectedReceivablesDetailedVo.getCustomerName(),finSelectedReceivablesDetailedVo.getCustomerPhone()); + BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); //往来单位 arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); //结算方式 freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); freceivebillentry.setFSETTLETYPEIDType("customerPayType"); -// BigDecimal bigAll = finSelectedReceivablesDetailedVos2.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); //收款金额 freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); //登记日期 @@ -1360,14 +1597,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService(); @@ -1390,7 +1627,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo()); - if(resultBean.getSuccess()){ - BusSalesOrderPrice busSalesOrderPrice = resultBean.getData(); - BigDecimal singleFinalPrice = busSalesOrderPrice.getSingleFinalPrice(); - if(singleFinalPrice.compareTo(bigDecimalVinAll) == 0){//推送待出库 - BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); - busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode()); - busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks()); - ResultBean busSalesOrderResultBean = busSalesOrderFeign.selectOrderByContractNo(v.getContractNo()); - if(busSalesOrderResultBean.getSuccess()){ - BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData(); - if(busSalesOrder != null){ - busDeliveredDto.setPaymentMethodKey(busSalesOrder.getPayTypeKey()); - busDeliveredDto.setPaymentMethod(busSalesOrder.getPayType()); - } - } - busDeliveredDto.setContractNo(v.getContractNo()); - busDeliveredDto.setName(v.getCustomerName()); - busDeliveredDto.setVinNo(v.getVIN()); - busDeliveredDto.setMobile(v.getCustomerPhone()); - busDeliveredDto.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); - //根据客户sid查询客户的身份证号和 - ResultBean orderDetails = busSalesOrderFeign.getSaleOrderDetails(busSalesOrderPrice.getSalesOrderSid()); - AppOrderDetailsVo vo = orderDetails.getData(); - if(vo != null){ - AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo(); - busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName()); - } - ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto); - - } - }*/ }); //查询该申请已认款金额总数 subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); @@ -1505,7 +1710,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(useOrgSid); if (resultBean.getSuccess()) { @@ -1567,13 +1773,47 @@ public class FinCollectionConfirmationService extends MybatisBaseService crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid); + if(crmCustomerTempVoResultBean.getData() != null){ + code = crmCustomerTempVoResultBean.getData().getCustomerNo(); + } + }else{ + //简易订单-订金收取 + code = getPrefix(collSid,name,mobile); + } bdCustomer.setFNumber(code); return bdCustomer; } + public String getPrefix(String collSid, String name, String mobile) { + String customerNoPrefix = ""; + FinCollectionConfirmation finCollectionConfirmation = fetchBySid(collSid); + String useOrgSid = finCollectionConfirmation.getUseOrgSid(); + String createDeptSid = finCollectionConfirmation.getCreateDeptSid(); + if(StringUtils.isNotBlank(useOrgSid)) { + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre(); + } + } + if(StringUtils.isNotBlank(createDeptSid)) { + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(createDeptSid); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode(); + } + } + customerNoPrefix = customerNoPrefix + mobile + HanZiConverterPinYin.getPinYinFirst(name); + System.out.println(customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix); + return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix; + } + public ResultBean saveFinConfirm(FinConfirmDto dto) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index 1a6f0f146e..3d7613747e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java @@ -66,4 +66,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper ${ew.sqlSegment} --> + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index fd40d2a451..fd0ef5a28d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -102,4 +102,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { FinCompanyInvoicingDetailsVo vo = finCompanyInvoicingService.fetchDetailsByUseOrgSid(useOrgSid); return rb.success().setData(vo); } + + @Override + public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { + return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid,systemSid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 76b19baa5c..aa25e7a558 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -28,22 +28,18 @@ package com.yxt.anrui.fin.biz.fincompanyinvoicing; 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.anrui.fin.api.fincompanyinvoicing.*; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; 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.fincompanyinvoicing.FinCompanyInvoicing; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingQuery; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDto; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.List; +import javax.annotation.Resource; /** * Project: anrui-fin(公司开票信息管理)
@@ -60,6 +56,10 @@ import java.util.List; */ @Service public class FinCompanyInvoicingService extends MybatisBaseService { + + @Resource + private SysOrganizationFeign sysOrganizationFeign; + private QueryWrapper createQueryWrapper(FinCompanyInvoicingQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -70,8 +70,21 @@ public class FinCompanyInvoicingService extends MybatisBaseService listPageVo(PagerQuery pq) { FinCompanyInvoicingQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + String orgSidPath = query.getOrgSidPath(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + String orgSid = orgSidPath.substring(74, 110); + qw.eq("fci.useOrgSid", orgSid); + } if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("useOrgSid", query.getUseOrgSid()); + qw.eq("fci.useOrgSid", query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemSid())) { + qw.eq("fci.purchaseSystemSid", query.getPurchaseSystemSid()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -121,4 +134,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { + ResultBean rb = ResultBean.fireFail(); + FinCompanyInvoicingDetailsVo vo = baseMapper.getDetailsByUseOrgAndSystem(useOrgSid,systemSid); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java index b72770b4ea..d39323905c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java @@ -84,4 +84,9 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign { public ResultBean createPdf(String sid,String userName) { return finPaymentrecordService.createPdf(sid,userName); } + + @Override + public ResultBean updateAllState(FinPaymentDto dto) { + return finPaymentrecordService.updateAllState(dto); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 0586d29301..c85a8e86b4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -30,10 +30,6 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jacob.activeX.ActiveXComponent; -import com.jacob.com.ComThread; -import com.jacob.com.Dispatch; -import com.jacob.com.Variant; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; @@ -71,10 +67,12 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.text.NumberFormat; import java.util.*; -import java.util.List; import java.util.stream.Collectors; import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader; @@ -152,6 +150,22 @@ public class FinPaymentrecordService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + List list = pagging.getRecords(); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (FinPaymentrecordVo vv : list){ + String payFile = vv.getPayFile(); + if(StringUtils.isNotBlank(payFile)){ + List strings = Arrays.asList(payFile.split(",")); + for (int i =0;i p = PagerUtil.pageToVo(pagging, null); return p; } @@ -189,6 +203,11 @@ public class FinPaymentrecordService extends MybatisBaseService payFiles = dto.getPayFiles(); + if(payFiles.size()>0){ + String payFile = payFiles.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + finPaymentrecord.setPayFile(payFile); + } baseMapper.updateById(finPaymentrecord); //更新付款申请中的状态 FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid()); @@ -339,7 +358,7 @@ public class FinPaymentrecordService extends MybatisBaseService createPdf(String sid,String userName) { + public ResultBean createPdf(String sid, String userName) { ResultBean rb = ResultBean.fireFail(); PdfPath pdfPath = new PdfPath(); String fjPath = ""; @@ -450,7 +469,7 @@ public class FinPaymentrecordService extends MybatisBaseService sidState = baseMapper.selectApplySidBySid(sids); + if (sidState.size() > 1) { + if (sidState.contains(3)) { + return rb.setMsg("处理的数据包含已作废的记录"); + } + } + List list = new ArrayList<>(); + for (int i = 0; i < sids.size(); i++) { + FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i)); + BeanUtil.copyProperties(dto, finPaymentrecord, "sid"); + finPaymentrecord.setCost(0); + baseMapper.updateById(finPaymentrecord); + //更新付款申请中的状态 + FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid()); + if (finPaymentapply != null) { + finPaymentapplyService.updateStateBySid(finPaymentrecord.getApplySid(), 2); + baseMapper.updateStateBySid(finPaymentrecord.getSid(), 2); + } else { + baseMapper.updateStateBySid(finPaymentrecord.getSid(), 2); + //更新厂家认款状态 + BaseManufUpdateDto baseManufUpdateDto = new BaseManufUpdateDto(); + baseManufUpdateDto.setSid(finPaymentrecord.getBusSid()); + ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto); + } + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index fb5c415500..b9d0ac7c0f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -35,6 +35,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivables import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import org.apache.ibatis.annotations.*; @@ -94,17 +95,25 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectDetailedGroupConAndRecAndPay(); @Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}") - void updateAuditDateBySid(@Param("sid1") String sid1,@Param("auditState") String auditState); + void updateAuditDateBySid(@Param("sid1") String sid1, @Param("auditState") String auditState); List selectByCollSid(@Param("collectionBillSid") String collectionBillSid); List selByContractNo(String contractNo); - List selectListByAuditState(@Param("i") int i,@Param("userSid") String userSid,@Param("useOrgSid") String useOrgSid); + List selectListByAuditState(@Param("i") int i, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid); - List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin,@Param("state") int state); + List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin, @Param("state") int state); List getList(@Param("list") List sidsList); - List fetchByAuditState1(@Param("sid") String sid, @Param("state") int i,@Param("type") String type); + List fetchByAuditState1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type); + + List selectCustomerList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type); + + List selectDetailsList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type); + + List selectVinListVo(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone); + + FinSelectedReceivablesDetailedVo fetchByAuditStateV(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index eb29cda57c..83893a1088 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -45,7 +45,8 @@ , #{name} , '%') - and length(furd.busVinSid)>0 + and length(furd.busVinSid) + >0 order by furd.contractNo desc @@ -124,11 +125,53 @@ + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 13ce095cbe..235798b909 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -200,8 +197,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByCollSid(String collectionBillSid) { @@ -213,19 +210,35 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectListByAuditState(int i,String userSid,String useOrgSid) { - return baseMapper.selectListByAuditState(i,userSid,useOrgSid); + public List selectListByAuditState(int i, String userSid, String useOrgSid) { + return baseMapper.selectListByAuditState(i, userSid, useOrgSid); } - public List selectListByVin(String contractNo, String vin,int state) { - return baseMapper.selectListByVin(contractNo, vin,state); + public List selectListByVin(String contractNo, String vin, int state) { + return baseMapper.selectListByVin(contractNo, vin, state); } public List getList(List sidsList) { return baseMapper.getList(sidsList); } - public List fetchByAuditState1(String sid, int i,String type) { - return baseMapper.fetchByAuditState1(sid,i,type); + public List fetchByAuditState1(String sid, int i, String type) { + return baseMapper.fetchByAuditState1(sid, i, type); + } + + public List selectCustomerList(String sid, int i, String type) { + return baseMapper.selectCustomerList(sid, i, type); + } + + public List selectDetailsList(String sid, int i, String type) { + return baseMapper.selectDetailsList(sid, i, type); + } + + public List selectVinListVo(String sid, int i, String type, String customerName, String customerPhone) { + return baseMapper.selectVinListVo(sid, i, type,customerName,customerPhone); + } + + public FinSelectedReceivablesDetailedVo fetchByAuditStateV(String sid, int i, String type, String customerName, String customerPhone) { + return baseMapper.fetchByAuditStateV(sid, i, type,customerName,customerPhone); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 6abe708c66..fa0308a606 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -32,7 +32,6 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; @@ -185,9 +184,15 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService String vinNo = resultBean.getData().getLinkNo(); String vinSid = resultBean.getData().getLinkSid(); v.setVIN(vinNo); + if(StringUtils.isNotBlank(vinNo)){ + v.setVIN(vinNo.substring(vinNo.length()-8)); + } } } } + if(StringUtils.isNotBlank(query.getVinNo())){ + list = list.stream().filter(v->v.getVIN().contains(query.getVinNo())).collect(Collectors.toList()); + } return list; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index a45c22d030..6ddad58716 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -15,6 +15,8 @@ import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; import com.yxt.anrui.fin.api.kingdee.cnrecpaypurpose.CNRecpaypurpose; +import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeOrgAndDeptCode; +import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeUtils; import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations; import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; @@ -177,6 +179,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftArReceivebill(@RequestBody @Valid ARReceivebill arReceivebill) { log.info("FinKingDeeFeignRest-draftArReceivebill:{}", JSONObject.toJSONString(arReceivebill)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(arReceivebill.getFPAYORGID()); + kingDeeOrgAndDeptCode.setDeptCode(arReceivebill.getFSALEDEPTID()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + arReceivebill.setFPAYORGID(kingDeeOrgAndDeptCode.getOrgCode()); + arReceivebill.setFSALEDEPTID(kingDeeOrgAndDeptCode.getDeptCode()); return arReceivebillService.draftArReceivebill(arReceivebill); } @@ -186,6 +194,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) { log.info("FinKingDeeFeignRest-draftApPayBill:{}", JSONObject.toJSONString(apPayBill)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(apPayBill.getFPURCHASEORGID()); + kingDeeOrgAndDeptCode.setDeptCode(apPayBill.getFPURCHASEDEPTID()); + kingDeeOrgAndDeptCode.setOtherCode(apPayBill.getFRECTUNIT()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + apPayBill.setFPURCHASEORGID(kingDeeOrgAndDeptCode.getOrgCode()); + apPayBill.setFPURCHASEDEPTID(kingDeeOrgAndDeptCode.getDeptCode()); + apPayBill.setFRECTUNIT(kingDeeOrgAndDeptCode.getOtherCode()); return apPayBillService.draftApPayBill(apPayBill); } @@ -195,6 +211,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception { log.info("FinKingDeeFeignRest-draftStkInStock:{}", JSONObject.toJSONString(stkInStock)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(stkInStock.getFPurchaseOrgId()); + kingDeeOrgAndDeptCode.setDeptCode(stkInStock.getFPurchaseDeptId()); + kingDeeOrgAndDeptCode.setOtherCode(stkInStock.getFSupplierId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + stkInStock.setFPurchaseOrgId(kingDeeOrgAndDeptCode.getOrgCode()); + stkInStock.setFPurchaseDeptId(kingDeeOrgAndDeptCode.getDeptCode()); + stkInStock.setFSupplierId(kingDeeOrgAndDeptCode.getOtherCode()); return stkInStockService.draftStkInStock(stkInStock); } @ApiOperation("根据物料查询入库单的状态 的审核状态 true 审核通过 false 未审核通过") @@ -212,6 +236,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftPurMrb(@RequestBody @Valid PurMrb purMrb) { log.info("FinKingDeeFeignRest-draftPurMrb:{}", JSONObject.toJSONString(purMrb)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(purMrb.getFStockOrgId()); + kingDeeOrgAndDeptCode.setOtherCode(purMrb.getFSupplierID()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + purMrb.setFStockOrgId(kingDeeOrgAndDeptCode.getOrgCode()); + purMrb.setFSupplierID(kingDeeOrgAndDeptCode.getOtherCode()); return purMrbService.draftPurMrb(purMrb); } @ApiOperation("暂存采购出库单的接口") @@ -220,6 +250,15 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) { log.info("FinKingDeeFeignRest-draftSalOutStock:{}", JSONObject.toJSONString(salOutStock)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(salOutStock.getFSaleOrgId()); + kingDeeOrgAndDeptCode.setDeptCode(salOutStock.getFSaleDeptID()); + //kingDeeOrgAndDeptCode.setOtherCode(salOutStock.getFCustomerID()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + salOutStock.setFSaleOrgId(kingDeeOrgAndDeptCode.getOrgCode()); + salOutStock.setFSaleDeptID(kingDeeOrgAndDeptCode.getDeptCode()); + //salOutStock.setFCustomerID(kingDeeOrgAndDeptCode.getOtherCode()); + //salOutStock.setF_PAEZ_Base(kingDeeOrgAndDeptCode.getOrgCode()); return salOutStockService.draftSalOutStock(salOutStock); } @ApiOperation("批量暂存物料的接口") @@ -228,6 +267,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftBdMaterialList(@RequestBody @Valid List bdMaterial) { log.info("FinKingDeeFeignRest-draftBdMaterialList:{}", JSONObject.toJSONString(bdMaterial)); + for (BdMaterial material : bdMaterial) { + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(material.getTOrgIds()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + material.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode()); + } return bdMaterialService.draftBdMaterialList(bdMaterial); } @ApiOperation("批量修改物料的接口") @@ -236,6 +281,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean saveBdMaterialList(@RequestBody @Valid List bdMaterial) { log.info("FinKingDeeFeignRest-saveBdMaterialList:{}", JSONObject.toJSONString(bdMaterial)); + for (BdMaterial material : bdMaterial) { + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(material.getTOrgIds()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + material.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode()); + } return bdMaterialService.saveBdMaterialList(bdMaterial); } @ApiOperation("暂存直接调拨单的接口") @@ -244,6 +295,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) { log.info("FinKingDeeFeignRest-draftStkTransferDirect:{}", JSONObject.toJSONString(stkTransferDirect)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(stkTransferDirect.getFStockOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + stkTransferDirect.setFStockOrgId(kingDeeOrgAndDeptCode.getOrgCode()); return stkTransferDirectService.draftStkTransferDirect(stkTransferDirect); } @ApiOperation("暂存组织机构的接口") @@ -268,6 +323,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier) { log.info("FinKingDeeFeignRest-draftBdSupplier:{}", JSONObject.toJSONString(bdSupplier)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdSupplier.getFUseOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdSupplier.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode()); return bdSupplierService.draftBdSupplier(bdSupplier); } @ApiOperation("修改供应商的接口") @@ -276,6 +335,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean updateBdSupplier(@RequestBody @Valid BdSupplier bdSupplier) { log.info("FinKingDeeFeignRest-updateBdSupplier:{}", JSONObject.toJSONString(bdSupplier)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdSupplier.getFUseOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdSupplier.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode()); return bdSupplierService.updateBdSupplier(bdSupplier); } @ApiOperation("暂存客户信息的接口") @@ -284,6 +347,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer) { log.info("FinKingDeeFeignRest-draftEntryBill:{}", JSONObject.toJSONString(bdCustomer)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdCustomer.getTOrgIds()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode()); return bdCustomerService.draftBdCustomer(bdCustomer); } @ApiOperation("暂存客户信息的接口 批量") @@ -292,6 +359,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean draftBdCustomers(@RequestBody @Valid List bdCustomers) { log.info("FinKingDeeFeignRest-draftBdCustomers:{}", JSONObject.toJSONString(bdCustomers)); + for (BdCustomer bdCustomer : bdCustomers) { + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdCustomer.getTOrgIds()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode()); + } return bdCustomerService.draftBdCustomers(bdCustomers); } @ApiOperation("修改客户信息的接口") @@ -300,6 +373,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean saveBdCustomers(@RequestBody @Valid List bdCustomers) { log.info("FinKingDeeFeignRest-saveBdCustomers:{}", JSONObject.toJSONString(bdCustomers)); + for (BdCustomer bdCustomer : bdCustomers) { + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdCustomer.getTOrgIds()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode()); + } return bdCustomerService.updateCustomers(bdCustomers); } @ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在") @@ -387,7 +466,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean drafCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) { log.info("FinKingDeeFeignRest-drafCNBankacnt:{}", JSONObject.toJSONString(cNBankacnt)); - return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(cNBankacnt.getFCreateOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + cNBankacnt.setFCreateOrgId(kingDeeOrgAndDeptCode.getOrgCode()); + return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } @ApiOperation("修改银行账号的接口") @@ -396,6 +479,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean updateCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) { log.info("FinKingDeeFeignRest-updateCNBankacnt:{}", JSONObject.toJSONString(cNBankacnt)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(cNBankacnt.getFCreateOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + cNBankacnt.setFCreateOrgId(kingDeeOrgAndDeptCode.getOrgCode()); return cnBankcntService.updateCNBankacnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } @@ -413,6 +500,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean saveBdDepartment(BdDepartment bdDepartment) { log.info("FinKingDeeFeignRest-saveBdDepartment:{}", JSONObject.toJSONString(bdDepartment)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdDepartment.getFUseOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdDepartment.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode()); return bdDepartmentService.saveBdDepartment(bdDepartment); } @ApiOperation("修改部门的接口") @@ -421,6 +512,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean updateBdDepartment(BdDepartment bdDepartment) { log.info("FinKingDeeFeignRest-updateBdDepartment:{}", JSONObject.toJSONString(bdDepartment)); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(bdDepartment.getFUseOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + bdDepartment.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode()); return bdDepartmentService.updateBdDepartment(bdDepartment); } @ApiOperation("保存员工的接口") @@ -439,5 +534,4 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { log.info("FinKingDeeFeignRest-updateBDEmpinfo:{}", JSONObject.toJSONString(bdEmpinfo)); return bDEmpinfoService.updateBDEmpinfo(bdEmpinfo); } - } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java index 5380de3256..9eadc25f9a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/ArReceivebillCastToKingDeeBillFields.java @@ -29,7 +29,9 @@ public class ArReceivebillCastToKingDeeBillFields { String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data.json"); String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_data.json"); String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json"); + /* String fPAYBILLENTRY_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_FRECEIVEBILLENTRY.json"); + */ //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); @@ -42,6 +44,7 @@ public class ArReceivebillCastToKingDeeBillFields { //对模板字段赋值 根据传递进来的map数据的集合进行赋值 for(int i=0;i params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); for (Map.Entry entry : params.entrySet()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdempinfo/BDEmpinfoService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdempinfo/BDEmpinfoService.java index b26994e16b..d450d5601e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdempinfo/BDEmpinfoService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdempinfo/BDEmpinfoService.java @@ -3,7 +3,8 @@ package com.yxt.anrui.fin.biz.kingdee.bdempinfo; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; -import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo; +import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeOrgAndDeptCode; +import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeUtils; import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig; @@ -140,5 +141,15 @@ public class BDEmpinfoService extends FinKingDeeService { return rb.setMsg("员工提交审核失败"); } } + + /** + * 陕汽绵阳富创-陕汽成都礼贤财务分公司编码、其他编码、部门编码合并 + * @return + */ + public ResultBean orgAndDeptCodeMerge(KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode) { + ResultBean rb=ResultBean.fireFail(); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + return rb.success().setData(kingDeeOrgAndDeptCode); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java index 7700772cda..5c2afd3300 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java @@ -6,6 +6,8 @@ import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; +import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeOrgAndDeptCode; +import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeUtils; import com.yxt.anrui.fin.api.kingdee.stkInstockNumber.FinStkInstockNumber; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; @@ -90,6 +92,10 @@ public class STKInStockService extends FinKingDeeService { JSONObject result = (JSONObject)jsonObject.get("Result"); JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); + KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode(); + kingDeeOrgAndDeptCode.setOrgCode(stkInStock.getTOrgId()); + kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode); + stkInStock.setTOrgId(kingDeeOrgAndDeptCode.getOrgCode()); if(responseStatus!=null){//不存在该物料 //新增物料 f.setFLot(""); diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml index f76408a083..c4d6f63555 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml +++ b/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml @@ -26,7 +26,7 @@ image: prefix: http://192.168.1.116:8111/upload/ kingdee: #金蝶的系统的链接账号 url等信息 acctID: 61dce6601125a0 #登录金蝶的账户信息 2022010测试 - userName: 信息部2 #登录金蝶的账户信息 2022010测试的 + userName: 信息部 #登录金蝶的账户信息 2022010测试的 password: 123321 #登录金蝶的账户信息 userName_administrator: administrator #登录金蝶的账户信息 2022010测试 password_administrator: ANrui123456. #登录金蝶的账户信息 2022010测试 diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml index d693f02edf..69ae71f1f2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml +++ b/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml @@ -26,7 +26,7 @@ image: prefix: http://anrui.yyundong.com/upload/ kingdee: acctID: 61dce6601125a0 #登录金蝶的账户信息 2022010测试 - userName: 信息部2 #登录金蝶的账户信息 2022010测试的 + userName: 信息部 #登录金蝶的账户信息 2022010测试的 password: 123321 #登录金蝶的账户信息 userName_administrator: administrator #登录金蝶的账户信息 2022010测试 password_administrator: ANrui123456. #登录金蝶的账户信息 2022010测试 diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index bf6d45e0cf..e6c5d457b9 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -7,28 +7,27 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), + /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), - // CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), -// SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25 -// FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), -// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), -// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"), -// VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),//TODO：正式新2022-11-25 -// SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), //TODO：正式新2022-11-25 -// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),//ToDo：正式新2022-11-25 -// FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),//ToDo:正式新2022-11-25 -// FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),//ToDo:正式新2022-11-25 + SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25 + FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), + BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), + ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"), + VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),//TODO：正式新2022-11-25 + SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), //TODO：正式新2022-11-25 + BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),//ToDo：正式新2022-11-25 + FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),//ToDo:正式新2022-11-25 + FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),//ToDo:正式新2022-11-25 RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO -// SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25 + SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25 SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), -// BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25 -// BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25 -// BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25 -// BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25 - BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"), + BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25 + BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25 + BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25 + BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25 + BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"), BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), @@ -39,23 +38,42 @@ public enum ProcDefEnum { SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), + BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/ /******************************测试流程id*********************************************/ + + ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), + ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), + ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), + RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"), + SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), + SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), + BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"), + BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), + BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), + SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), + SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"), + SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"), + SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"), + SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"), + SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), + SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), + CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试 BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试 VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试 FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试 FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试 ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22 - BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试 + BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试 FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试（新）2022、11、22 BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id - SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id + SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id*/ BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id ; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 1aa0b9e507..ed62652180 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -146,14 +146,14 @@ public class SysOrganizationRest implements SysOrganizationFeign { sysOrganizationService.updateBySid(dto.toMap(), sid); //修改金蝶组织信息 List orgOrganizationsList = new ArrayList<>(); - if ("0".equals(dto.getIsDept())){ + if (0 == dto.getIsDept()){ OrgOrganizations orgOrganizations = new OrgOrganizations(); orgOrganizations.setFName(dto.getName()); orgOrganizations.setFNumber(dto.getOrgCode()); orgOrganizations.setFOrgFormID("102"); orgOrganizationsList.add(orgOrganizations); finKingDeeFeign.updateOrgOrganizations(orgOrganizationsList); - }else if ("1".equals(dto.getIsDept())){ + }else if (1 == dto.getIsDept()){ BdDepartment bdDepartment = new BdDepartment(); bdDepartment.setFName(dto.getName()); bdDepartment.setFNumber(dto.getOrgCode()); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index ba3ee94f64..759aed25e2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -267,13 +267,13 @@ public class SysOrganizationService extends MybatisBaseService list = JSONObject.parseArray(captcha, Map.class); - /*if (StringUtils.isEmpty(verifyCode)) { + if (StringUtils.isEmpty(verifyCode)) { return new ResultBean().fail().setMsg("验证码不能为空"); } @@ -391,7 +391,7 @@ public class SysUserRest implements SysUserFeign { isCorrect = true; } else { return new ResultBean().fail().setMsg("验证码错误"); - }*/ + } if (StringUtils.isBlank(userName)) { return new ResultBean().fail().setMsg("用户名不能为空"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index d2de45733e..9964c37a9f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -1112,15 +1112,18 @@ public class ScmVehicleGressionService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); //清除临时车辆表状态 baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid()); @@ -1163,8 +1166,10 @@ public class ScmVehicleGressionService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleGression.getCreateBySid())) { + if ("发起申请".equals(nextName)) { //清除临时车辆表状态 baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 9553bd922d..228320bd87 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -314,8 +314,8 @@ public class ScmVehicleReturnService extends MybatisBaseService scmVehicleReturnDetails = scmVehicleReturnDetailsService.selectByReturnSid(flowTaskVo.getBusinessSid()); List baseVehicleDtos = new ArrayList<>(); for (ScmVehicleReturnDetails scmVehicleReturnDetail : scmVehicleReturnDetails) { @@ -771,16 +771,18 @@ public class ScmVehicleReturnService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue index 38bcb700cf..a799e7bfbe 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue @@ -56,7 +56,7 @@ - + @@ -177,6 +177,34 @@ + + + {{ name }} + + + + {{ temp.trailerOrInstall }} + + + + + + *{{ name }}成交价 + + + + + + + + 总成交价 + + + + {{ totalDealPrice() }} + + +
@@ -236,8 +264,15 @@ export default { // } // } return { + pickerOptions: { + disabledDate(time) { + let oneDay = 3600 * 1000 * 24 * 5 + return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay + } + }, dialogVisible: false, disabledBtn: false, + name: '', temp: { vinNo: '', vinSid: '', @@ -267,7 +302,10 @@ export default { typeKey: '', // 出库类型Key createOrgSid: '', remarks: '', - isUpdateOrInsertCrm: '' + isUpdateOrInsertCrm: '', + trailerOrInstall: '', + trailerOrInstallDealPrice: '', + totalDealPrice: '' }, payType_list: [], // 出库类型 org_list: [], // 销售部门 @@ -283,6 +321,7 @@ export default { concatNo: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }], isTerminal: [{ required: true, message: '是否为终端客户不能为空', trigger: 'change' }], customerName: [{ required: true, message: '客户名称不能为空', trigger: 'change' }], + trailerOrInstallDealPrice: [{ required: true, message: '成交价不能为空', trigger: 'change' }] } } }, @@ -364,6 +403,9 @@ export default { this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) + this.name = multipleSelection[0].szOrGC + this.temp.trailerOrInstall = multipleSelection[0].trailerOrInstall + this.temp.trailerOrInstallDealPrice = multipleSelection[0].trailerOrInstallDealPrice this.temp.vinNo = multipleSelection[0].vinNo this.temp.vinSid = multipleSelection[0].sid this.temp.createOrgSid = createOrgSid @@ -373,6 +415,14 @@ export default { this.temp.salesAllowance = '0' this.getType() }, + totalDealPrice() { + if (this.temp.trailerOrInstallDealPrice !== '' && this.temp.price !== '') { + this.temp.totalDealPrice = parseFloat(this.temp.price) + parseFloat(this.temp.trailerOrInstallDealPrice) + } else { + this.temp.totalDealPrice = '' + } + return this.temp.totalDealPrice + }, // 保存 handleCreate() { if (this.temp.giftsDescription !== '' && this.temp.giftsDescription !== '0' && this.temp.remarks === '') { @@ -459,8 +509,12 @@ export default { type: '', // 出库类型 typeKey: '', // 出库类型Key createOrgSid: '', - isUpdateOrInsertCrm: '' + isUpdateOrInsertCrm: '', + trailerOrInstall: '', + trailerOrInstallDealPrice: '', + totalDealPrice: '' } + this.name = '' this.disabledBtn = false this.$refs['dataForm'].resetFields() this.$emit('doback') diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue index cdaf4a06de..0c40798113 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue @@ -68,17 +68,17 @@ 查看 - + - + - + @@ -88,42 +88,42 @@ {{ scope.row.insideCode }} - + - + - + - + - + - + - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue index 545a0f0c65..63d849d671 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue @@ -38,7 +38,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue index 98b25e07f1..3479b5cb53 100644 --- a/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue @@ -16,10 +16,7 @@ - - - - + @@ -190,10 +187,10 @@ - 销售指导价(元) + *销售指导价(元) - + @@ -206,14 +203,13 @@