From 6f0655517005a5af0ae889659175d1a8f583e175 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 25 Oct 2024 09:56:19 +0800 Subject: [PATCH] 1 --- .../BasePurchaseSystem.java | 4 ++ .../BasePurchaseSystemDetailsVo.java | 4 ++ .../BasePurchaseSystemFeign.java | 5 ++ .../BasePurchaseSystemFeignFallback.java | 5 ++ .../BasePurchaseSystemVo.java | 4 ++ .../BaseCollRebateDisGetVehVo.java | 60 ++++++++++++++++++ .../api/basevehicle/BaseVehicleFeign.java | 2 +- .../basevehicle/BaseVehicleFeignFallback.java | 2 +- .../BasePurchaseSystemMapper.java | 4 ++ .../BasePurchaseSystemRest.java | 5 ++ .../BasePurchaseSystemService.java | 6 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 1 + .../base/biz/basevehicle/BaseVehicleRest.java | 2 +- .../biz/basevehicle/BaseVehicleService.java | 52 +++++++-------- ...CollectionrebateCheckapplydetailFeign.java | 6 ++ .../ScmApplyInboundService.java | 2 +- ...ollectionrebateCheckapplydetailMapper.java | 3 + ...CollectionrebateCheckapplydetailMapper.xml | 15 +++++ ...mCollectionrebateCheckapplydetailRest.java | 63 ++++++++++--------- ...llectionrebateCheckapplydetailService.java | 7 +++ .../ScmCollectionRebateWithApplyService.java | 2 - 21 files changed, 190 insertions(+), 64 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseCollRebateDisGetVehVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java index accf1e4c93..817b270e8e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(采购系统管理)
* File: BasePurchaseSystem.java
@@ -62,4 +64,6 @@ public class BasePurchaseSystem extends BaseEntity { private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 + @ApiModelProperty("分摊比例") + private BigDecimal shareProportion; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java index c718871171..442343440f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(采购系统管理)
* File: BasePurchaseSystemVo.java
@@ -63,4 +65,6 @@ public class BasePurchaseSystemDetailsVo implements Vo { private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 + @ApiModelProperty("分摊比例") + private BigDecimal shareProportion; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java index e5f3f3b8fa..bdbad2a44a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java @@ -65,6 +65,11 @@ public interface BasePurchaseSystemFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody BasePurchaseSystemDto dto); + + @ApiOperation("维护分摊比例") + @PostMapping("/maintenance") + @ResponseBody + public ResultBean maintenance(@RequestParam("sid") String sid,@RequestParam("shareProportion") String shareProportion); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java index 69d034730f..76019efae5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java @@ -59,6 +59,11 @@ public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign return ResultBean.fireFail().setMsg("接口anrui-base/basepurchasesystem/save无法访问"); } + @Override + public ResultBean maintenance(String sid, String shareProportion) { + return null; + } + @Override public ResultBean delBySids( String[] sids){ return ResultBean.fireFail().setMsg("接口anrui-base/basepurchasesystem/delBySids无法访问"); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java index 216556d0b8..ac09085c88 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(采购系统管理)
* File: BasePurchaseSystemVo.java
@@ -63,4 +65,6 @@ public class BasePurchaseSystemVo implements Vo { private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 + @ApiModelProperty("分摊比例") + private BigDecimal shareProportion; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseCollRebateDisGetVehVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseCollRebateDisGetVehVo.java new file mode 100644 index 0000000000..64b0a6480a --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseCollRebateDisGetVehVo.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _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.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "专项返利分配选择车辆 视图数据对象", description = "专项返利分配选择车辆 视图数据对象") +public class BaseCollRebateDisGetVehVo implements Query { + + @ApiModelProperty(value = "车型名称和编码") + private String modelName; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "已选择的车辆的车架号") + private List vinNoList = new ArrayList<>(); + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; + @ApiModelProperty("入库日期") + private String priceDateStart; + private String priceDateEnd; + @ApiModelProperty("销售日期") + private String salesDateStart; + private String salesDateEnd; + @ApiModelProperty("买断日期") + private String solidDateStart; + private String solidDateEnd; +} 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 7db9e97c5f..1bf4f595a9 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 @@ -325,7 +325,7 @@ public interface BaseVehicleFeign { @ApiOperation("回款返利选择车辆分页列表") @PostMapping("/vehicleCollectionList") - ResultBean> vehicleCollectionList(@RequestBody PagerQuery pagerQuery); + ResultBean> vehicleCollectionList(@RequestBody PagerQuery pagerQuery); @ApiOperation("调车申请查询调出分公司车架号和库存地点") @PostMapping("/purSellVinNoAndLoc") 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 d8ae38a19a..15a65470aa 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 @@ -208,7 +208,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> vehicleCollectionList(PagerQuery pagerQuery) { + public ResultBean> vehicleCollectionList(PagerQuery pagerQuery) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java index e143eb27bd..4810bdeb28 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java @@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -79,4 +80,7 @@ public interface BasePurchaseSystemMapper extends BaseMapper List fetchDetailsByUseOrgPath(String orgSid); List selectByUseOrgSid(String useOrgSid); + + @Update("update base_purchase_system set shareProportion = #{shareProportion} where sid = #{sid}") + void maintenance(@Param("sid") String sid,@Param("shareProportion") String shareProportion); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java index 3e7b25e116..191f9e2aa9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java @@ -73,6 +73,11 @@ public class BasePurchaseSystemRest implements BasePurchaseSystemFeign { return basePurchaseSystemService.saveOrUpdateDto(dto); } + @Override + public ResultBean maintenance(String sid, String shareProportion) { + return basePurchaseSystemService.maintenance(sid,shareProportion); + } + @Override @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java index 29f11b4c89..916c217a20 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java @@ -156,4 +156,10 @@ public class BasePurchaseSystemService extends MybatisBaseService selectByUseOrgSid(String useOrgSid) { return baseMapper.selectByUseOrgSid(useOrgSid); } + + public ResultBean maintenance(String sid, String shareProportion) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.maintenance(sid,shareProportion); + return rb.success(); + } } \ 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 2fb693b30a..71ee1597dd 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 @@ -1527,6 +1527,7 @@ LEFT JOIN base_vehmodel_config bvc ON bvc.`modelSid` = bvm.`sid` AND bvc.`configurationItemsSid` = bmc.`sid` AND bvc.useOrgSid = bv.createOrgSid + (bv.solidDate IS NULL AND bv.salesDate IS NOT NULL OR bv.salesDate IS NOT NULL) AND ${ew.sqlSegment} 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 4879308ffc..34d84d645b 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 @@ -1042,7 +1042,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } @Override - public ResultBean> vehicleCollectionList(PagerQuery pagerQuery) { + public ResultBean> vehicleCollectionList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerVo pv = baseVehicleService.vehicleCollectionList(pagerQuery); return rb.success().setData(pv); 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 7af1fd423a..8b70faa285 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 @@ -1988,10 +1988,10 @@ public class BaseVehicleService extends MybatisBaseService vehicleCollectionList(PagerQuery pagerQuery) { + public PagerVo vehicleCollectionList(PagerQuery pagerQuery) { IPage page = vehicleCollectionPageList(pagerQuery); List records = page.getRecords(); List newRecords = new ArrayList<>(); @@ -3706,42 +3706,34 @@ public class BaseVehicleService extends MybatisBaseService vehicleCollectionPageList(PagerQuery pagerQuery) { + private IPage vehicleCollectionPageList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = new QueryWrapper<>(); - BaseChoiceVehicleQuery params = pagerQuery.getParams(); + BaseCollRebateDisGetVehVo params = pagerQuery.getParams(); if (params != null) { - //品牌 - qw.eq("bvm.carBrand", params.getBrandSid()); - if (StringUtils.isNotBlank(params.getUserSid())) { - String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); - qw.eq("bv.useOrgSid", orgSid); - } - //品牌 - if (StringUtils.isNotBlank(params.getBrandSid())) { - qw.eq("bvm.carBrand", params.getBrandSid()); - } + qw.eq("bv.useOrgSid", params.getCreateOrgSid()); //车型 - if (StringUtils.isNotBlank(params.getModelNameAndCode())) { - qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bv.modelName", params.getModelName()); } // 车架号 if (StringUtils.isNotBlank(params.getVinNo())) { qw.like("bv.vinNo", params.getVinNo()); } - // 颜色 - if (StringUtils.isNotBlank(params.getCarColorKey())) { - qw.eq("bmc.carColorKey", params.getCarColorKey()); - } - // 存放地点 - if (StringUtils.isNotBlank(params.getLocation())) { - qw.eq("bv.location", params.getLocation()); - } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); } + qw.apply(StringUtils.isNotBlank(params.getPriceDateStart()), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + params.getPriceDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getPriceDateEnd()), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + params.getPriceDateEnd() + "','%Y-%m-%d')" + ); + qw.apply(StringUtils.isNotBlank(params.getSalesDateStart()), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + params.getSalesDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getSalesDateEnd()), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + params.getSalesDateEnd() + "','%Y-%m-%d')" + ); + qw.apply(StringUtils.isNotBlank(params.getSolidDateStart()), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + params.getSolidDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getSolidDateEnd()), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + params.getSolidDateEnd() + "','%Y-%m-%d')" + ); qw.eq("bv.isDelete", 0); - qw.eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode()); + qw.orderByDesc("bv.salesDate"); } return baseMapper.vehicleCollectionPageList(page, qw); } @@ -4390,12 +4382,12 @@ public class BaseVehicleService extends MybatisBaseService vinSids = manDateQuery.getVinSids(); vinSids.removeAll(Collections.singleton(null)); - if(vinSids.isEmpty()){ + if (vinSids.isEmpty()) { return rb.setMsg("请选择车辆"); } for (int i = 0; i < vinSids.size(); i++) { BaseVehicle baseVehicle = fetchBySid(vinSids.get(i)); - if(baseVehicle != null){ + if (baseVehicle != null) { baseVehicle.setManDate(manDateQuery.getManDate()); baseMapper.updateById(baseVehicle); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java index 870496ef15..dd9ae96348 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java @@ -34,6 +34,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.List; /** @@ -75,4 +76,9 @@ public interface ScmCollectionrebateCheckapplydetailFeign { @GetMapping("/collectionRebateCheckDetails/{sid}") @ResponseBody public ResultBean> collectionRebateCheckDetails(@PathVariable("sid") String sid); + + @ApiOperation("计算分摊参考比例") + @GetMapping("/compute") + @ResponseBody + public ResultBean compute(@RequestParam("createOrgSid") String createOrgSid, @RequestParam("purchaseSystemSid") String purchaseSystemSid); } \ 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 bbf38ee333..d96d989ade 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 @@ -252,7 +252,7 @@ public class ScmApplyInboundService extends MybatisBaseService selByMainSid(String s); List selByCollectionRebateSid(String mainSid); + + BigDecimal compute(@Param("createOrgSid") String createOrgSid,@Param("purchaseSystemSid") String purchaseSystemSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml index b753a7a01a..b1720258cf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml @@ -43,4 +43,19 @@ on sd.mainSid = sa.sid where sd.mainSid = #{mainSid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java index 642787184b..8d3f962748 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java @@ -34,7 +34,9 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.List; + import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; @@ -60,38 +62,43 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionre @RequestMapping("v1/scmcollectionrebatecheckapplydetail") public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionrebateCheckapplydetailFeign { - @Autowired - private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; + @Autowired + private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto){ - ResultBean rb = ResultBean.fireFail(); - scmCollectionrebateCheckapplydetailService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplydetailService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmCollectionrebateCheckapplydetailService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplydetailService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - ScmCollectionrebateCheckapplydetailDetailsVo vo = scmCollectionrebateCheckapplydetailService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapplydetailDetailsVo vo = scmCollectionrebateCheckapplydetailService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> collectionRebateCheckDetails(String sid) { + return scmCollectionrebateCheckapplydetailService.collectionRebateCheckDetails(sid); + } - @Override - public ResultBean> collectionRebateCheckDetails(String sid) { - return scmCollectionrebateCheckapplydetailService.collectionRebateCheckDetails(sid); - } + @Override + public ResultBean compute(String createOrgSid, String purchaseSystemSid) { + return scmCollectionrebateCheckapplydetailService.compute(createOrgSid, purchaseSystemSid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java index c51d984705..5e48f2b815 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionre import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -117,4 +118,10 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi public List selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public ResultBean compute(String createOrgSid, String purchaseSystemSid) { + ResultBean rb = ResultBean.fireFail(); + BigDecimal num = baseMapper.compute(createOrgSid,purchaseSystemSid); + return rb.success().setData(num); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java index 1ac0c070af..e6d503423f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java @@ -395,8 +395,6 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService