From 8fbb4f7518b76af3dc9655f1ca8d73091fd739d7 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 26 Dec 2024 16:50:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateDetailsVo.java | 40 ++++++------- .../ScmVehRebateWithDetailsVo.java | 10 ++-- .../AppSpecialRebateWithApplyDetailsVo.java | 7 +++ .../AppSpecialrebateCheckapplyDetailsVo.java | 10 +++- .../AppSpecialrebateCheckapplyFeign.java | 1 - ...pecialrebateCheckapplydetailDetailsVo.java | 4 ++ .../AppSpecialRebateDisGetVehVo.java | 4 +- .../AppSpecialrebatedistributeDetailsVo.java | 14 +++-- .../AppVehRebateDetailsVo.java | 60 ++++++++++--------- .../AppVehrebateCheckapplyDetailsVo.java | 4 ++ ...AppVehrebateCheckapplydetailDetailsVo.java | 4 ++ .../AppVehRebateDetailsVo.java | 60 ++++++++++--------- .../AppVehRebateWithApplyDetailsVo.java | 7 +++ .../AppVehRebateWithDetailsVo.java | 4 ++ 14 files changed, 134 insertions(+), 95 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java index 2f6fca4d14..2e9e0e4aac 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java @@ -62,37 +62,37 @@ public class ScmSpecialRebateDetailsVo implements Vo { private Date createTime; // 创建日期 @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("计算标准") + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("费用") + @ApiModelProperty("费用") private String money; // 费用 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; @@ -152,13 +152,13 @@ public class ScmSpecialRebateDetailsVo implements Vo { @ApiModelProperty("抵顶费用调整金额") private BigDecimal suppAdjustmentMoney; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java index 0945ca675c..3cdc8e9449 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java @@ -60,7 +60,7 @@ public class ScmVehRebateWithDetailsVo implements Vo { private String brandName; @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("预提返利") + @ApiModelProperty("预提返利") private BigDecimal withRebate; // 预提返利 @ApiModelProperty("预计待支付费用") private BigDecimal expectTreatCost; @@ -68,15 +68,15 @@ public class ScmVehRebateWithDetailsVo implements Vo { private BigDecimal expectSuppCost; @ApiModelProperty("台数") private String num; // 台数 - @ApiModelProperty("单车返利sid") + @ApiModelProperty("单车返利sid") private String vehRebateSid; // 单车返利sid @ApiModelProperty("单车返利sid") private List vehRebateSids; // 单车返利sid - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("单车返利预提申请sid") + @ApiModelProperty("单车返利预提申请sid") private String mainSid; // 单车返利预提申请sid } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java index c43f91bafd..ba7bcf76ee 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java @@ -26,11 +26,13 @@ package com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -52,6 +54,11 @@ public class AppSpecialRebateWithApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("申请部门名称") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java index 95cb5fea86..4bc0f486b3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java @@ -54,20 +54,24 @@ public class AppSpecialrebateCheckapplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("核对申请标题") private String checkApply; @ApiModelProperty("申请部门名称") private String deptName; @ApiModelProperty("创建人姓名") private String createByName; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInsId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("按返利类型统计") private List scmWhenSpecialrebateCheckapplydetailDetails; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java index dd22f2dcfa..5392efbbcb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java @@ -19,7 +19,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppSpecialrebateCheckapply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java index 8d54a8d754..8861bb6d90 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java @@ -52,6 +52,10 @@ public class AppSpecialrebateCheckapplydetailDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 @ApiModelProperty("返利类型value") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialRebateDisGetVehVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialRebateDisGetVehVo.java index 917b685dd1..e02375c823 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialRebateDisGetVehVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialRebateDisGetVehVo.java @@ -37,7 +37,7 @@ import java.util.Date; @Data public class AppSpecialRebateDisGetVehVo implements Query { - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String modelName; // 车型名称 @ApiModelProperty("车架号") private String vinNo; @@ -50,6 +50,6 @@ public class AppSpecialRebateDisGetVehVo implements Query { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date salesDate; @ApiModelProperty(value = "买断日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date solidDate; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeDetailsVo.java index 9450839acb..8899bb04bc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeDetailsVo.java @@ -55,24 +55,26 @@ public class AppSpecialrebatedistributeDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门名称") private String deptName; @ApiModelProperty("申请人") private String createByName; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; @ApiModelProperty("创建组织名称") private String createOrgName; - @ApiModelProperty("分配申请") + @ApiModelProperty("分配申请") private String title; - @ApiModelProperty("预提返利合计") + @ApiModelProperty("预提返利合计") private BigDecimal estimateRebateTotal; - @ApiModelProperty("上传总金额") + @ApiModelProperty("上传总金额") private BigDecimal uploadMoneyTotal; - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInsId; - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; @ApiModelProperty("分配申请的专项返利列表") private List scmSpecialrebatedistributedetails; // 分配申请的专项返利列表 diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehRebateDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehRebateDetailsVo.java index a11f16b4e5..10a3ece228 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehRebateDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehRebateDetailsVo.java @@ -63,59 +63,61 @@ public class AppVehRebateDetailsVo implements Vo { private Date createTime; // 创建日期 @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("车型sid") + @ApiModelProperty("车型sid") private String vehModelSid; // 车型sid - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String vehModelName; // 车型名称 - @ApiModelProperty("车辆sid") + @ApiModelProperty("车辆sid") private String vehSid; // 车辆sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private String manufactorSettlementPrice; // 厂家结算价 - @ApiModelProperty("运费") + @ApiModelProperty("运费") private String freight; // 运费 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("计算标准") + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("所属年月") + @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 @ApiModelProperty("待确定金额(动态)") private String stayDetermineMoney; @ApiModelProperty("待确定金额(常量)") private String stayDetermineMoneyNew; - @ApiModelProperty("费用") + @ApiModelProperty("费用") private String money; // 费用 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 - @ApiModelProperty("计算方式key") + @ApiModelProperty("计算方式key") private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") + @ApiModelProperty("计算方式Value") private String calculationModeValue; // 计算方式Value @ApiModelProperty("调整状态") private Integer adjustmentState; @@ -159,13 +161,13 @@ public class AppVehRebateDetailsVo implements Vo { @ApiModelProperty("抵顶费用调整金额") private BigDecimal suppAdjustmentMoney; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java index 4547d4bd15..cc2b69fd97 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java @@ -54,6 +54,10 @@ public class AppVehrebateCheckapplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("核对申请标题") private String checkApply; @ApiModelProperty("部门") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java index 3655e6a042..0ef485ca60 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java @@ -52,6 +52,10 @@ public class AppVehrebateCheckapplydetailDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("采购系统") + private String purchaseSystemName; @ApiModelProperty("返利类型value") private String rebateTypeValue; @ApiModelProperty("预提日期") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateDetailsVo.java index d218cd00cb..41cdedf943 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateDetailsVo.java @@ -63,59 +63,61 @@ public class AppVehRebateDetailsVo implements Vo { private Date createTime; // 创建日期 @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("车型sid") + @ApiModelProperty("车型sid") private String vehModelSid; // 车型sid - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String vehModelName; // 车型名称 - @ApiModelProperty("车辆sid") + @ApiModelProperty("车辆sid") private String vehSid; // 车辆sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private String manufactorSettlementPrice; // 厂家结算价 - @ApiModelProperty("运费") + @ApiModelProperty("运费") private String freight; // 运费 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("计算标准") + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("所属年月") + @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 @ApiModelProperty("待确定金额(动态)") private String stayDetermineMoney; @ApiModelProperty("待确定金额(常量)") private String stayDetermineMoneyNew; - @ApiModelProperty("费用") + @ApiModelProperty("费用") private String money; // 费用 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 - @ApiModelProperty("计算方式key") + @ApiModelProperty("计算方式key") private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") + @ApiModelProperty("计算方式Value") private String calculationModeValue; // 计算方式Value @ApiModelProperty("调整状态") private Integer adjustmentState; @@ -159,13 +161,13 @@ public class AppVehRebateDetailsVo implements Vo { @ApiModelProperty("抵顶费用调整金额") private BigDecimal suppAdjustmentMoney; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java index 88711629b3..4e0832e239 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java @@ -26,11 +26,13 @@ package com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -52,6 +54,11 @@ public class AppVehRebateWithApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("创建日期") + private Date createTime; @ApiModelProperty("部门") private String deptName; @ApiModelProperty("创建组织名称") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java index e5c8e036a3..b3e8bb61f9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java @@ -53,6 +53,10 @@ public class AppVehRebateWithDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; @ApiModelProperty("返利类型value") private String rebateTypeValue; @ApiModelProperty("台数")