1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@@ -101,6 +101,12 @@ public class ScmSpecialRebateDetailsVo implements Vo {
 	@ApiModelProperty("计算方式Value")
     private String calculationModeValue; // 计算方式Value
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("所属年月")
+    private String palceGenDate;
     @ApiModelProperty("待确定金额(动态)")
     private String stayDetermineMoney;
     @ApiModelProperty("待确定金额(常量)")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java

@@ -96,6 +96,14 @@ public class ScmSpecialRebateDto implements Dto {
 	@ApiModelProperty("计算方式Value")
     private String calculationModeValue; // 计算方式Value
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("所属年月")
+    private String palceGenDate;
+    @ApiModelProperty("一次核对状态")
+    private Integer onceCheckState;
     @ApiModelProperty("待确定金额(动态)")
     private String stayDetermineMoney;
     @ApiModelProperty("待确定金额(常量)")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -57,8 +58,6 @@ public class ScmSpecialRebateWithDetailsVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("预提返利")
     private String withRebate; // 预提返利
-    @ApiModelProperty("台数")
-    private String num; // 台数
     @ApiModelProperty("专项返利sid")
     private List<String> specialRebateSids; // 专项返利sid
 	@ApiModelProperty("专项返利sid")
@@ -70,4 +69,18 @@ public class ScmSpecialRebateWithDetailsVo implements Vo {
 	@ApiModelProperty("专项返利预提申请sid")
     private String mainSid; // 专项返利预提申请sid
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("预计支出费用")
+    private BigDecimal expectItureCost;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java

@@ -50,10 +50,10 @@ import lombok.Data;
 public class ScmSpecialRebateWithApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
 	@ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java

@@ -59,10 +59,10 @@ public class ScmSpecialRebateWithApplyDetailsVo implements Vo {
     private String createBySid; // 申请人sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
 	@ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java

@@ -57,10 +57,10 @@ public class ScmSpecialRebateWithApplyDto implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks; // 备注
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
     @ApiModelProperty("创建人sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java

@@ -49,8 +49,8 @@ import lombok.Data;
 @ApiModel(value = "专项返利预提申请表 查询条件", description = "专项返利预提申请表 查询条件")
 public class ScmSpecialRebateWithApplyQuery implements Query {
 
-    @ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
+    @ApiModelProperty("分公司名称")
+    private String createOrgName;
     @ApiModelProperty("预提申请")
     private String withApply; // 预提申请
     @ApiModelProperty("创建开始日期")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java

@@ -57,22 +57,16 @@ public class ScmSpecialRebateWithApplyVo implements Vo {
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime; // 创建日期
-    @ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-    @ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
     @ApiModelProperty("预提申请")
     private String withApply; // 预提申请
     @ApiModelProperty("预提返利合计")
     private Integer withRebateTotal; // 预提返利合计
+    @ApiModelProperty("其中预提费用")
+    private String withholdCost;
     @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid; // 使用组织sid
-    @ApiModelProperty("使用组织名称")
-    private String useOrgName; // 使用组织名称
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
     @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("流程状态")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -81,4 +81,6 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
 	List<OneExcelVo> excelListOne(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 
 	List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
+
+	int checkSave(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml

@@ -4,7 +4,9 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo">
-        SELECT * FROM scm_special_rebate
+        SELECT *,
+        expectItureCost + expectTreatCost + expectSuppCost AS expectCost
+        FROM scm_special_rebate
         <where>
             ${ew.sqlSegment}
         </where>
@@ -89,4 +91,11 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="checkSave" resultType="int">
+        select count(*) from scm_special_rebate
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@@ -74,9 +74,7 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody ScmSpecialRebateDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        scmSpecialRebateService.saveOrUpdateDto(dto);
-        return rb.success();
+        return scmSpecialRebateService.saveOrUpdateDto(dto);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.sun.org.apache.regexp.internal.RE;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -147,18 +148,33 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         return p;
     }
 
-    public void saveOrUpdateDto(ScmSpecialRebateDto dto) {
+    public ResultBean saveOrUpdateDto(ScmSpecialRebateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid",dto.getCreateOrgSid());
+        qw.like("createTime",DateUtil.formatDate(new Date()));
+        qw.eq("rebateTypeKey",dto.getRebateTypeKey());
+        qw.eq("rebateName",dto.getRebateName());
+        qw.eq("estimateRebate",dto.getEstimateRebate());
+        qw.eq("palceGenDate",dto.getPalceGenDate());
+        qw.eq("purchaseSystemSid",dto.getPurchaseSystemSid());
+        qw.eq("brandSid",dto.getBrandSid());
         if (StringUtils.isBlank(dtoSid)) {
+            int i = baseMapper.checkSave(qw);
+            if (i > 0){
+                return rb.setMsg("返利信息已存在");
+            }
             this.insertByDto(dto);
-            return;
+            return rb.success();
         }
-        if ("是".equals(dto.getIsAdjustment())){
-            dto.setAdjustmentState(1);
-        }else {
-            dto.setAdjustmentState(2);
+        qw.ne("sid",dtoSid);
+        int i = baseMapper.checkSave(qw);
+        if (i > 0){
+            return rb.setMsg("返利信息已存在");
         }
         this.updateByDto(dto);
+        return rb.success();
     }
 
     public void insertByDto(ScmSpecialRebateDto dto) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java

@@ -57,16 +57,8 @@ import java.util.Map;
 @Mapper
 public interface ScmSpecialRebateWithMapper extends BaseMapper<ScmSpecialRebateWith> {
 
-    //@Update("update scm_special_rebate_with set name=#{msg} where id=#{id}")
-    //IPage<ScmSpecialRebateWithVo> voPage(IPage<ScmSpecialRebateWith> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebateWith> qw);
-
     IPage<ScmSpecialRebateWithVo> selectPageVo(IPage<ScmSpecialRebateWith> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWith> qw);
 
-    List<ScmSpecialRebateWithVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWith> qw);
-
-    @Select("select * from scm_special_rebate_with")
-    List<ScmSpecialRebateWithVo> selectListVo();
-
     @Delete("delete from scm_special_rebate_with where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml

@@ -10,27 +10,28 @@
         </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo">
-        SELECT * FROM scm_special_rebate_with
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
     <select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo">
         SELECT ssr.rebateTypeKey,
                ssr.`rebateTypeValue`,
                SUM(ssr.`estimateRebate`)             withRebate,
-               COUNT(*)                              num,
-               GROUP_CONCAT(ssrw.`specialRebateSid`) specialRebateSid
+               GROUP_CONCAT(ssrw.`specialRebateSid`) specialRebateSid,
+               ssr.purchaseSystemSid,
+               ssr.purchaseSystemName,
+               ssr.brandSid,
+               ssr.brandName,
+               SUM(ssr.expectItureCost) AS           expectItureCost,
+               SUM(ssr.expectTreatCost) AS           expectTreatCost,
+               SUM(ssr.expectSuppCost)  AS           expectSuppCost
         FROM scm_special_rebate_with ssrw
                      LEFT JOIN scm_special_rebate ssr
                 ON ssr.`sid` = ssrw.`specialRebateSid`
         WHERE ssrw.`mainSid` = #{sid}
-        GROUP BY ssr.rebateTypeKey
+        GROUP BY ssr.rebateTypeKey, ssr.purchaseSystemSid, ssr.brandSid
     </select>
 
     <select id="fetchBySpecialReBateSid" resultType="java.lang.String">
-        SELECT mainSid FROM scm_special_rebate_with WHERE specialRebateSid = #{sid}
+        SELECT mainSid
+        FROM scm_special_rebate_with
+        WHERE specialRebateSid = #{sid}
     </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.java

@@ -54,16 +54,8 @@ import java.util.Map;
 @Mapper
 public interface ScmSpecialRebateWithApplyMapper extends BaseMapper<ScmSpecialRebateWithApply> {
 
-	//@Update("update scm_special_rebate_with_apply set name=#{msg} where id=#{id}")
-	//IPage<ScmSpecialRebateWithApplyVo> voPage(IPage<ScmSpecialRebateWithApply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebateWithApply> qw);
-	
 	IPage<ScmSpecialRebateWithApplyVo> selectPageVo(IPage<ScmSpecialRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWithApply> qw);
 	
-	List<ScmSpecialRebateWithApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWithApply> qw);
-	
-	@Select("select * from scm_special_rebate_with_apply")
-	List<ScmSpecialRebateWithApplyVo> selectListVo();
-
 	int selectBySid(String join);
 
 	int updateFlowFiled(Map<String, Object> beanToMap);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml

@@ -6,7 +6,8 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo">
         SELECT
         ssrwa.*,
-        SUM(ssr.`estimateRebate`) withRebateTotal
+        SUM(ssr.`estimateRebate`) withRebateTotal,
+        SUM(ssr.expectItureCost + ssr.expectTreatCost + ssr.expectSuppCost) as withholdCost
         FROM
         scm_special_rebate_with_apply ssrwa
         LEFT JOIN scm_special_rebate_with ssrw
@@ -18,14 +19,6 @@
         </where>
     </select>
 
-    <select id="selectListAllVo"
-            resultType="com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo">
-        SELECT * FROM scm_special_rebate_with_apply
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
     <select id="selectBySid" resultType="int">
         SELECT COUNT(*)
         FROM scm_special_rebate_with_apply

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -151,8 +151,8 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
-            qw.eq("ssrwa.brandSid", query.getBrandSid());
+        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
+            qw.like("ssrwa.createOrgName", query.getCreateOrgName());
         }
         if (StringUtils.isNotBlank(query.getWithApply())) {
             qw.like("ssrwa.withApply", query.getWithApply());
@@ -257,9 +257,6 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
         for (ScmSpecialRebateWithDetailsVo scmSpecialRebateWithDetailsVo : scmSpecialRebateWithDetailsVos) {
             String[] specialRebateSids = scmSpecialRebateWithDetailsVo.getSpecialRebateSid().split(",");
             scmSpecialRebateWithDetailsVo.setSpecialRebateSids(Arrays.asList(specialRebateSids));
-            String withRebate = scmSpecialRebateWithDetailsVo.getWithRebate();
-            withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
-            scmSpecialRebateWithDetailsVo.setWithRebate(withRebate);
         }
         scmSpecialRebateWithApplyDetailsVo.setScmSpecialRebateWiths(scmSpecialRebateWithDetailsVos);
         return rb.success().setData(scmSpecialRebateWithApplyDetailsVo);