1

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(采购系统管理) <br/>
  * File: BasePurchaseSystem.java <br/>
@@ -62,4 +64,6 @@ public class BasePurchaseSystem extends BaseEntity {
     private String purchaseSystemName; // 采购系统名称
     @ApiModelProperty("财务中分公司编码")
     private String orgCode; // 财务中分公司编码
+    @ApiModelProperty("分摊比例")
+    private BigDecimal shareProportion;
 }

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(采购系统管理) <br/>
  * File: BasePurchaseSystemVo.java <br/>
@@ -63,4 +65,6 @@ public class BasePurchaseSystemDetailsVo implements Vo {
     private String purchaseSystemName; // 采购系统名称
     @ApiModelProperty("财务中分公司编码")
     private String orgCode; // 财务中分公司编码
+    @ApiModelProperty("分摊比例")
+    private BigDecimal shareProportion;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java

@@ -66,6 +66,11 @@ public interface BasePurchaseSystemFeign {
     @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")
     @ResponseBody

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无法访问");

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(采购系统管理) <br/>
  * File: BasePurchaseSystemVo.java <br/>
@@ -63,4 +65,6 @@ public class BasePurchaseSystemVo implements Vo {
     private String purchaseSystemName; // 采购系统名称
     @ApiModelProperty("财务中分公司编码")
     private String orgCode; // 财务中分公司编码
+    @ApiModelProperty("分摊比例")
+    private BigDecimal shareProportion;
 }

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<String> 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;
+}

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<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(@RequestBody PagerQuery<BaseChoiceVehicleQuery> pagerQuery);
+    ResultBean<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(@RequestBody PagerQuery<BaseCollRebateDisGetVehVo> pagerQuery);
 
     @ApiOperation("调车申请查询调出分公司车架号和库存地点")
     @PostMapping("/purSellVinNoAndLoc")

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<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(PagerQuery<BaseCollRebateDisGetVehVo> pagerQuery) {
         return null;
     }
 

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<BasePurchaseSystem>
     List<AppBasePurchSystemVo> fetchDetailsByUseOrgPath(String orgSid);
 
     List<BasePurchaseSystem> selectByUseOrgSid(String useOrgSid);
+
+	@Update("update base_purchase_system set shareProportion = #{shareProportion} where sid = #{sid}")
+    void maintenance(@Param("sid") String sid,@Param("shareProportion") String shareProportion);
 }

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")

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<BasePurchaseSy
 	public List<BasePurchaseSystem> 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();
+	}
 }

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
         <where>
+            (bv.solidDate IS NULL AND bv.salesDate IS NOT NULL OR bv.salesDate IS NOT NULL) AND
             ${ew.sqlSegment}
         </where>
     </select>

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<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(PagerQuery<BaseCollRebateDisGetVehVo> pagerQuery) {
         ResultBean<PagerVo<BaseChoiceVehicleVo>> rb = ResultBean.fireFail();
         PagerVo<BaseChoiceVehicleVo> pv = baseVehicleService.vehicleCollectionList(pagerQuery);
         return rb.success().setData(pv);

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<BaseVehicleMapper, Ba
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                 qw.eq("bv.useOrgSid", orgSid);
             }*/
-            if(StringUtils.isNotBlank(params.getOrgPath())){
+            if (StringUtils.isNotBlank(params.getOrgPath())) {
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-                qw.eq("bv.useOrgSid",orgSid);
+                qw.eq("bv.useOrgSid", orgSid);
-            }else{
+            } else {
                 if (StringUtils.isNotBlank(params.getUserSid())) {
                     String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                     qw.eq("bv.useOrgSid", orgSid);
@@ -3335,7 +3335,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')"
                 );
         qw.eq("bvb.sid", params.getBrandSid());
-        qw.eq("bv.purchaseSystemSid",params.getPurchaseSystemSid());
+        qw.eq("bv.purchaseSystemSid", params.getPurchaseSystemSid());
         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());
@@ -3690,7 +3690,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return p;
     }
 
-    public PagerVo<BaseChoiceVehicleVo> vehicleCollectionList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+    public PagerVo<BaseChoiceVehicleVo> vehicleCollectionList(PagerQuery<BaseCollRebateDisGetVehVo> pagerQuery) {
         IPage<BaseChoiceVehicleVo> page = vehicleCollectionPageList(pagerQuery);
         List<BaseChoiceVehicleVo> records = page.getRecords();
         List<BaseChoiceVehicleVo> newRecords = new ArrayList<>();
@@ -3706,42 +3706,34 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return pv1;
     }
 
