Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -549,6 +549,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         appMap.put("orderSid", busSalesOrderReturnVehApply1.getOrderSid());
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        Boolean i = false;
+        String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey();
+        if ("2".equals(saleTypeKey)) {
+            i = true;
+        }
+        variables.put("isAdj", i);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -855,6 +861,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         Map<String, Object> variables = new HashMap<>();
         //根据业务sid查询排产信息
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
+        Boolean i = false;
+        String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey();
+        if ("2".equals(saleTypeKey)) {
+            i = true;
+        }
+        variables.put("isAdj", i);
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
@@ -877,6 +889,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         Map<String, Object> variables = new HashMap<>();
         //根据业务sid查询排产信息
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
+        Boolean i = false;
+        String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey();
+        if ("2".equals(saleTypeKey)) {
+            i = true;
+        }
+        variables.put("isAdj", i);
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@@ -913,6 +931,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", businessSid);
                 variables.put("app", appMap);
+                Boolean i = false;
+                String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey();
+                if ("2".equals(saleTypeKey)) {
+                    i = true;
+                }
+                variables.put("isAdj", i);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {

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

@@ -82,10 +82,6 @@ public class ScmSpecialRebate extends BaseEntity {
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
-	@ApiModelProperty("计算方式key")
-    private String calculationModeKey; // 计算方式key
-	@ApiModelProperty("计算方式Value")
-    private String calculationModeValue; // 计算方式Value
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;

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

@@ -96,10 +96,6 @@ public class ScmSpecialRebateDetailsVo implements Vo {
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
-	@ApiModelProperty("计算方式key")
-    private String calculationModeKey; // 计算方式key
-	@ApiModelProperty("计算方式Value")
-    private String calculationModeValue; // 计算方式Value
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;
@@ -151,4 +147,6 @@ public class ScmSpecialRebateDetailsVo implements Vo {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("组织全路径")
     private String orgPath;
+
+    private String specialRebateSid;
 }

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

@@ -91,10 +91,6 @@ public class ScmSpecialRebateDto implements Dto {
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
-	@ApiModelProperty("计算方式key")
-    private String calculationModeKey; // 计算方式key
-	@ApiModelProperty("计算方式Value")
-    private String calculationModeValue; // 计算方式Value
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;

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

@@ -55,6 +55,8 @@ public class ScmSpecialRebateVo implements Vo {
 
     private String sid;
 
+    @ApiModelProperty("专项返利sid")
+    private String specialRebateSid;
     @ApiModelProperty("状态")
     private String state;
     @ApiModelProperty("创建组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java

@@ -54,10 +54,6 @@ public class ScmSpecialrebateCheckapply extends BaseEntity {
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
 	@ApiModelProperty("核对申请标题")
     private String checkApply; // 核对申请标题
 	@ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java

@@ -62,10 +62,6 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
 	@ApiModelProperty("核对申请标题")
     private String checkApply; // 核对申请标题
 	@ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java

@@ -62,10 +62,6 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
 	@ApiModelProperty("核对申请标题")
     private String checkApply; // 核对申请标题
 	@ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java

@@ -67,6 +67,8 @@ public class ScmSpecialrebateCheckapplyVo implements Vo {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
+    @ApiModelProperty("其中预提费用")
+    private String withholdCost;
     @ApiModelProperty("上传金额")
     private String uploadMoney; // 上传金额
     @ApiModelProperty("待确定金额")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java

@@ -87,10 +87,6 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity {
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
-    @ApiModelProperty("计算方式key")
-    private String calculationModeKey; // 计算方式key
-    @ApiModelProperty("计算方式Value")
-    private String calculationModeValue; // 计算方式Value
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java

@@ -63,12 +63,10 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo {
     private String rebateTypeValue; // 返利类型value
     @ApiModelProperty("台数")
     private String num; // 台数
-    @ApiModelProperty("预提数量")
-    private String withholdingAmount; // 预提数量
-    @ApiModelProperty("上传数量")
-    private String uploadAmount; // 上传数量
     @ApiModelProperty("预提金额")
     private String withRebate; // 预提金额
+    @ApiModelProperty("其中预提费用")
+    private String withholdCost;
     @ApiModelProperty("上传金额")
     private String uploadMoney; // 上传金额
     @ApiModelProperty("待确定金额")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java

@@ -55,7 +55,7 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto {
     private String sid; // sid
 
     @ApiModelProperty("专项返利sid")
-    private String specialRebateSids; // 专项返利sid
+    private String specialRebateSid;
 	@ApiModelProperty("核对申请sid")
     private String mainSid; // 核对申请sid
 
@@ -89,10 +89,6 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto {
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
-    @ApiModelProperty("计算方式key")
-    private String calculationModeKey; // 计算方式key
-    @ApiModelProperty("计算方式Value")
-    private String calculationModeValue; // 计算方式Value
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java

@@ -88,10 +88,6 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo {
     private String adjustmentRemarks; // 调整说明
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
-    @ApiModelProperty("计算方式key")
-    private String calculationModeKey; // 计算方式key
-    @ApiModelProperty("计算方式Value")
-    private String calculationModeValue; // 计算方式Value
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java

@@ -159,4 +159,6 @@ public class ScmVehRebateDetailsVo implements Vo {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("组织全路径")
     private String orgPath;
+
+    private String vehRebateSid;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelInfo.java

@@ -18,6 +18,14 @@ public class ScmVehRebateExcelInfo {
     private String calculationStandard;
     @ApiModelProperty("返利金额")
     private String estimateRebate;
+    @ApiModelProperty("其中待支付费用")
+    private String expectTreatCost;
+    @ApiModelProperty("其中抵顶费用")
+    private String expectSuppCost;
+    @ApiModelProperty("抵顶费用说明")
+    private String expectSuppRemark;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

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

@@ -77,4 +77,10 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
     List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 
     int checkSave(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
+
+    @Update("update scm_special_rebate set onceCheckState = #{onceCheckState} where sid = #{sid}")
+    void updateOnceCheckState(@Param("sid") String sid, @Param("onceCheckState") int onceCheckState);
+
+    @Update("update scm_special_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}")
+    void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState);
 }

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

@@ -15,6 +15,7 @@
 
     <select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo">
         SELECT *,
+        sid AS specialRebateSid,
         expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
         onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
         FROM scm_special_rebate

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

@@ -175,7 +175,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.setMsg("返利信息已存在");
         }
         dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
-        this.updateBySid(dto,dtoSid);
+        this.updateBySid(dto, dtoSid);
         return rb.success();
     }
 
@@ -974,7 +974,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 } else {
                     secondaryUploadDate = info.getSecondaryUploadDate();
                 }
-                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(),info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(),info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid());
+                baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid());
             }
             return rb.success().setMsg("成功导入数据，请点击确定按钮");
         }
@@ -1551,4 +1551,12 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         return twoExcelVos;
     }
+
+    public void updateOnceCheckState(String sid, int onceCheckState) {
+        baseMapper.updateOnceCheckState(sid, onceCheckState);
+    }
+
+    public void updateAdjustmentState(String sid, int adjustmentState) {
+        baseMapper.updateAdjustmentState(sid, adjustmentState);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@@ -7,6 +7,7 @@
 		SELECT
 		ssc.*,
 		SUM(sscd.`estimateRebate`) estimateRebate,
+		SUM(sscd.expectItureCost + sscd.expectTreatCost + sscd.expectSuppCost) as withholdCost,
 		SUM(sscd.`uploadMoney`) uploadMoney,
 		SUM(sscd.`stayDetermineMoney`) stayDetermineMoney,
 		SUM(sscd.`adjustmentMoney`) adjustmentMoney,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -51,6 +51,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
@@ -321,6 +322,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                 scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 3);
+                ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                if (scmSpecialRebate.getOnceCheckState() != 1) {
+                    scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 2);
+                }
             }
             return voResultBean;
         }
@@ -385,7 +390,14 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
-                    scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
+                    ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
+                        scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
+                        scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
+                    } else {
+                        scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                    }
+                    scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
                 }
             }
             return rb.success().setData(resultBean.getData());
