Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 months ago
parent
commit
4658653dff
  1. 51
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java
  2. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java
  3. 50
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java
  4. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java
  5. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java
  6. 52
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java
  7. 19
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java
  8. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  9. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  10. 85
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
  11. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  12. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
  13. 121
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
  14. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
  15. 428
      anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl
  16. 2744
      anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd1.ftl
  17. 428
      anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxhd.ftl

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

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmspecialrebate; package com.yxt.anrui.scm.api.scmspecialrebate;
import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.utils.ExportEntityMap;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -35,8 +36,6 @@ public class ScmSpecialRebateExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo") @ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo; private Integer rankNo;
@ExportEntityMap(CnName = "状态", EnName = "state")
private String state;
@ExportEntityMap(CnName = "分公司", EnName = "createOrgName") @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
private String createOrgName; private String createOrgName;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
@ -49,46 +48,50 @@ public class ScmSpecialRebateExcelVo {
private String rebateTypeValue; private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName; private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
private String estimateRebate; private BigDecimal estimateRebate;
@ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
private String expectItureCost; private BigDecimal expectItureCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost; private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost; private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate; private String palceGenDate;
@ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
private String withholdingDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate; private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney; private BigDecimal uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney; private BigDecimal stayDetermineMoney;
@ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost") @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost")
private BigDecimal onceItureCost; private BigDecimal onceItureCost;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost; private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost; private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost") @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private BigDecimal secondaryUploadMoney;
@ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost")
private BigDecimal secondItureCost; private BigDecimal secondItureCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost; private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost; private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount; private BigDecimal diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment; private String isAdjustment;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney") @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney; private BigDecimal adjustmentMoney;
@ExportEntityMap(CnName = "支出费用调整金额", EnName = "itureAdjustmentMoney")
private BigDecimal itureAdjustmentMoney;
@ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
private BigDecimal treatAdjustmentMoney;
@ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")
private BigDecimal suppAdjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks; private String adjustmentRemarks;
@ExportEntityMap(CnName = "备注", EnName = "remarks") @ExportEntityMap(CnName = "备注", EnName = "remarks")

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

@ -55,14 +55,14 @@ public class ScmSpecialRebateQuery implements Query {
private String createOrgSid; private String createOrgSid;
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String createOrgName; private String createOrgName;
@ApiModelProperty("品牌名称") @ApiModelProperty("品牌名称")
private String brandName; private String brandName;
@ApiModelProperty("采购系统名称") @ApiModelProperty("采购系统名称")
private String purchaseSystemName; private String purchaseSystemName;
@ApiModelProperty("返利类型key") @ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利名称") @ApiModelProperty("返利名称")
private String rebateName; // 返利名称 private String rebateName; // 返利名称
@ApiModelProperty("创建开始日期") @ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期 private String createStartTime; // 创建开始日期

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

@ -40,7 +40,7 @@ public class SpecialRebateCheckExcelVo {
private String createOrgName; private String createOrgName;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName; private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName") @ExportEntityMap(CnName = "品牌", EnName = "brandName")
private String brandName; private String brandName;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime") @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime; private String createTime;
@ -48,44 +48,52 @@ public class SpecialRebateCheckExcelVo {
private String rebateTypeValue; private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName; private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
private String estimateRebate; private BigDecimal estimateRebate;
@ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
private String expectItureCost; private BigDecimal expectItureCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost; private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost; private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate; private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate; private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney; private BigDecimal uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney; private BigDecimal stayDetermineMoney;
@ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost") @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost")
private BigDecimal onceItureCost; private BigDecimal onceItureCost;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost; private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost; private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost") @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private BigDecimal secondaryUploadMoney;
@ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost")
private BigDecimal secondItureCost; private BigDecimal secondItureCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost; private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost; private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount; private BigDecimal diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment; private String isAdjustment;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney") @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney; private BigDecimal adjustmentMoney;
@ExportEntityMap(CnName = "支出费用调整金额", EnName = "itureAdjustmentMoney")
private BigDecimal itureAdjustmentMoney;
@ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
private BigDecimal treatAdjustmentMoney;
@ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")
private BigDecimal suppAdjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks; private String adjustmentRemarks;
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks;
} }

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