-    private IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+    private IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(PagerQuery<BaseCollRebateDisGetVehVo> pagerQuery) {
         IPage<BaseChoiceVehicleVo> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
-        BaseChoiceVehicleQuery params = pagerQuery.getParams();
+        BaseCollRebateDisGetVehVo params = pagerQuery.getParams();
         if (params != null) {
-            //品牌
+            qw.eq("bv.useOrgSid", params.getCreateOrgSid());
-            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());
-            }
             //车型
-            if (StringUtils.isNotBlank(params.getModelNameAndCode())) {
+            if (StringUtils.isNotBlank(params.getModelName())) {
-                qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
+                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<BaseVehicleMapper, Ba
         ResultBean rb = ResultBean.fireFail();
         List<String> 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);
             }

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<List<ScmCollectionRebateDetailsVo>> collectionRebateCheckDetails(@PathVariable("sid") String sid);
+
+    @ApiOperation("计算分摊参考比例")
+    @GetMapping("/compute")
+    @ResponseBody
+    public ResultBean<BigDecimal> compute(@RequestParam("createOrgSid") String createOrgSid, @RequestParam("purchaseSystemSid") String purchaseSystemSid);
 }

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<ScmApplyInboundMa
                     for (ScmFileDto scmFile : scmFiles) {
                         scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType());
                         scmFile.setLinkSid(inboundVehicle.getSid());
-                        scmFileService.saveOrUpdateDto(scmFile);
+                        scmFileService.insertByDto(scmFile);
                     }
                 }
             }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java

@@ -39,6 +39,7 @@ import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -67,4 +68,6 @@ public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<Sc
     List<ScmCollectionrebateCheckapplydetailVo> selByMainSid(String s);
 
     List<ScmCollectionRebateDetailsVo> selByCollectionRebateSid(String mainSid);
+
+    BigDecimal compute(@Param("createOrgSid") String createOrgSid,@Param("purchaseSystemSid") String purchaseSystemSid);
 }

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}
     </select>
+
+    <select id="compute" resultType="java.math.BigDecimal">
+        SELECT
+                ROUND(
+                        SUM(sd.`uploadMoney`) / SUM(sd.collectionMoney),
+                        2
+                        ) * 100 AS num
+        FROM
+                scm_collectionrebate_checkapplydetail sd
+                        LEFT JOIN scm_collectionrebate_checkapply sc
+                        ON sd.`mainSid` = sc.`sid`
+        WHERE sc.`createOrgSid` = #{createOrgSid}
+          AND sd.`purchaseSystemSid` = #{purchaseSystemSid}
+          AND sc.`nodeState` = '已办结'
+    </select>
 </mapper>

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;
@@ -66,7 +68,7 @@ public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionreb
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto){
+    public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto) {
         ResultBean rb = ResultBean.fireFail();
         scmCollectionrebateCheckapplydetailService.saveOrUpdateDto(dto);
         return rb.success();
@@ -75,7 +77,7 @@ public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionreb
     @Override
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         scmCollectionrebateCheckapplydetailService.delBySids(sids);
         return rb.success();
@@ -84,7 +86,7 @@ public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionreb
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         ScmCollectionrebateCheckapplydetailDetailsVo vo = scmCollectionrebateCheckapplydetailService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
@@ -94,4 +96,9 @@ public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionreb
     public ResultBean<List<ScmCollectionRebateDetailsVo>> collectionRebateCheckDetails(String sid) {
         return scmCollectionrebateCheckapplydetailService.collectionRebateCheckDetails(sid);
     }
+
+    @Override
+    public ResultBean<BigDecimal> compute(String createOrgSid, String purchaseSystemSid) {
+        return scmCollectionrebateCheckapplydetailService.compute(createOrgSid, purchaseSystemSid);
+    }
 }

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<ScmCollectionrebateCheckapplydetailVo> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
+
+    public ResultBean<BigDecimal> compute(String createOrgSid, String purchaseSystemSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BigDecimal num = baseMapper.compute(createOrgSid,purchaseSystemSid);
+        return rb.success().setData(num);
+    }
 }

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<ScmC
                         BeanUtil.copyProperties(scmCollectionRebate, scmCollectionRebateDistribution);
                         scmCollectionRebateDistribution.setSid(sid);
                         scmCollectionRebateDistribution.setDistributionState("未分配");
-                        scmCollectionRebateDistribution.setCollRebateSid(scmCollectionRebate.getSid());
-                        scmCollectionRebateDistribution.setWithholdingApply(scmCollectionRebateDistribution.getWithholdingApply());
                         scmCollectionRebateDistributionService.save(scmCollectionRebateDistribution);
                     }
                 }