@@ -465,6 +477,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                 updateFlowFiled(map);
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                     scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                    ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    if (scmSpecialRebate.getOnceCheckState() != 1) {
+                        scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 0);
+                    }
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -479,6 +495,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                     updateFlowFiled(map);
                     for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                         scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
+                        ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                        if (scmSpecialRebate.getOnceCheckState() != 1) {
+                            scmSpecialRebateService.updateOnceCheckState(scmSpecialRebate.getSid(), 0);
+                        }
                     }
                     return rb.success().setData(resultBean.getData());
                 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
 import org.apache.ibatis.annotations.Delete;
@@ -55,6 +56,5 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSp
 	@Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
     List<ScmSpecialrebateCheckapplydetailVo> selByMainSid(String sid);
 
-	@Select("select * from scm_specialrebate_checkapplydetail where specialRebateSid = #{specialRebateSid}")
-	ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid);
+	ScmSpecialRebateDetailsVo fetchBySpecialRebateSid(String specialRebateSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@@ -1,41 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
-		SELECT * FROM scm_specialrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
+        SELECT * FROM scm_specialrebate_checkapplydetail
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
-	<select id="fetchWhenDetailsVoBySid"
-			resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
-		SELECT ssc.rebateTypeKey,
-			   ssc.`rebateTypeValue`,
-			   SUM(ssc.`estimateRebate`)        withRebate,
-			   COUNT(*)                         num,
-			   GROUP_CONCAT(ssc.`specialRebateSid`) specialRebateSid,
-			   SUM(ssc.`uploadMoney`)           uploadMoney,
-			   SUM(ssc.`stayDetermineMoney`)    stayDetermineMoney,
-			   SUM(ssc.`adjustmentMoney`)       adjustmentMoney,
-			   SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost) AS money
-		FROM scm_specialrebate_checkapplydetail ssc
-		WHERE ssc.`mainSid` = #{sid}
-		GROUP BY ssc.`rebateTypeKey`
-	</select>
+    <select id="fetchWhenDetailsVoBySid"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
+        SELECT ssc.rebateTypeKey,
+               ssc.`rebateTypeValue`,
+               SUM(ssc.`estimateRebate`)                                              withRebate,
+               COUNT(*)                                                               num,
+               GROUP_CONCAT(ssc.`specialRebateSid`)                                   specialRebateSid,
+               SUM(ssc.`uploadMoney`)                                                 uploadMoney,
+               SUM(ssc.`stayDetermineMoney`)                                          stayDetermineMoney,
+               SUM(ssc.`adjustmentMoney`)                                             adjustmentMoney,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS money
+        FROM scm_specialrebate_checkapplydetail ssc
+        WHERE ssc.`mainSid` = #{sid}
+        GROUP BY ssc.`rebateTypeKey`
+    </select>
 