@ -48,7 +48,7 @@ public class SpectalRebateWithExcelVo {
private String rebateTypeValue; private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName; private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
private String estimateRebate; private String estimateRebate;
@ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
private BigDecimal expectItureCost; private BigDecimal expectItureCost;
@ -56,10 +56,6 @@ public class SpectalRebateWithExcelVo {
private BigDecimal expectTreatCost; private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private BigDecimal expectSuppCost; private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark")
private String expectSuppRemark;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate; private String palceGenDate;
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks;
} }

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

@ -26,7 +26,6 @@
package com.yxt.anrui.scm.api.scmvehrebate; package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.utils.ExportEntityMap;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -40,16 +39,16 @@ public class ScmVehRebateExcelVo {
private String purchaseSystemName; private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌", EnName = "brandName") @ExportEntityMap(CnName = "品牌", EnName = "brandName")
private String brandName; private String brandName;
@ExportEntityMap(CnName = "车型名称", EnName = "vehModelName") @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
private String vehModelName; private String vehModelName;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo") @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo; private String vinNo;
@ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice") @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
private String manufactorSettlementPrice; private BigDecimal manufactorSettlementPrice;
@ExportEntityMap(CnName = "其中运费", EnName = "freight") @ExportEntityMap(CnName = "其中运费", EnName = "freight")
private String freight; private BigDecimal freight;
@ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount") @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount")
private String topAmount; private BigDecimal topAmount;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime") @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime; private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
@ -57,19 +56,19 @@ public class ScmVehRebateExcelVo {
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName; private String rebateName;
@ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
private String estimateRebate; private BigDecimal estimateRebate;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost; private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost; private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate; private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate; private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney; private BigDecimal uploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney; private BigDecimal stayDetermineMoney;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost; private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
@ -77,17 +76,17 @@ public class ScmVehRebateExcelVo {
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate; private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney; private BigDecimal secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost; private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost; private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount; private BigDecimal diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment; private String isAdjustment;
@ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney") @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney; private BigDecimal adjustmentMoney;
@ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney") @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
private BigDecimal treatAdjustmentMoney; private BigDecimal treatAdjustmentMoney;
@ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney") @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")

52
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java

@ -38,58 +38,60 @@ public class VehRebateCheckExcelVo {
private Integer rankNo; private Integer rankNo;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName; private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName") @ExportEntityMap(CnName = "品牌", EnName = "brandName")
private String brandName; private String brandName;
@ExportEntityMap(CnName = "车型名称", EnName = "vehModelName") @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
private String vehModelName; private String vehModelName;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo") @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo; private String vinNo;
@ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice") @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
private String manufactorSettlementPrice; private BigDecimal manufactorSettlementPrice;
@ExportEntityMap(CnName = "其中运费", EnName = "freight") @ExportEntityMap(CnName = "其中运费", EnName = "freight")
private String freight; private BigDecimal freight;
@ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount")
private BigDecimal topAmount;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime") @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime; private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue; private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName; private String rebateName;
@ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue") @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
private String calculationModeValue; private BigDecimal estimateRebate;
@ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
private String calculationStandard;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private String expectTreatCost; private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private String expectSuppCost; private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate; private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate; private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney; private BigDecimal uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney; private BigDecimal stayDetermineMoney;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
private BigDecimal onceTreatCost; private BigDecimal onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
private BigDecimal onceSuppCost; private BigDecimal onceSuppCost;
@ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private BigDecimal secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
private BigDecimal secondTreatCost; private BigDecimal secondTreatCost;
@ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
private BigDecimal secondSuppCost; private BigDecimal secondSuppCost;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount; private BigDecimal diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment; private String isAdjustment;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney") @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney; private BigDecimal adjustmentMoney;
@ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
private BigDecimal treatAdjustmentMoney;
@ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")
private BigDecimal suppAdjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks; private String adjustmentRemarks;
} }

19
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java

