diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java new file mode 100644 index 0000000000..f0afcfc6d9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basemanufacturerbank; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/19 14:07 + * @Description + */ +@Data +public class BaseManActualVo implements Vo { + private static final long serialVersionUID = -8356553970394175402L; + @ApiModelProperty("厂家销售通路") + private String accountName; + + @ApiModelProperty("开户行") + private String depositBank; + + @ApiModelProperty("收款银行账号") + private String bankAccount; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java index 0796dabaae..9a4d143791 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import javax.validation.Valid; +import java.util.List; /** * Project: anrui-base(安瑞基础信息模块)
@@ -46,4 +47,8 @@ public interface BaseManufacturerBankFeign { @ApiOperation("查看及修改回显（已测试）") @GetMapping("/selectDetails/{sid}") public ResultBean selectDetails(@PathVariable("sid") String sid); + + @ApiOperation("未售买断获取厂家销售通路") + @GetMapping("/actualList/{useOrgSid}") + ResultBean> actualList(@PathVariable("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java index 5be9cdeee9..977f815ad6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java @@ -3,6 +3,8 @@ package com.yxt.anrui.base.api.basemanufacturerbank; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: anrui-base(安瑞基础信息模块)
* File: BaseManufacturerBankFeignFallback.java
@@ -28,4 +30,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe public ResultBean selectDetails(String sid) { return null; } + + @Override + public ResultBean> actualList(String useOrgSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java new file mode 100644 index 0000000000..950d9e204a --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java @@ -0,0 +1,42 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicle; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "专项返利分配选择车辆 查询条件", description = "专项返利分配选择车辆 查询条件") +public class BaseSpecialRebateDisGetVehQuery implements Query { + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehVo.java new file mode 100644 index 0000000000..a532425962 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehVo.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicle; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(value = "专项返利分配选择车辆 视图数据对象", description = "专项返利分配选择车辆 视图数据对象") +public class BaseSpecialRebateDisGetVehVo implements Query { + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date priceDate; + @ApiModelProperty("销售日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date salesDate; + @ApiModelProperty(value = "买断日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date solidDate; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java index 562bbb9fd3..4e30285a37 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java @@ -51,4 +51,12 @@ public class BaseVehicleActualVo implements Vo { private String insideCode; @ApiModelProperty("库龄") private int dayNum; + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; } 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 c3085527ef..1dfb2e9938 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 @@ -278,6 +278,11 @@ public interface BaseVehicleFeign { @PostMapping("/vehicleRebateList") ResultBean> vehicleRebateList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("专项返利分配选择车辆") + @PostMapping("/specialRebateDisGetVeh") + @ResponseBody + public ResultBean> specialRebateDisGetVeh(@RequestBody PagerQuery pq); + @ApiOperation("销售订单选择现车分页列表") @PostMapping("/selectVo") ResultBean> selectVo(@RequestBody PagerQuery pcBaseVehicleOrderQuery); 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 90fb0fff6c..d597604dd4 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 @@ -181,6 +181,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> specialRebateDisGetVeh(PagerQuery pq) { + return null; + } + @Override public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java index fd4392a95f..175e1289d9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java @@ -4,6 +4,7 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -31,4 +32,15 @@ public class BaseVehicleActualDetails extends BaseEntity { private int dayNum; @ApiModelProperty("车辆数量") private int vehicleNum; + + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + @ApiModelProperty("买断金额") + private BigDecimal actualMoney; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java index 61c124aa44..4ccf56aa45 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java @@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -31,4 +32,16 @@ public class BaseVehicleActualDetailsDto implements Dto { @ApiModelProperty("车辆数量") private int vehicleNum; + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + + @ApiModelProperty("买断金额") + private String actualMoney; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java index 6a10beee80..f9153bb7b6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @Author dimengzhe * @Date 2022/4/9 11:35 @@ -29,4 +31,16 @@ public class BaseVehicleActualDetailsVo implements Vo { private int dayNum; @ApiModelProperty("车辆数量") private int vehicleNum; + + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + + @ApiModelProperty("买断金额") + private String actualMoney; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java new file mode 100644 index 0000000000..1e266f3bb4 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:49 + * @Description + */ +@Data +public class BaseVehicleActualPay extends BaseEntity { + private static final long serialVersionUID = -3051690321206077883L; + + @ApiModelProperty(value = "车辆未售买断申请sid") + private String vehicleActualSid; + @ApiModelProperty(value = "付款方式") + private String paymentType; + @ApiModelProperty(value = "付款方式key") + private String paymentTypeKey; + @ApiModelProperty(value = "厂家销售通路") + private String actualPay; + @ApiModelProperty(value = "开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private BigDecimal payAccount; + @ApiModelProperty("付款备注") + private String payRemark; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java new file mode 100644 index 0000000000..737ddfafaf --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:52 + * @Description + */ +@Data +public class BaseVehicleActualPayDto implements Dto { + private static final long serialVersionUID = -7136887711471736748L; + + @ApiModelProperty(value = "付款方式") + @NotBlank(message = "付款方式不能为空") + private String paymentType; + @ApiModelProperty(value = "付款方式key") + @NotBlank(message = "付款方式不能为空") + private String paymentTypeKey; + @ApiModelProperty(value = "厂家销售通路") + @NotBlank(message = "厂家销售通路不能为空") + private String actualPay; + @ApiModelProperty(value = "开户行") + @NotBlank(message = "开户行不能为空") + private String bank; + + @ApiModelProperty("收款银行账号") + @NotBlank(message = "收款银行账号不能为空") + private String receivingAccount; + @ApiModelProperty("付款金额") + @NotBlank(message = "付款金额不能为空") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java new file mode 100644 index 0000000000..c3c9b8e93f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeignFallback; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:57 + * @Description + */ +@FeignClient( + contextId = "anrui-base-BaseVehicleActualPay", + name = "anrui-base", + path = "v1/basevehicleactualpay", + fallback = BaseVehicleActualPayFeignFallback.class) +public interface BaseVehicleActualPayFeign { +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java new file mode 100644 index 0000000000..ff27270af5 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:58 + * @Description + */ +@Component +public class BaseVehicleActualPayFeignFallback { +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java new file mode 100644 index 0000000000..c1d0f61218 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/19 13:36 + * @Description + */ +@Data +public class BaseVehicleActualPayVo implements Vo { + private static final long serialVersionUID = 7103772117018168626L; + + @ApiModelProperty(value = "付款方式") + private String paymentType; + @ApiModelProperty(value = "付款方式key") + private String paymentTypeKey; + @ApiModelProperty(value = "厂家销售通路") + private String actualPay; + @ApiModelProperty(value = "开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; + + private String sid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java index d049588d47..e599055168 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java @@ -29,5 +29,13 @@ public class BaseVehicleActualSales extends BaseEntity { @ApiModelProperty("未售买断费用") private String money; + @ApiModelProperty("是否需要付款：1是，0否") + private String isPay; + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("分公司sid") + private String useOrgSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java index 550557e5ed..5f35931cfe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basevehicleactualsales; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +27,7 @@ public class BaseVehicleActualSalesDetailsVo implements Vo { private String reason; @ApiModelProperty(value = "车辆列表") private List detailsList = new ArrayList<>(); + private List detailsPayList = new ArrayList<>(); @ApiModelProperty(value = "创建人sid") private String userSid; @ApiModelProperty(value = "任务id") @@ -35,4 +37,12 @@ public class BaseVehicleActualSalesDetailsVo implements Vo { @ApiModelProperty("未售买断费用") private String money; + + @ApiModelProperty("是否需要付款：1是，0否") + private String isPay; + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("分公司sid") + private String useOrgSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java index 281975bc0c..a49160a8ee 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java @@ -2,10 +2,12 @@ package com.yxt.anrui.base.api.basevehicleactualsales; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; @@ -32,10 +34,21 @@ public class BaseVehicleActualSalesDto implements Dto { @ApiModelProperty(value = "买断原因") private String reason; @ApiModelProperty(value = "车辆列表") + private List detailsList; + @Valid + private List detailsPayList; @ApiModelProperty("未售买断费用") private String money; + @ApiModelProperty("付款金额总计") + private String payAccountAll; + @ApiModelProperty("是否需要付款：1是，0否") + private String isPay; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("分公司sid") + private String useOrgSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index 0db03dca7a..04ad5db1a9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -10,10 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; @@ -92,4 +89,8 @@ public interface BusVehicleApplyFeign { @ApiOperation(value = "移动端获取排产-上装信息") @GetMapping(value = "/getVehicleApplyTopInfo/{sid}") ResultBean getVehicleApplyTopInfo(@PathVariable("sid") String sid); + + @ApiOperation(value = "采购申请作废") + @PutMapping(value = "/abandonApply/{sid}") + ResultBean abandonApply(@PathVariable("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/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index 4956c44a21..6437a1f634 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -101,4 +101,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { public ResultBean getVehicleApplyTopInfo(String sid) { return null; } + + @Override + public ResultBean abandonApply(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/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index bda7555973..6a5e21fb30 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -36,6 +36,7 @@ public enum CommonAttachTypeEnum { * 26、0009_11：放款文件_首付款证明 */ CONTRACT("0001", "合同"), + CONTRACT_UPLOAD("0001_1", "合同下载"), CREDIT("0002", "人行征信"), INVOICE("0003", "开票申请附件"), INVOICE_KHKPSQS("0003_1", "客户开票申请书"), diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java index 95fb04551b..3637ee8123 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -31,13 +32,13 @@ public class AppCommonContractInitVo implements Vo { private String contractPrice; @ApiModelProperty("新车买卖合同") - private List contractImages; + private List contractImages = new ArrayList<>(); @ApiModelProperty("现场签署图片") - private List siteSigImages; + private List siteSigImages = new ArrayList<>(); @ApiModelProperty("身份证图片") - private List idCardImages; + private List idCardImages = new ArrayList<>(); @ApiModelProperty("客户类型") private String customerKey; @@ -66,5 +67,10 @@ public class AppCommonContractInitVo implements Vo { @ApiModelProperty("身份证图片") private String idImagesUrl; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("车型sid") + private String modelSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java index 9a06bc521e..d93fd26f53 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java @@ -1,10 +1,14 @@ package com.yxt.anrui.base.api.commoncontract; +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; +import java.util.ArrayList; +import java.util.List; + @Data public class AppCommonContractPageVo implements Vo { @@ -36,5 +40,15 @@ public class AppCommonContractPageVo implements Vo { @ApiModelProperty("节点状态") private String nodeState; + private List files = new ArrayList<>(); + @ApiModelProperty("是否显示下载") + private Boolean isShowDownload; + @JsonIgnore + private String commonContractUrl; + @JsonProperty("number") + private String num; + + + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java index 931ea6d665..daf3f82383 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java @@ -29,7 +29,7 @@ public class AppCommonContractQuery implements Query { @ApiModelProperty("状态") private String type; - @ApiModelProperty("") + @ApiModelProperty("客户") private String names; @ApiModelProperty("分公司sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index a4c330bcf2..0b21b84e62 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -29,8 +29,6 @@ import java.util.Date; public class CommonContract extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("合同编号(合同类型+部门编码+yyyyMMdd+001)") private String contractNo; @@ -39,6 +37,11 @@ public class CommonContract extends BaseEntity { @ApiModelProperty("合同类型") private String contractType; + + @ApiModelProperty("客户类型") + private String customerType; + @ApiModelProperty("客户类型key") + private String customerTypeKey; @ApiModelProperty("客户sid") private String customerSid; @@ -109,8 +112,8 @@ public class CommonContract extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; - @ApiModelProperty("生成的合同的url") - private String commonContractUrl; private String configSid; + + private String commonContractUrl; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java index 4e4b066971..568631fbf8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java @@ -87,7 +87,4 @@ public class CommonContractBuscenterVo implements Vo { @ApiModelProperty("附件文件") private List pcCommonAppendixDtoList; - - private String commonContractUrl; - } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java index 1442606aac..b4bf56be79 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java @@ -14,8 +14,8 @@ public class CommonContractEnum { /** * 新车买卖合同 */ - DC_CONTRACT("010", "新车买卖合同（订车）"), - XC_CONTRACT("009", "新车买卖合同（现车）"); + DC_CONTRACT("010", "新车买卖合同(订车)"), + XC_CONTRACT("009", "新车买卖合同(现车)"); /** * code值 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java index 68510cefbc..6024f10f92 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java @@ -26,4 +26,56 @@ public class DictCommonEnum { this.remarks = remarks; } } + + /** + * 客户类型 + */ + @Getter + public static enum customerType { + GR_TYPE("1", "个人"), + QY_TYPE("2", "企业"), + ; + private final String code; + private final String remarks; + + customerType(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + + @Getter + public static enum dueBank { + HK_TYPE("1", "回款账户"), + DJ_TYPE("2", "订金账户"), + XL_TYPE("3", "销量保证金"), + QY_TYPE("4", "牵引车回款账户"), + ; + private final String code; + private final String remarks; + + dueBank(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + + /** + * 款项名称 + */ + @Getter + public static enum costType { + CG_TYPE("001", "排产"), + WC_TYPE("002", "外采"), + MD_TYPE("003", "买断"), + ; + private final String code; + private final String remarks; + + costType(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index ea47b0f572..c549673163 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -162,5 +162,6 @@ bankAccount FROM base_manufacturer_bank WHERE manufacturerSid = #{manufacturerSid} + AND isDelete = 0 \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index 20cebf2d07..b24e63ebb0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; @@ -59,4 +60,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper selectByApplySid(String modelSid); + + List actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 33195f7af3..700ce73d42 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -55,7 +55,7 @@ bmb.remarks FROM base_manufacturer_bank bmb WHERE bmb.manufacturerSid = #{sid} - AND bmb.isDelete = 0 + AND bmb.isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java index 55122bcf66..fe55f0bd9f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java @@ -1,11 +1,9 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; +import com.yxt.anrui.base.api.basemanufacturerbank.*; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; +import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -78,5 +76,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { return rb.success().setData(vo); } + @Override + public ResultBean> actualList(String useOrgSid) { + ResultBean> rb = ResultBean.fireFail(); + List voList = baseManufacturerBankService.actualList(useOrgSid, DictCommonEnum.dueBank.HK_TYPE.getCode()); + return rb.success().setData(voList); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index 52335425ee..8392392bc5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; @@ -68,4 +69,8 @@ public class BaseManufacturerBankService extends MybatisBaseService selectByApplySid(String modelSid) { return baseMapper.selectByApplySid(modelSid); } + + public List actualList(String useOrgSid, String code) { + return baseMapper.actualList(useOrgSid,code); + } } \ No newline at end of file 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 fa8d5851ba..bc81f42404 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 @@ -451,4 +451,6 @@ public interface BaseVehicleMapper extends BaseMapper { @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}") void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid); + + IPage specialRebateDisGetVehPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ 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 132cc39baf..7ad2a2d763 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 @@ -793,8 +793,11 @@ bv.insideCode, (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum, - (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum - + (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue, + bvm.emissionStandardValue FROM base_vehicle bv LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` @@ -1088,4 +1091,26 @@ ${ew.sqlSegment} + + \ 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 0a65364b7f..35d067ad61 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 @@ -555,6 +555,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean> specialRebateDisGetVeh(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.specialRebateDisGetVeh(pq); + return rb.success().setData(pv); + } + @Override public ResultBean> selectVo(PagerQuery pcBaseVehicleOrderQuery) { ResultBean> rb = ResultBean.fireFail(); 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 be2da289ec..996dd73c4d 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 @@ -1434,6 +1434,7 @@ public class BaseVehicleService extends MybatisBaseService specialRebateDisGetVeh(PagerQuery pq) { + IPage page = specialRebateDisGetVehPageList(pq); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage specialRebateDisGetVehPageList(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + QueryWrapper qw = new QueryWrapper<>(); + BaseSpecialRebateDisGetVehQuery params = pq.getParams(); + qw.eq("bvb.sid", params.getBrandSid()); + qw.eq("bv.isDelete", 0); + qw.eq("bv.createOrgSid", params.getCreateOrgSid()); + qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode()); + return baseMapper.specialRebateDisGetVehPageList(page, qw); + } + private QueryWrapper vehicleRebateWrapper(BaseVehicleRebateQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { @@ -2423,6 +2442,7 @@ public class BaseVehicleService extends MybatisBaseService diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java index ee123d0010..576e8de5c2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java @@ -5,11 +5,13 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; @@ -34,6 +36,9 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService { + List selectBySaleSid(String sid); + + int deleteBySaleSid(String sid); + + List detailsList(String sid); + + int deleteByActualSid(String s); +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml new file mode 100644 index 0000000000..0f03fa4ba1 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml @@ -0,0 +1,34 @@ + + + + + + + delete + from base_vehicle_actual_pay + where vehicleActualSid = #{sid} + + + + + + delete + from base_vehicle_actual_pay + where vehicleActualSid = #{s} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java new file mode 100644 index 0000000000..1a5f82af3d --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.base.biz.basevehicleactualpay; + +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:54 + * @Description + */ +@Api(tags = "车辆未售买断管理") +@RequestMapping("v1/basevehicleactualsales") +@Controller +public class BaseVehicleActualPayRest { +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java new file mode 100644 index 0000000000..1f42f8049a --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java @@ -0,0 +1,61 @@ +package com.yxt.anrui.base.biz.basevehicleactualpay; + +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:55 + * @Description + */ +@Service +public class BaseVehicleActualPayService extends MybatisBaseService { + + @Transactional(rollbackFor = Exception.class) + public void saveDetails(List detailsPayList, String sid) { + BaseVehicleActualPay baseVehicleActualPay = null; + for (BaseVehicleActualPayDto dto : detailsPayList) { + baseVehicleActualPay = new BaseVehicleActualPay(); + BeanUtils.copyProperties(dto, baseVehicleActualPay, "sid"); + baseVehicleActualPay.setVehicleActualSid(sid); + if(StringUtils.isNotBlank(dto.getPayAccount())){ + baseVehicleActualPay.setPayAccount(new BigDecimal(dto.getPayAccount())); + } + save(baseVehicleActualPay); + } + } + + public List selectBySaleSid(String sid) { + return baseMapper.selectBySaleSid(sid); + } + + public void deleteBySaleSid(String sid) { + baseMapper.deleteBySaleSid(sid); + } + + @Transactional(rollbackFor = Exception.class) + public void updateListByReturnSid(String sid, List detailsPayList) { + saveDetails(detailsPayList, sid); + } + + public List detailsList(String sid) { + return baseMapper.detailsList(sid); + } + + public void deleteByActualSid(String[] sidsList) { + List stringList = Arrays.asList(sidsList); + for (int i = 0; i < stringList.size(); i++) { + baseMapper.deleteByActualSid(stringList.get(i)); + } + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml index 1d78417cc8..59170df266 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml @@ -23,7 +23,10 @@ taskId, procInstId, createBySid userSid, - money + money, + isPay, + useOrgSid, + useOrgName from base_vehicle_actual_sales where sid = #{sid} 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 0794b26ebd..8ee49d318a 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 @@ -11,6 +11,8 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetai import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualsales.*; import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery; import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeVo; @@ -18,7 +20,12 @@ import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQue import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService; +import com.yxt.anrui.base.biz.basevehicleactualpay.BaseVehicleActualPayService; +import com.yxt.anrui.base.common.enums.DictCommonEnum; +import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -47,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -60,6 +68,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { baseVehicleActualDetailsService.saveDetails(scmVehicleActualSalesDto.getDetailsList(), baseVehicleActualSales.getSid()); } + if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { + if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) { + baseVehicleActualPayService.saveDetails(scmVehicleActualSalesDto.getDetailsPayList(), sid); + + } + } + } } else { //编辑 @@ -165,6 +184,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { baseVehicleActualDetailsService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsList()); } + + //查询pay中是否有关于sales的该条sid数据 + List scmVehicleActualPayList = baseVehicleActualPayService.selectBySaleSid(sid); + if (scmVehicleActualPayList.size() > 0) { + baseVehicleActualPayService.deleteBySaleSid(sid); + } + if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { + if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) { + baseVehicleActualPayService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsPayList()); + } + } + } return rb.success().setData(sid); } @@ -200,7 +231,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService voList = baseVehicleActualDetailsService.detailsList(sid); + List voPayList = baseVehicleActualPayService.detailsList(sid); vo.setDetailsList(voList); + vo.setDetailsPayList(voPayList); return rb.success().setData(vo); } @@ -245,12 +278,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); } + baseVehicleActualDetailsService.deleteByActualSid(sidsList); + baseVehicleActualPayService.deleteByActualSid(sidsList); delBySids(sidsList); return rb.success().setMsg("删除成功"); } @@ -285,6 +319,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = saveOrUpdateVehicleSales(dto); if (!resultBean.getSuccess()) { @@ -318,7 +357,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService detailsList = dto.getDetailsList(); for (BaseVehicleActualDetailsDto f : detailsList) { - BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(),useOrgSid); + BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(), useOrgSid); baseVehicle.setVinNo(f.getVinNo()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode()); baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks()); @@ -328,12 +367,12 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; @@ -388,10 +427,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",bv.getBusinessSid()); - variables.put("app",appMap); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", bv.getBusinessSid()); + variables.put("app", appMap); bv.setFormVariables(variables); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -399,21 +438,42 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } else { + if ("1".equals(baseVehicleActualSales.getIsPay())) { + List voPayList = baseVehicleActualPayService.detailsList(baseVehicleActualSales.getSid()); + for (BaseVehicleActualPayVo v : voPayList) { + FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setApplySid(v.getSid()); + finPaymentrecordDto.setPayCompanySid(baseVehicleActualSales.getUseOrgSid()); + finPaymentrecordDto.setPayType(1); + finPaymentrecordDto.setCreateOrgSid(baseVehicleActualSales.getUseOrgSid()); + finPaymentrecordDto.setUseOrgSid(baseVehicleActualSales.getUseOrgSid()); + finPaymentrecordDto.setCost(Integer.valueOf(v.getPayAccount())); + finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode()); + finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks()); + finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.MD_TYPE.getCode()); + finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.MD_TYPE.getRemarks()); + finPaymentrecordDto.setReceiveBankAccount(v.getReceivingAccount()); + finPaymentrecordDto.setReceiveCompany(v.getActualPay()); + finPaymentrecordFeign.save(finPaymentrecordDto); + } + + } } return rb.success().setData(resultBean.getData()); @@ -491,10 +551,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",query.getBusinessSid()); - variables.put("app",appMap); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", query.getBusinessSid()); + variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -508,7 +568,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); + 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(baseVehicleActualSales.getCreateBySid())){ - messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); - }else{ - messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } messageFlowableQuery.setMsgTitle("供应链"); @@ -557,7 +617,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService { BusVehicleApply selectByCode(String code); AppVehicleApplyVo getVehicleApply(String sid); + + ResultBean abandonApply(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index 1c8810a68f..7d60a36328 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -78,4 +78,10 @@ from bus_vehicle_apply ba where sid = #{sid} + + + update bus_vehicle_apply + set nodeState = '作废' + 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/busvehicleapply/BusVehicleApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java index 454eecad4c..8c1d9740a5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java @@ -113,5 +113,10 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { return busVehicleApplyService.getVehicleApplyTopInfo(sid); } + @Override + public ResultBean abandonApply(String sid) { + return busVehicleApplyService.abandonApply(sid); + } + } 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 853fd93e1b..7367f2f525 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 @@ -519,8 +519,8 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid(); @@ -825,4 +825,8 @@ public class BusVehicleApplyService extends MybatisBaseService { @Select("SELECT * FROM common_appendix WHERE filePath =#{s}") CommonAppendixVo fetchByFilePath(String s); + + List selectByType(@Param("sid") String sid, @Param("attachType") String attachType,@Param("path") String path); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml index b2d323aded..b0f8368248 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml @@ -4,25 +4,33 @@ - DELETE FROM common_appendix - WHERE linkSid=#{linkSid} - - AND attachType=#{attachType} + DELETE + FROM common_appendix + WHERE linkSid = #{linkSid} + + AND attachType = #{attachType} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java index 9155a8d9cc..ff38b69e4b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.commonappendix.*; +import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo; import com.yxt.anrui.crm.api.crmvisit.CrmVisitFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; @@ -478,4 +479,8 @@ public class CommonAppendixService extends MybatisBaseService selectByType(String sid, String attachType,String path) { + return baseMapper.selectByType(sid,attachType,path); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index 4f19b9e6aa..ec8e3e9444 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -68,7 +68,7 @@ public interface CommonContractMapper extends BaseMapper { CommonContractBuscenterVo selectByBusSid(String busSid); - IPage getContractList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getContractList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw,@Param("names")String names); /** * 移动端-初始化合同审核 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 2b603f43fd..bb429d6cd4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -3,7 +3,7 @@ INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid, - createDate, address, deposit, contractAmount, remarks) + createDate, address, deposit, contractAmount, remarks) VALUES (UUID(), @@ -39,19 +39,19 @@ @@ -120,7 +135,7 @@ UPDATE common_contract SET nodeState=#{nodeState} - , nodeId=#{taskDefKey} + , nodeId=#{taskDefKey} , procDefId=#{procDefId} 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 a4fb65ad53..6cacfbe296 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.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.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto; import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery; @@ -986,33 +987,32 @@ public class CommonContractService extends MybatisBaseService qw = appCreateQueryWrapper(query); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.getContractList(page, qw); + IPage iPage = baseMapper.getContractList(page, qw, query.getNames()); + List records = iPage.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (AppCommonContractPageVo vo : records) { + String sid = vo.getContractSid(); + //根据sid查询合同 + List list = commonAppendixService.selectByType(sid, CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType(), docPdfComponent.getPrefixTemplateUrl()); + vo.setFiles(list); + if (StringUtils.isNotBlank(vo.getCommonContractUrl())) { + vo.setIsShowDownload(true); + } else { + vo.setIsShowDownload(false); + } + } + } PagerVo p = PagerUtil.pageToVo(iPage, null); return p; } private QueryWrapper appCreateQueryWrapper(AppCommonContractQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - - -// if (StringUtils.isNotBlank(query.getType())) { //合同类型 -// qw.eq("contractTypeKey", query.getType()); -// } - if (StringUtils.isNotBlank(query.getNames())) { // 甲方名称 - qw.like("partyA", query.getNames()); - } - if (StringUtils.isNotBlank(query.getNames())) { // 乙方名称 - qw.like("partyB", query.getNames()); - } - if (StringUtils.isNotBlank(query.getNames())) { // 其他方名称 - qw.like("partyC", query.getNames()); - } if (StringUtils.isNotBlank(query.getUserSid())) { // 业务员sid qw.eq("staffSid", query.getUserSid()); } - if (StringUtils.isNotBlank(query.getType())) { // 业务员sid + if (StringUtils.isNotBlank(query.getType())) { qw.eq("state", query.getType()); } return qw; @@ -1049,24 +1049,28 @@ public class CommonContractService extends MybatisBaseService idCard = new ArrayList<>(); - List idCardImages = Arrays.asList(split3); - for (String idCardImage : idCardImages) { - String idCardImagesUrl = urlPrefix + idCardImage; - idCard.add(idCardImagesUrl); - } - vo.setIdCardImages(idCard); + if ("1".equals(vo.getCustomerKey())) { + //查询客户的档案库中是否有图片 + ResultBean> resultBean = crmCustomerTempFeign.selectCustomerFile(vo.getCustomerSid()); + List stringList = resultBean.getData(); + if (stringList.size() > 0) { + vo.setIdCardArchives(true); + vo.setIdCardImages(stringList); } else { - vo.setIdCardImages(new ArrayList<>()); + vo.setIdCardArchives(false); + if (StringUtils.isNotBlank(vo.getIdImagesUrl())) { + String[] split3 = vo.getSceneSignUrl().split(","); + List idCard = new ArrayList<>(); + List idCardImages = Arrays.asList(split3); + for (String idCardImage : idCardImages) { + String idCardImagesUrl = urlPrefix + idCardImage; + idCard.add(idCardImagesUrl); + } + vo.setIdCardImages(idCard); + } else { + vo.setIdCardImages(new ArrayList<>()); + } } - } else if (vo.getCustomerKey().equals("2")) { - vo.setIdCardArchives(true); -// 往里添加客户档案里的身份证信息 } } return vo; @@ -1106,7 +1110,7 @@ public class CommonContractService extends MybatisBaseService -1) { siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1116,7 +1120,7 @@ public class CommonContractService extends MybatisBaseService -1) { idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1125,7 +1129,7 @@ public class CommonContractService extends MybatisBaseService 0) { + //添加合同下载路径 + for (PrintConfirmVo vo : list) { + String str = vo.getDownloadUrl(); + String urlPrefix = docPdfComponent.getPrefixTemplateUrl(); + String uploadPath = docPdfComponent.getUploadTemplateUrl(); + CommonAppendix commonAppendix = new CommonAppendix(); + commonAppendix.setLinkSid(commonContract.getSid()); + commonAppendix.setAttachType(CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType()); + String pathLoc = str.replace(urlPrefix, uploadPath); + pathLoc = pathLoc.replace("/", File.separator); + File file = new File(pathLoc); + String size = ""; + if (file != null) { + size = FileUploadComponent.getPrintSize(file.length()); + } + String suffix = str.substring(str.lastIndexOf(".") + 1); // 文件类型 + String fileName = str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf(".")); // 文件名 + commonAppendix.setFileName(vo.getName()); + commonAppendix.setFileType(suffix); + commonAppendix.setFileSize(size); + commonAppendix.setFilePath(str.replace(urlPrefix, "")); + commonAppendix.setRemarks("合同下载"); + commonAppendixService.insert(commonAppendix); + } + } return commonContract.getSid(); }); } 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 c314599f76..bdaa951b09 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 @@ -30,6 +30,8 @@ public class AppOrderDetailsVo implements Vo { private String phone; @ApiModelProperty(value = "客户类型") private String customerKey; + @ApiModelProperty("客户类型") + private String customerType; @ApiModelProperty(value = "订单类型") private String orderType; @ApiModelProperty(value = "挂靠公司") 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 9dd7f64452..b067cc9c00 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 @@ -93,11 +93,11 @@ resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillInfoVo"> SELECT customerSid, customerName, - mobile AS customerMobile, - payTypeKey AS payType, - payType AS payValue, - billingTypeKey AS invoiceType, - billingType AS invoiceValue, + mobile AS customerMobile, + payTypeKey AS payType, + payType AS payValue, + billingTypeKey AS invoiceType, + billingType AS invoiceValue, affiliatedCompany, affiliatedCompanySid as affiliatedOrgSid, financePlan, @@ -175,6 +175,7 @@ bo.customerName as name, bo.mobile as phone, bo.customerClassKey as customerKey, + bo.customerClass as customerType, bo.affiliatedCompany as affiliated, bo.billingType as invoiceType, bo.orgName as departmentName, @@ -209,7 +210,7 @@ diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index cb6c0367f6..d07dc6c1e2 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -147,5 +147,8 @@ public interface CrmCustomerTempFeign { @PutMapping("/saveCustomerArchives") public ResultBean saveCustomerArchives(@Valid @RequestBody AppCrmCustomerTempArchivesDto dto); + @ResponseBody + @GetMapping("/selectCustomerFile/{customerSid}") + public ResultBean> selectCustomerFile(@PathVariable("customerSid")String customerSid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 7ba662045f..551ea612e5 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -115,5 +115,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean> selectCustomerFile(String customerSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml index 2156cae525..af873601ce 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml @@ -26,7 +26,6 @@ ccf.dataType AS `key`, ccf.fileName AS title, createTime --- (SELECT MAX(cf.createTime) FROM crm_file cf WHERE cf.linkSid = ccf.sid) AS createTime FROM crm_customer_file ccf WHERE ccf.linkSid = #{customerSid} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java index 31a6700cf7..6436b83287 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java @@ -32,8 +32,6 @@ import com.yxt.anrui.base.api.basedatalist.BaseDataListFeign; import com.yxt.anrui.base.api.basedatalist.BaseDataListVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.crm.api.crmcustomerfile.*; -import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto; -import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataDto; import com.yxt.anrui.crm.api.crmfile.CrmFile; import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; import com.yxt.anrui.crm.api.crmfile.CrmFileDto; @@ -41,19 +39,16 @@ import com.yxt.anrui.crm.biz.crmfile.CrmFileService; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.utils.DateUtils; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.DateUtils; 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 org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -311,4 +306,22 @@ public class CrmCustomerFileService extends MybatisBaseService> selectCustomerFile(String customerSid) { + ResultBean> rb = ResultBean.fireFail(); + List dataVos = baseMapper.selectByCustomerSid(customerSid); + List list = new ArrayList<>(); + if (dataVos.size() > 0) { + for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) { + String sid = appCustomerArchivesDataVo.getSid(); + List listVo = baseMapper.selArchivesFileImageBySid(sid); + for (CrmFile crmFile : listVo) { + String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); + list.add(url); + } + appCustomerArchivesDataVo.setFiles(list); + } + } + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 6fc4a03b54..040143a4fa 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -263,5 +263,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerFileService.saveCustomerArchives(dto); } + @Override + public ResultBean> selectCustomerFile(String customerSid) { + return crmCustomerFileService.selectCustomerFile(customerSid); + } + } 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 4b229e8cc5..86c681ce8c 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 @@ -68,4 +68,9 @@ public interface FinPaymentrecordFeign { @PostMapping("/update") @ResponseBody ResultBean update(@RequestBody FinPaymentrecordUpdateDto dto); + + @ApiOperation("作废") + @PutMapping("/updateState/{sid}") + @ResponseBody + ResultBean updateState(@PathVariable("sid")String sid); } \ 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 5679a34aa3..1582131aaa 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 @@ -64,4 +64,9 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign { public ResultBean update(FinPaymentrecordUpdateDto dto) { return null; } + + @Override + public ResultBean updateState(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java index 0b54a56116..a6ff9cb5a6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java @@ -26,14 +26,14 @@ package com.yxt.anrui.fin.biz.finpaymentrecord; 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord; -import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo; import java.util.List; @@ -66,4 +66,6 @@ public interface FinPaymentrecordMapper extends BaseMapper { List selectApplySids(@Param("list") List sids); int updateStateBySid(@Param("sid") String sid, @Param("state") int i); + + List selectApplySidBySid(List sids); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index 63bc2bf93e..d2abe5608e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -48,4 +48,12 @@ set state = #{state} where sid = #{sid} + + \ 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 8b13ceddc5..bc430d871a 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 @@ -71,4 +71,9 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign { public ResultBean update(FinPaymentrecordUpdateDto dto) { return finPaymentrecordService.updateAll(dto); } + + @Override + public ResultBean updateState(String sid) { + return finPaymentrecordService.updateState(sid); + } } 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 e6c94a9933..9e12d9ddb7 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 @@ -136,6 +136,13 @@ 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)); @@ -155,15 +162,14 @@ public class FinPaymentrecordService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebate; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(value = "专项返利分配选择车辆 查询条件", description = "专项返利分配选择车辆 查询条件") +public class ScmSpecialRebateDisGetVehQuery implements Query { + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDisGetVehVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDisGetVehVo.java new file mode 100644 index 0000000000..0f176f2f76 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDisGetVehVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebate; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "专项返利分配选择车辆 视图数据对象", description = "专项返利分配选择车辆 视图数据对象") +public class ScmSpecialRebateDisGetVehVo implements Query { + + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date priceDate; + @ApiModelProperty("销售日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date salesDate; + @ApiModelProperty(value = "买断日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date solidDate; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java index 4e7c20e143..d5fe42c03f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java @@ -93,6 +93,4 @@ public interface ScmSpecialRebateFeign { @PostMapping("/checkApplyGetAlreadyUploadSpecialRebate") @ResponseBody public ResultBean> checkApplyGetAlreadyUploadSpecialRebate(@RequestBody PagerQuery pq); - - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java index 9639ce734c..1895aa863b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java @@ -56,7 +56,8 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo { private String sid; // sid - + @ApiModelProperty("备注") + private String remarks; // 备注 @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -65,6 +66,8 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo { private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("使用组织名称") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java index f2ee18692b..7089cb6585 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java @@ -26,10 +26,10 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java index d28a21bfed..3f7d7fa749 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java @@ -28,8 +28,6 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -106,12 +104,12 @@ public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebate } @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + public ResultBean> getNextNodesForSubmit(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) { return null; } @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + public ResultBean> getPreviousNodesForReject(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java new file mode 100644 index 0000000000..3804f55d70 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthQuery.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehinventorymonth; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventorymonthQuery.java
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthQuery
+ * Description: 月度盘库 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "月度盘库 查询条件", description = "月度盘库 查询条件") +public class AppScmVehInventorymonthQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("报告编号/创建人") + private String names; + @ApiModelProperty("创建日期") + private String date; + @ApiModelProperty("盘库报告sid") + private String reportSid; + @ApiModelProperty("盘库结果") + private String state; + @ApiModelProperty("使用组织名称") + private String useOrgSid; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java new file mode 100644 index 0000000000..0cacb26fc4 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehinventorymonth; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventorymonthVo.java
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthVo
+ * Description: 月度盘库 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "月度盘库 视图数据对象", description = "月度盘库 视图数据对象") +public class AppScmVehInventorymonthVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("编号（yyyyMMdd）") + private String billNo; // 编号（yyyyMMdd） + @ApiModelProperty("创建组织") + private String createOrgSid; // 创建组织 + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织") + private String useOrgSid; // 使用组织 + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("剩余盘库记录数量") + private String surplusNumber; + @ApiModelProperty("盘库记录总数数量") + private String totalNumber; + @ApiModelProperty("盘亏数量") + private String lossNumber; + @ApiModelProperty("盘损数量") + private String damageNumber; + @ApiModelProperty("盘盈数量") + private String profitNumber; + @ApiModelProperty("实盘数量") + private String actualNumber; + @ApiModelProperty("是否显示生成报告按钮 剩余盘库记录=0时显示") + private Boolean showBtn; + + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java index 1682b1e848..8769eec4f1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehinventorymonth; +import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery; +import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -50,8 +52,8 @@ import java.util.List; */ @Api(tags = "月度盘库") @FeignClient( - contextId = "aaa-ScmVehInventorymonth", - name = "aaa", + contextId = "anrui-scm-ScmVehInventorymonth", + name = "anrui-scm", path = "v1/scmvehinventorymonth", fallback = ScmVehInventorymonthFeignFallback.class) public interface ScmVehInventorymonthFeign { @@ -81,5 +83,11 @@ public interface ScmVehInventorymonthFeign { @ResponseBody public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid); + @ApiOperation("手机端-获取盘库报告列表") + @PostMapping("/getCarInventoryReportList") + @ResponseBody + public ResultBean> getCarInventoryReportList(@RequestBody PagerQuery pagerQuery); + + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java index 86b6cfa149..6d1261968f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java @@ -74,4 +74,9 @@ public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFe public ResultBean getInventoryRecords(String userSid) { return null; } + + @Override + public ResultBean> getCarInventoryReportList(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java index 9a6a1b855c..bee8624419 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "盘库报告") @FeignClient( - contextId = "aaa-ScmVehInventoryreport", - name = "aaa", + contextId = "anrui-scm-ScmVehInventoryreport", + name = "anrui-scm", path = "v1/scmvehinventoryreport", fallback = ScmVehInventoryreportFeignFallback.class) public interface ScmVehInventoryreportFeign { @@ -65,12 +65,12 @@ public interface ScmVehInventoryreportFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmVehInventoryreportDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java index 84449427bf..25850b32b5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java @@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound; import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -43,4 +44,7 @@ public interface ScmApplyInboundMapper extends BaseMapper { int updateFlowFiled(Map map); int selectNum(@Param("bill")String bill); + + @Update("update scm_apply_inbound set num = #{num} where sid = #{busSid}") + void updateNumBySid(@Param("num") String num,@Param("busSid") String busSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 84886abed2..2484e5c386 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -356,6 +356,7 @@ public class ScmApplyInboundService extends MybatisBaseService vehicleList = dto.getVehicleList(); if (StringUtils.isBlank(busSid)) { Map variables = BeanUtil.beanToMap(dto); @@ -377,6 +378,8 @@ public class ScmApplyInboundService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); - ScmApplyInbound scmApplyInbound = fetchBySid(businessSid); List scmApplyInboundVehicleDtos1 = new ArrayList<>(); List scmApplyInboundVehicleDtos2 = new ArrayList<>(); ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto(); @@ -404,7 +406,7 @@ public class ScmApplyInboundService extends MybatisBaseService @@ -64,4 +65,6 @@ public interface ScmSpecialrebateCheckapplyMapper extends BaseMapper selectListVo(); int selectBySid(String join); + + int updateFlowFiled(Map beanToMap); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml index 098d51d91c..2d69251afd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml @@ -32,4 +32,19 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + + UPDATE scm_specialrebate_checkapply + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index e29bc98550..2d2b19c8d5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -25,11 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -39,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapply; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyQuery; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo; @@ -99,41 +101,44 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl @Override public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) { - return null; + return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto); } @Override public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { - return null; + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + return scmSpecialrebateCheckapplyService.complete(bv); } @Override public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return null; + return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo); } @Override public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return null; + return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo); } @Override public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return null; + return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo); } @Override public ResultBean flowRecord(String procInsId) { - return null; + return scmSpecialrebateCheckapplyService.flowRecord(procInsId); } @Override public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return null; + return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query); } @Override public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return null; + return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 7bfe9a7c6f..12df2a16a3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -27,8 +27,22 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; @@ -44,14 +58,12 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapp import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui-scm(专项返利)
@@ -71,6 +83,14 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -173,6 +193,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, scmSpecialrebateCheckapply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + ResultBean resultBean = saveOrUpdateDto(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值 + Map variables = BeanUtil.beanToMap(dto); + //若有网关，则赋值网关中判断的字段。 + variables.put("businessSid", businessSid); + //=====================添加app所需参数 + Map appMap = new HashMap<>(); + appMap.put("sid",businessSid); + variables.put("app",appMap); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getCreateBySid()); + bv.setFormVariables(variables); + //流程定义id + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(scmSpecialrebateCheckapply.getTaskId()); + bv.setTaskDefKey(scmSpecialrebateCheckapply.getNodeSid()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitBusinessData(SubmitScmSpecialRebateCheckApplyDto dto, ScmSpecialrebateCheckapply scmSpecialRebateCheckApply) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (scmSpecialRebateCheckApply != null) { + String businessTaskId = scmSpecialRebateCheckApply.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + + } + return r; + } + + private int updateFlowFiled(Map beanToMap) { + return baseMapper.updateFlowFiled(beanToMap); + } + + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid()); + if (bv.getTaskId().equals(scmSpecialrebateCheckapply.getTaskId())) { + ResultBean resultBean = flowableFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + + public ResultBean revokeProcess(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + //根据业务sid查询排内购申请 + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid()); + String businessTaskId = scmSpecialrebateCheckapply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + flowTaskVo.setValues(BeanUtil.beanToMap(scmSpecialrebateCheckapply)); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } + + public ResultBean taskReject(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid()); + if (scmSpecialrebateCheckapply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = scmSpecialrebateCheckapply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean breakProcess(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid()); + String businessTaskId = scmSpecialrebateCheckapply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean flowRecord(String procInsId) { + return flowTaskFeign.businessFlowRecord(procInsId); + } + + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } } \ No newline at end of file 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 b1545eb36f..990f2c29dc 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 @@ -413,7 +413,7 @@ public class ScmVehicleGressionService extends MybatisBaseService vinList = scmVehicleGressionVehService.fetchVoByMainSid(businessSid); if (vinList.size() > 0) { for (String s : vinList) { - BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); + BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(s,scmVehicleGression.getUseOrgSid()).getData(); +// BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid()); baseVehicleTempstateDto.setTempStateKey("001"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java index 1690beacb7..72ac22fd8f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java @@ -125,4 +125,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper selInventory(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' ") + int getInventoryState(@Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index d7f0ec08f7..293eb3343d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -167,12 +167,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService qw = appCarQueryWrapper(pagerQuery.getParams()); AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams(); IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getName()); - List records = iPage.getRecords(); - for (AppScmVehicleCarInventoryListPageVo record : records) { - if ("2".equals(record.getState())) { - record.setShowUpdataBtn(true); - } - } +// List records = iPage.getRecords(); +// for (AppScmVehicleCarInventoryListPageVo record : records) { +// if ("2".equals(record.getState())) { +// record.setShowUpdataBtn(true); +// } +// } return iPage; } @@ -202,7 +202,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService= date_format('" + inventStartDate + "','%Y-%m-%d')"). @@ -457,4 +457,13 @@ public class ScmVehicleInventoryService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehinventorymonth; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonth; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo; + +import java.util.List; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventorymonthMapper.java
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventorymonth.ScmVehInventorymonthMapper
+ * Description: 月度盘库.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmVehInventorymonthMapper extends BaseMapper { + + //@Update("update scm_veh_inventorymonth 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 scm_veh_inventorymonth") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml new file mode 100644 index 0000000000..30c3f5f15d --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java new file mode 100644 index 0000000000..57edb4b2be --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthRest.java @@ -0,0 +1,106 @@ +package com.yxt.anrui.scm.biz.scmvehinventorymonth; /********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ + + +import com.yxt.anrui.scm.api.scmvehinventorymonth.*; +import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService; +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; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventorymonthFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventorymonth.ScmVehInventorymonthRest
+ * Description: 月度盘库.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "月度盘库") +@RestController("com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthRest") +@RequestMapping("v1/scmvehinventorymonth") +public class ScmVehInventorymonthRest implements ScmVehInventorymonthFeign { + + @Autowired + private ScmVehInventorymonthService scmVehInventorymonthService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehInventorymonthService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmVehInventorymonthDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmVehInventorymonthService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + scmVehInventorymonthService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmVehInventorymonthDetailsVo vo = scmVehInventorymonthService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean getInventoryRecords(String userSid) { + return scmVehInventorymonthService.getInventoryRecords(userSid); + } + + @Override + public ResultBean> getCarInventoryReportList(PagerQuery pagerQuery) { + return null; + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java new file mode 100644 index 0000000000..b0b93d6ac4 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -0,0 +1,170 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehinventorymonth; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory; +import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService; +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.scm.api.scmvehinventorymonth.ScmVehInventorymonth; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthQuery; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthDetailsVo; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthDto; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthFeign; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.List; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventorymonthService.java
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventorymonth.ScmVehInventorymonthService
+ * Description: 月度盘库 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmVehInventorymonthService extends MybatisBaseService { + + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + BaseVehicleFeign baseVehicleFeign; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + ScmVehicleInventoryService scmVehicleInventoryService; + + + private QueryWrapper createQueryWrapper(ScmVehInventorymonthQuery 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) { + ScmVehInventorymonthQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmVehInventorymonthDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehInventorymonthDto dto) { + ScmVehInventorymonth entity = new ScmVehInventorymonth(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehInventorymonthDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmVehInventorymonth entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehInventorymonthDetailsVo fetchDetailsVoBySid(String sid) { + ScmVehInventorymonth entity = fetchBySid(sid); + ScmVehInventorymonthDetailsVo vo = new ScmVehInventorymonthDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean getInventoryRecords(String userSid) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData(); + boolean inventoryState = scmVehicleInventoryService.getInventoryState(userSid); + if (inventoryState) { + return rb.setMsg("盘库记录生成失败，记录存在未确认数据"); + } + List list = baseVehicleFeign.selectInventoryRecords(userSid).getData(); + ScmVehInventorymonth scmVehInventorymonth = new ScmVehInventorymonth(); + scmVehInventorymonth.setBillNo(""); + scmVehInventorymonth.setCreateOrgSid(useOrgSid); + scmVehInventorymonth.setCreateOrgName(sysStaffOrg.getOrgName()); + scmVehInventorymonth.setUseOrgSid(useOrgSid); + scmVehInventorymonth.setUseOrgName(sysStaffOrg.getOrgName()); + save(scmVehInventorymonth); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) { + ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory(); + scmVehicleInventory.setVinNo(appScmInventoryRecordsVo.getVin()); + scmVehicleInventory.setMainSid(scmVehInventorymonth.getSid()); + scmVehicleInventory.setLocation(appScmInventoryRecordsVo.getWarehouse()); + scmVehicleInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid()); + scmVehicleInventory.setInventoryState("无"); + scmVehicleInventory.setInventoryStateKey(""); + scmVehicleInventory.setCreateOrgSid(useOrgSid); + scmVehicleInventory.setUseOrgSid(useOrgSid); + scmVehicleInventoryService.save(scmVehicleInventory); + } + } else { + return rb.setMsg("暂无需要盘库记录"); + } + return rb.success(); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java new file mode 100644 index 0000000000..1cff5b00bd --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehinventoryreport; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreport; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo; + +import java.util.List; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventoryreportMapper.java
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventoryreport.ScmVehInventoryreportMapper
+ * Description: 盘库报告.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmVehInventoryreportMapper extends BaseMapper { + + //@Update("update scm_veh_inventoryreport 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 scm_veh_inventoryreport") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.xml new file mode 100644 index 0000000000..045bca48fb --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportRest.java new file mode 100644 index 0000000000..475a96f50c --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehinventoryreport; + +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.scm.api.scmvehinventoryreport.ScmVehInventoryreport; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportQuery; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDetailsVo; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventoryreportFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventoryreport.ScmVehInventoryreportRest
+ * Description: 盘库报告.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "盘库报告") +@RestController("com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportRest") +@RequestMapping("v1/scmvehinventoryreport") +public class ScmVehInventoryreportRest implements ScmVehInventoryreportFeign { + + @Autowired + private ScmVehInventoryreportService scmVehInventoryreportService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehInventoryreportService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmVehInventoryreportDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmVehInventoryreportService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmVehInventoryreportService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmVehInventoryreportDetailsVo vo = scmVehInventoryreportService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java new file mode 100644 index 0000000000..ea7055cae2 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmvehinventoryreport; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreport; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportQuery; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportVo; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDetailsVo; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: aaa(aaa)
+ * File: ScmVehInventoryreportService.java
+ * Class: com.yxt.anrui.scm.api.biz.scmvehinventoryreport.ScmVehInventoryreportService
+ * Description: 盘库报告 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-16 15:52:05
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmVehInventoryreportService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmVehInventoryreportQuery 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) { + ScmVehInventoryreportQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmVehInventoryreportDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehInventoryreportDto dto){ + ScmVehInventoryreport entity = new ScmVehInventoryreport(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehInventoryreportDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmVehInventoryreport entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehInventoryreportDetailsVo fetchDetailsVoBySid(String sid){ + ScmVehInventoryreport entity = fetchBySid(sid); + ScmVehInventoryreportDetailsVo vo = new ScmVehInventoryreportDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java index 6ddbc5cd79..3d7b58796d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java @@ -57,13 +57,8 @@ public class CommonContractInitVo implements Vo { @ApiModelProperty("客户sid") private String customerSid; - - @ApiModelProperty("合同附件") - private String appdixUrl; - - @ApiModelProperty("现场签署图片附件") - private String sceneSignUrl; - - @ApiModelProperty("身份证图片") - private String idImagesUrl; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("车型sid") + private String modelSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java index 407ce677e3..f9f0a0d4c5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java @@ -59,7 +59,7 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid); - @ApiOperation("手机端-获取盘库列表") + @ApiOperation("手机端-获取待盘库列表") @PostMapping("/getInventoryList") @ResponseBody public ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery); @@ -74,7 +74,7 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean getInventory(@PathVariable("recordSid") String recordSid); - @ApiOperation("手机端-初始化盘库记录") + @ApiOperation("手机端-初始化盘库记录-弃用") @GetMapping("/getInventoryByRecordSid/{recordSid}") @ResponseBody public ResultBean getInventoryByRecordSid(@PathVariable("recordSid") String recordSid); @@ -84,7 +84,7 @@ public interface AppScmVehicleInventoryFeign { @ResponseBody public ResultBean saveInventory(@RequestBody StayInventoryDto dto); - @ApiOperation("手机端-保存盘库记录操作") + @ApiOperation("手机端-保存盘库记录操作-弃用") @PostMapping("/saveInventoryByRecordSid") @ResponseBody public ResultBean saveInventoryByRecordSid(@RequestBody StayInventoryDto dto); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java index de8f3814ac..4dcef12f04 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java @@ -19,7 +19,7 @@ public class CarInventoryListPageQuery implements Query { @ApiModelProperty("存放地点sid") private String warehouseSid; - @ApiModelProperty("盘库状态 通过1 不通过 2") + @ApiModelProperty("盘库状态") private String state; @ApiModelProperty("使用组织分公司sid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageVo.java index 8320246eb3..4daf2b4971 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageVo.java @@ -13,10 +13,10 @@ public class CarInventoryListPageVo implements Vo { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("合格证状态") - private String certificateState; +// @ApiModelProperty("合格证状态") +// private String certificateState; - @ApiModelProperty("状态") + @ApiModelProperty("盘库状态状态") private String state; @ApiModelProperty("最新盘库日期") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java index 345c0f3675..f2065f47e9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java @@ -30,6 +30,7 @@ import com.yxt.anrui.scm.api.scmvehicleinventory.*; import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery; import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo; import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign; +import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthFeign; import com.yxt.anrui.terminal.api.supplychain.inventory.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; @@ -60,6 +61,9 @@ public class AppScmVehicleInventoryService { @Autowired ScmVehicleStayInventoryFeign scmVehicleStayInventoryFeign; + @Autowired + ScmVehInventorymonthFeign scmVehInventorymonthFeign; + /** * 手机端-判断是否生成盘库记录 * @@ -67,13 +71,12 @@ public class AppScmVehicleInventoryService { * @return */ public ResultBean getInventoryRecords(String userSid) { -// ResultBean resultBean = scmVehicleStayInventoryFeign.getInventoryRecords(userSid); -// return resultBean; - return null; + ResultBean resultBean = scmVehInventorymonthFeign.getInventoryRecords(userSid); + return resultBean; } /** - * 手机端-获取盘库列表 + * 手机端-获取待盘库列表 * * @param pagerQuery * @return diff --git a/doc/databases/base_tables.sql b/doc/databases/base_tables.sql index 926cd3aa23..ce23d20f02 100644 --- a/doc/databases/base_tables.sql +++ b/doc/databases/base_tables.sql @@ -859,7 +859,7 @@ CREATE TABLE `bus_vehicle_apply_sz` `szSid` varchar(64) DEFAULT NULL COMMENT '上装sid', `detailsSid` varchar(64) DEFAULT NULL COMMENT '排产车型sid', `costPrice` int(64) DEFAULT NULL COMMENT '厂家结算价', - `guidePrice` int(64) DEFAULT NULL COMMENT '销售指导价', + `guidePrice` int(64) DEFAULT NULL COMMENT '销售指导价', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB @@ -867,5 +867,34 @@ CREATE TABLE `bus_vehicle_apply_sz` +DROP TABLE IF EXISTS `base_vehicle_actual_pay`; +CREATE TABLE `base_vehicle_actual_pay` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `vehicleActualSid` VARCHAR(64) DEFAULT NULL COMMENT '车辆未售买断', + `paymentType` varchar(64) DEFAULT NULL COMMENT '付款方式', + `paymentTypeKey` varchar(64) DEFAULT NULL COMMENT '付款方式key', + `actualPay` varchar(255) DEFAULT NULL COMMENT '厂家销售通路', + `bank` varchar(255) DEFAULT NULL COMMENT '开户行', + `receivingAccount` varchar(255) DEFAULT NULL COMMENT '收款银行账号', + `payAccount` varchar(255) DEFAULT NULL COMMENT '付款金额', + `payRemark` varchar(255) DEFAULT NULL COMMENT '付款备注', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='未售买断付款'; + + + diff --git a/doc/databases/scm_tables_vehicle.sql b/doc/databases/scm_tables_vehicle.sql index 80c01bf338..9377da2f95 100644 --- a/doc/databases/scm_tables_vehicle.sql +++ b/doc/databases/scm_tables_vehicle.sql @@ -275,4 +275,54 @@ CREATE TABLE `scm_vehicle_patrolinspectionsheet` PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB - DEFAULT CHARSET = utf8 COMMENT ='巡检单'; \ No newline at end of file + DEFAULT CHARSET = utf8 COMMENT ='巡检单'; + + +-- 10、月度盘库 +DROP TABLE IF EXISTS `scm_veh_inventoryMonth`; +CREATE TABLE `scm_veh_inventoryMonth` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '盘库报告生成状态（0 未生成 1 已生成）', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `billNo` varchar(64) DEFAULT NULL COMMENT '编号（yyyyMMdd）', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织', + `createOrgName` varchar(64) DEFAULT NULL COMMENT '创建组织名称', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织名称', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='月度盘库'; + +-- 5、盘库报告 +DROP TABLE IF EXISTS `scm_veh_inventoryReport`; +CREATE TABLE `scm_veh_inventoryReport` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '月度盘库sid', + `receiverSids` varchar(64) DEFAULT NULL COMMENT '接收人sid', + `receiverNames` varchar(64) DEFAULT NULL COMMENT '接收人姓名', + `reportContent` varchar(64) DEFAULT NULL COMMENT '盘库报告内容', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='盘库报告'; \ No newline at end of file