-	<select id="fetchLastDetailsVoBySid"
-			resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
-		SELECT ssc.withholdingDate,
-			   SUM(ssc.`estimateRebate`)        withRebate,
-			   COUNT(*)                         withholdingAmount,
-			   COUNT(*)                         uploadAmount,
-			   GROUP_CONCAT(ssc.`specialRebateSid`) specialRebateSid,
-			   SUM(ssc.`uploadMoney`)           uploadMoney,
-			   SUM(ssc.`stayDetermineMoney`)    stayDetermineMoney,
-			   SUM(ssc.`adjustmentMoney`)       adjustmentMoney,
-			   SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost) AS money
-		FROM scm_specialrebate_checkapplydetail ssc
-		WHERE ssc.`mainSid` = #{sid}
-		GROUP BY ssc.withholdingDate
-	</select>
+    <select id="fetchLastDetailsVoBySid"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
+        SELECT ssc.withholdingDate,
+               SUM(ssc.`estimateRebate`)                                              withRebate,
+               COUNT(*)                                                               num,
+               GROUP_CONCAT(ssc.`specialRebateSid`)                                   specialRebateSid,
+               SUM(ssc.`uploadMoney`)                                                 uploadMoney,
+               SUM(ssc.`stayDetermineMoney`)                                          stayDetermineMoney,
+               SUM(ssc.`adjustmentMoney`)                                             adjustmentMoney,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS money
+        FROM scm_specialrebate_checkapplydetail ssc
+        WHERE ssc.`mainSid` = #{sid}
+        GROUP BY ssc.withholdingDate
+    </select>
+
+    <select id="fetchBySpecialRebateSid" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo">
+        SELECT sc.createOrgName, sd.*
+        FROM scm_specialrebate_checkapplydetail sd
+                     LEFT JOIN scm_specialrebate_checkapply sc
+                ON sd.mainSid = sc.sid
+        WHERE specialRebateSid = #{specialRebateSid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java

@@ -55,7 +55,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh
  * @since 1.0
  */
 @Api(tags = "专项返利核对申请表_返利列表")
-@RestController("com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailRest")
+@RestController
 @RequestMapping("v1/scmspecialrebatecheckapplydetail")
 public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateCheckapplydetailFeign {
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
 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.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -125,7 +126,7 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
 		return baseMapper.selByMainSid(sid);
     }
 