@ -28,6 +28,7 @@ package com.yxt.anrui.scm.api.scmvehrebatewith;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.utils.ExportEntityMap;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -42,32 +43,28 @@ public class ExcelVo {
private String purchaseSystemName; private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName") @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
private String brandName; private String brandName;
@ExportEntityMap(CnName = "车型名称", EnName = "vehModelName") @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
private String vehModelName; private String vehModelName;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo") @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo; private String vinNo;
@ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice") @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
private String manufactorSettlementPrice; private BigDecimal manufactorSettlementPrice;
@ExportEntityMap(CnName = "其中运费", EnName = "freight") @ExportEntityMap(CnName = "其中运费", EnName = "freight")
private String freight; private BigDecimal freight;
@ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount")
private BigDecimal topAmount;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime") @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime; private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue; private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName; private String rebateName;
@ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue") @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
private String calculationModeValue; private BigDecimal estimateRebate;
@ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
private String calculationStandard;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private BigDecimal expectTreatCost; private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private BigDecimal expectSuppCost; private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark")
private String expectSuppRemark;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate; private String palceGenDate;
} }

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

@ -1635,22 +1635,10 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
qw.orderByDesc("createTime"); qw.orderByDesc("createTime");
List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = baseMapper.excelList(qw); List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = baseMapper.excelList(qw);
for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) { for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) {
if (scmSpecialRebateExcelVo.getState().equals("0")){
scmSpecialRebateExcelVo.setState("未预提");
}else if (scmSpecialRebateExcelVo.getState().equals("1")){
scmSpecialRebateExcelVo.setState("预提中");
}else if (scmSpecialRebateExcelVo.getState().equals("2")){
scmSpecialRebateExcelVo.setState("待核对");
}else if (scmSpecialRebateExcelVo.getState().equals("3")){
scmSpecialRebateExcelVo.setState("核对中");
}else if (scmSpecialRebateExcelVo.getState().equals("4")){
scmSpecialRebateExcelVo.setState("已核对");
}else if (scmSpecialRebateExcelVo.getState().equals("5")){
scmSpecialRebateExcelVo.setState("分配中");
}else if (scmSpecialRebateExcelVo.getState().equals("6")){
scmSpecialRebateExcelVo.setState("已分配");
}
scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime()))); scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime())));
scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost()));
scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost()));
scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost()));
} }
return scmSpecialRebateExcelVos; return scmSpecialRebateExcelVos;
} }

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

@ -123,6 +123,9 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
BeanUtil.copyProperties(datum,excelVo); BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i); excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost()));
excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
i = i + 1; i = i + 1;
excelVos.add(excelVo); excelVos.add(excelVo);
} }

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

@ -13,15 +13,18 @@
SUM(ssc.estimateRebate) withRebate, SUM(ssc.estimateRebate) withRebate,
COUNT(*) num, COUNT(*) num,
GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid, GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid,
SUM(ssc.uploadMoney) uploadMoney, SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
SUM(ssc.stayDetermineMoney) stayDetermineMoney, ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney, SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.secondTreatCost + ssc.secondSuppCost) AS money, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
ssc.secondTreatCost + ssc.secondSuppCost) - SUM(IF(ssc.isAdjustment = '是',
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid} WHERE ssc.mainSid = #{sid}
GROUP BY ssc.rebateTypeKey, ssc.brandSid, ssc.purchaseSystemSid GROUP BY ssc.rebateTypeKey, ssc.brandSid, ssc.purchaseSystemSid
@ -35,15 +38,18 @@
SUM(ssc.estimateRebate) withRebate, SUM(ssc.estimateRebate) withRebate,
COUNT(*) num, COUNT(*) num,
GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid, GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid,
SUM(ssc.uploadMoney) uploadMoney, SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
SUM(ssc.stayDetermineMoney) stayDetermineMoney, ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney, SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.secondTreatCost + ssc.secondSuppCost) AS money, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
ssc.secondTreatCost + ssc.secondSuppCost) - SUM(IF(ssc.isAdjustment = '是',
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid} WHERE ssc.mainSid = #{sid}
GROUP BY ssc.withholdingDate, ssc.brandSid, ssc.purchaseSystemSid GROUP BY ssc.withholdingDate, ssc.brandSid, ssc.purchaseSystemSid
@ -72,14 +78,17 @@
COUNT(*) numTotal, COUNT(*) numTotal,
SUM(ssc.estimateRebate) withRebateTotal, SUM(ssc.estimateRebate) withRebateTotal,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCostTotal, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCostTotal,
SUM(ssc.uploadMoney) uploadMoneyTotal, SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoneyTotal,
ssc.secondTreatCost + ssc.secondSuppCost) AS moneyTotal, SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
SUM(ssc.stayDetermineMoney) stayDetermineMoneyTotal, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS moneyTotal,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoneyTotal,
SUM(ssc.adjustmentMoney) adjustmentMoneyTotal, SUM(ssc.adjustmentMoney) adjustmentMoneyTotal,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + SUM(IF(ssc.isAdjustment = '是',
ssc.secondTreatCost + ssc.secondSuppCost) - ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoneyTotal ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoneyTotal
FROM scm_specialrebate_checkapplydetail ssc FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid} WHERE ssc.mainSid = #{sid}
GROUP BY ssc.brandSid, ssc.purchaseSystemSid GROUP BY ssc.brandSid, ssc.purchaseSystemSid
@ -93,14 +102,17 @@
COUNT(*) num, COUNT(*) num,
SUM(ssc.estimateRebate) withRebate, SUM(ssc.estimateRebate) withRebate,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.uploadMoney) uploadMoney, SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
ssc.secondTreatCost + ssc.secondSuppCost) AS money, SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
SUM(ssc.stayDetermineMoney) stayDetermineMoney, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney, SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + SUM(IF(ssc.isAdjustment = '是',
ssc.secondTreatCost + ssc.secondSuppCost) - ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid} WHERE ssc.mainSid = #{sid}
AND ssc.purchaseSystemName = #{purchaseSystemName} AND ssc.purchaseSystemName = #{purchaseSystemName}
@ -116,14 +128,17 @@
COUNT(*) num, COUNT(*) num,
SUM(ssc.estimateRebate) withRebate, SUM(ssc.estimateRebate) withRebate,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.uploadMoney) uploadMoney, SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
ssc.secondTreatCost + ssc.secondSuppCost) AS money, SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
SUM(ssc.stayDetermineMoney) stayDetermineMoney, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney, SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + SUM(IF(ssc.isAdjustment = '是',
ssc.secondTreatCost + ssc.secondSuppCost) - ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid} WHERE ssc.mainSid = #{sid}
AND ssc.purchaseSystemName = #{purchaseSystemName} AND ssc.purchaseSystemName = #{purchaseSystemName}

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

@ -2033,6 +2033,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
); );
qw.orderByDesc("createTime"); qw.orderByDesc("createTime");
List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw); List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
}
return scmVehRebateExcelVos; return scmVehRebateExcelVos;
} }
} }

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@ -134,9 +134,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
BeanUtil.copyProperties(datum,excelVo); BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i); excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
if ("比例".equals(datum.getCalculationModeValue())){ excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%"); excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
}
i = i + 1; i = i + 1;
excelVos.add(excelVo); excelVos.add(excelVo);
} }

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