-	public ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid) {
+	public ScmSpecialRebateDetailsVo fetchBySpecialRebateSid(String specialRebateSid) {
 		return baseMapper.fetchBySpecialRebateSid(specialRebateSid);
 	}
 }

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

@@ -139,11 +139,10 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
         List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
         String[] sids = sid.split(",");
         for (String s : sids) {
-            ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo = scmSpecialrebateCheckapplydetailService.fetchBySpecialRebateSid(s);
-            if (scmSpecialrebateCheckapplydetailVo != null){
-                ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();
-                BeanUtil.copyProperties(scmSpecialrebateCheckapplydetailVo,scmSpecialRebateDetailsVo);
-                scmSpecialRebateDetailsVo.setMoney(scmSpecialrebateCheckapplydetailVo.getOnceItureCost().add(scmSpecialrebateCheckapplydetailVo.getOnceTreatCost()).add(scmSpecialrebateCheckapplydetailVo.getOnceSuppCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondItureCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondTreatCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondSuppCost()).toString());
+            ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = scmSpecialrebateCheckapplydetailService.fetchBySpecialRebateSid(s);
+            if (scmSpecialRebateDetailsVo != null){
+                scmSpecialRebateDetailsVo.setExpectCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
+                scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
                 scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
             }
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -589,7 +589,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -688,8 +688,20 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                     importVo.setEstimateRebate(temp);
                                     break;
                                 case 5:
+                                    importVo.setExpectTreatCost(temp);
+                                    break;
+                                case 6:
+                                    importVo.setExpectSuppCost(temp);
+                                    break;
+                                case 7:
+                                    importVo.setExpectSuppRemark(temp);
+                                    break;
+                                case 8:
                                     importVo.setPalceGenDate(temp);
                                     break;
+                                case 9:
+                                    importVo.setRemarks(temp);
+                                    break;
                                 default:
                                     break;
                             }
@@ -717,8 +729,20 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                                 word = "返利金额";
                                 break;
                             case 5:
+                                word = "其中待支付费用";
+                                break;
+                            case 6:
+                                word = "其中抵顶费用";
+                                break;
+                            case 7:
+                                word = "抵顶费用说明";
+                                break;
+                            case 8:
                                 word = "所属年月";
                                 break;
+                            case 9:
+                                word = "备注";
+                                break;
                             default:
                                 break;
                         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -76,5 +77,5 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper<ScmVehreb
 	List<ScmVehrebateCheckapplydetailVo> selByMainSid(String mainSid);
 
 	@Select("select * from scm_vehrebate_checkapplydetail where vehRebateSid = #{vehRebateSid}")
-	ScmVehrebateCheckapplydetailVo selByVehRebteSid(String vehRebateSid);
+	ScmVehRebateDetailsVo selByVehRebteSid(String vehRebateSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java

@@ -29,6 +29,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.scm.api.scmvehrebate.ScmVehRebate;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -84,7 +85,7 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService<ScmV
 		return baseMapper.selByMainSid(mainSid);
 	}
 
-	public ScmVehrebateCheckapplydetailVo selByVehRebteSid(String vehRebateSid) {
+	public ScmVehRebateDetailsVo selByVehRebteSid(String vehRebateSid) {
 		return baseMapper.selByVehRebteSid(vehRebateSid);
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@@ -148,11 +148,9 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
         List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = new ArrayList<>();
         String[] sids = sid.split(",");
         for (String s : sids) {
-            ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo = scmVehrebateCheckapplydetailService.selByVehRebteSid(s);
-            if (scmVehrebateCheckapplydetailVo != null){
-                ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
-                BeanUtil.copyProperties(scmVehrebateCheckapplydetailVo,scmVehRebateDetailsVo);
-                scmVehRebateDetailsVo.setMoney(scmVehrebateCheckapplydetailVo.getOnceTreatCost().add(scmVehrebateCheckapplydetailVo.getOnceSuppCost()).add(scmVehrebateCheckapplydetailVo.getSecondTreatCost()).add(scmVehrebateCheckapplydetailVo.getSecondSuppCost()).toString());
+            ScmVehRebateDetailsVo scmVehRebateDetailsVo = scmVehrebateCheckapplydetailService.selByVehRebteSid(s);
+            if (scmVehRebateDetailsVo != null){
+                scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
                 scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
             }
         }