@ -25,16 +25,19 @@
svc.brandName, svc.brandName,
svc.rebateTypeKey, svc.rebateTypeKey,
svc.rebateTypeValue, svc.rebateTypeValue,
SUM(svc.estimateRebate) withRebate, SUM(svc.estimateRebate) withRebate,
COUNT(*) num, COUNT(*) num,
GROUP_CONCAT(svc.vehRebateSid) vehRebateSid, GROUP_CONCAT(svc.vehRebateSid) vehRebateSid,
SUM(svc.uploadMoney) uploadMoney, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
SUM(svc.stayDetermineMoney) stayDetermineMoney, svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) - SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid} WHERE svc.mainSid = #{sid}
GROUP BY svc.rebateTypeKey, svc.brandSid, svc.purchaseSystemSid GROUP BY svc.rebateTypeKey, svc.brandSid, svc.purchaseSystemSid
@ -46,16 +49,19 @@
svc.brandName, svc.brandName,
svc.palceGenDate, svc.palceGenDate,
svc.withholdingDate, svc.withholdingDate,
SUM(svc.estimateRebate) withRebate, SUM(svc.estimateRebate) withRebate,
COUNT(*) num, COUNT(*) num,
GROUP_CONCAT(svc.vehRebateSid) vehRebateSid, GROUP_CONCAT(svc.vehRebateSid) vehRebateSid,
SUM(svc.uploadMoney) uploadMoney, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
SUM(svc.stayDetermineMoney) stayDetermineMoney, svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(svc.adjustmentMoney) adjustmentMoney, SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) - SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid} WHERE svc.mainSid = #{sid}
GROUP BY svc.withholdingDate, svc.brandSid, svc.purchaseSystemSid GROUP BY svc.withholdingDate, svc.brandSid, svc.purchaseSystemSid
@ -72,16 +78,21 @@
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo"> resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo">
SELECT svc.purchaseSystemName, SELECT svc.purchaseSystemName,
svc.brandName, svc.brandName,
CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计') title, CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计') title,
COUNT(*) numTotal, COUNT(*) numTotal,
SUM(svc.estimateRebate) withRebateTotal, SUM(svc.estimateRebate) withRebateTotal,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCostTotal, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCostTotal,
SUM(svc.uploadMoney) uploadMoneyTotal, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) moneyTotal, svc.uploadMoney +
SUM(svc.stayDetermineMoney) stayDetermineMoneyTotal, svc.secondaryUploadMoney)) uploadMoneyTotal,
SUM(svc.adjustmentMoney) adjustmentMoneyTotal, SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) - svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) moneyTotal,
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoneyTotal SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
stayDetermineMoneyTotal,
SUM(svc.adjustmentMoney) adjustmentMoneyTotal,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoneyTotal
FROM scm_vehrebate_checkapplydetail svc FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid} WHERE svc.mainSid = #{sid}
GROUP BY svc.brandSid, svc.purchaseSystemSid GROUP BY svc.brandSid, svc.purchaseSystemSid
@ -89,18 +100,21 @@
<select id="fetchByMainSidType" <select id="fetchByMainSidType"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo"> resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo">
SELECT GROUP_CONCAT(svc.vehRebateSid) sid, SELECT GROUP_CONCAT(svc.vehRebateSid) sid,
CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细') title, CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细') title,
svc.rebateTypeValue, svc.rebateTypeValue,
COUNT(*) num, COUNT(*) num,
SUM(svc.estimateRebate) withRebate, SUM(svc.estimateRebate) withRebate,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.uploadMoney) uploadMoney, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money, svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(svc.stayDetermineMoney) stayDetermineMoney, SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
SUM(svc.adjustmentMoney) adjustmentMoney, svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) - SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid} WHERE svc.mainSid = #{sid}
AND svc.purchaseSystemName = #{purchaseSystemName} AND svc.purchaseSystemName = #{purchaseSystemName}
@ -110,18 +124,21 @@
<select id="fetchByMainSidDate" <select id="fetchByMainSidDate"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo"> resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo">
SELECT GROUP_CONCAT(svc.vehRebateSid) sid, SELECT GROUP_CONCAT(svc.vehRebateSid) sid,
CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细') title, CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细') title,
svc.withholdingDate, svc.withholdingDate,
COUNT(*) num, COUNT(*) num,
SUM(svc.estimateRebate) withRebate, SUM(svc.estimateRebate) withRebate,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.uploadMoney) uploadMoney, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money, svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(svc.stayDetermineMoney) stayDetermineMoney, SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
SUM(svc.adjustmentMoney) adjustmentMoney, svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) - SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid} WHERE svc.mainSid = #{sid}
AND svc.purchaseSystemName = #{purchaseSystemName} AND svc.purchaseSystemName = #{purchaseSystemName}

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

@ -122,9 +122,6 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
BeanUtil.copyProperties(datum,excelVo); BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i); excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
if ("比例".equals(datum.getCalculationModeValue())){
excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%");
}
i = i + 1; i = i + 1;
excelVos.add(excelVo); excelVos.add(excelVo);
} }

428
anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl

File diff suppressed because it is too large

2744
anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd1.ftl

File diff suppressed because it is too large

428
anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxhd.ftl

File diff suppressed because it is too large
Loading…
Cancel
Save