联动报价-第二版-加项目中心物资id

This commit is contained in:
yss
2024-05-22 11:02:18 +08:00
parent 41d37cf24d
commit 4cc4275216
6 changed files with 198 additions and 1 deletions

View File

@ -368,7 +368,7 @@ public class ProjBaseInfoVO{
@ApiModelProperty(value = "是否启用结构化报价 0否1是") @ApiModelProperty(value = "是否启用结构化报价 0否1是")
private String isStructureQuote; private String isStructureQuote;
@ApiModelProperty(value = "结构化报价模型 001普通报价模型002联动报价模型") @ApiModelProperty(value = "结构化报价模型 001普通报价模型002联动报价模型003定额折扣报价模型;004非定额折扣报价模型 ")
private String structureQuoteModel; private String structureQuoteModel;
@ApiModelProperty(value = "结构化报价限价类型 001总价限制002单价+总价限制003总价+基准单价限制") @ApiModelProperty(value = "结构化报价限价类型 001总价限制002单价+总价限制003总价+基准单价限制")
@ -389,6 +389,9 @@ public class ProjBaseInfoVO{
@ApiModelProperty("资格条件项列表") @ApiModelProperty("资格条件项列表")
private List<BizQualifyConditionItem> templateItemList; private List<BizQualifyConditionItem> templateItemList;
@ApiModelProperty("方案报价模型关联关系")
private List<ProjStructureQuoteModelVO> quoteModelVOList;
@ApiModelProperty(value = "中标/中选数量-from") @ApiModelProperty(value = "中标/中选数量-from")
private String winFrom; private String winFrom;

View File

@ -0,0 +1,101 @@
package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @description: caiqq
* @author: caiqq
* @create: 2024-05-10 10:45
**/
@Getter
@Setter
@Accessors(chain = true)
@ApiModel(value = "ProjQuoteModelMaterialRelVO对象", description = "报价模型物料关联表")
public class ProjQuoteModelMaterialRelVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("方案id")
private Long projId;
@ApiModelProperty("报价模型id")
private Long quoteModelId;
@ApiModelProperty("建项物料行id")
private Long purpMaterialId;
@ApiModelProperty(value = "需求单id")
private Long requId;
@ApiModelProperty(value = "需求单物料行id")
private Long materialId;
@ApiModelProperty(value = "建项物料是否已删除0否1是")
private String purpMaterialIsDeleted;
@ApiModelProperty(value = "物料编码")
private String materialCode;
@ApiModelProperty(value = "物资说明")
private String materialDesc;
@ApiModelProperty(value = "规格型号")
private String specModel;
@ApiModelProperty(value = "需求数量")
private BigDecimal inRequNum;
@ApiModelProperty(value = "计量单位")
private String unit;
@ApiModelProperty(value = "单项不含税最高限价")
private BigDecimal singlePriceCeiling;
@ApiModelProperty(value = "基准价单价限制")
private BigDecimal basePriceUnitLimit;
@ApiModelProperty(value = "单位联动系数类型001固定联动002区间联动")
private String linkageCoefficientType;
@ApiModelProperty(value = "单位联动系数")
private String linkageCoefficient;
@ApiModelProperty(value = "折扣系数最高限制")
private BigDecimal maxDiscountFactorLimit;
@ApiModelProperty(value = "是否基准价项1是0否")
private String basePriceItemFlag;
@ApiModelProperty(value = "税率")
private BigDecimal taxRate;
@ApiModelProperty(value = "权重")
private BigDecimal featureWeight;
@ApiModelProperty("切割状态 0:切割数据 1新数据")
private Integer cutoverStatus;
@ApiModelProperty("租户名称")
private String tenantName;
@ApiModelProperty("备用字段1")
private String attribute1;
@ApiModelProperty("备用字段2")
private String attribute2;
@ApiModelProperty("备用字段3")
private String attribute3;
@ApiModelProperty("备用字段4")
private String attribute4;
@ApiModelProperty("备用字段5")
private String attribute5;
}

View File

@ -0,0 +1,68 @@
package com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @description: caiqq
* @author: caiqq
* @create: 2024-05-10 10:42
**/
@Getter
@Setter
@Accessors(chain = true)
@ApiModel(value = "ProjStructureQuoteModelVO", description = "方案报价模型关联表")
public class ProjStructureQuoteModelVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("方案id")
private Long projId;
@ApiModelProperty("报价模型 001普通报价模型;002联动报价模型;003定额折扣报价模型;004非定额折扣报价模型")
private String structureQuoteModel;
@ApiModelProperty("模型名称")
private String structureQuoteModelName;
@ApiModelProperty("税率是否可偏离项:1是0否")
private String taxDeviationFlag;
@ApiModelProperty("规格型号是否可偏离项:1是0否")
private String specModelFlexibilityFlag;
@ApiModelProperty("报价小数位数限制")
private Integer decimalScaleLimit;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("切割状态 0:切割数据 1新数据")
private Integer cutoverStatus;
@ApiModelProperty("租户名称")
private String tenantName;
@ApiModelProperty("备用字段1")
private String attribute1;
@ApiModelProperty("备用字段2")
private String attribute2;
@ApiModelProperty("备用字段3")
private String attribute3;
@ApiModelProperty("备用字段4")
private String attribute4;
@ApiModelProperty("备用字段5")
private String attribute5;
@ApiModelProperty("报价模型物料关联关系")
private List<ProjQuoteModelMaterialRelVO> modelMaterialRelVOList;
}

View File

@ -156,6 +156,27 @@ public class PurpMaterialVO {
@ApiModelProperty(value = "单项不含税最高限价") @ApiModelProperty(value = "单项不含税最高限价")
private BigDecimal singlePriceCeiling; private BigDecimal singlePriceCeiling;
@ApiModelProperty(value = "基准价单价限制")
private BigDecimal basePriceUnitLimit;
@ApiModelProperty(value = "单位联动系数类型001固定联动002区间联动")
private String linkageCoefficientType;
@ApiModelProperty(value = "单位联动系数")
private String linkageCoefficient;
@ApiModelProperty(value = "折扣系数最高限制")
private BigDecimal maxDiscountFactorLimit;
@ApiModelProperty(value = "是否基准价项1是0否")
private String basePriceItemFlag;
@ApiModelProperty(value = "税率")
private BigDecimal taxRate;
@ApiModelProperty(value = "权重")
private BigDecimal featureWeight;
@ApiModelProperty(value = "采购方式") @ApiModelProperty(value = "采购方式")
private String purcMode; private String purcMode;

View File

@ -907,6 +907,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
for(PurpMaterialVO purpMaterialVO:purpMaterialVOList){ for(PurpMaterialVO purpMaterialVO:purpMaterialVOList){
SectionMaterial material = new SectionMaterial(); SectionMaterial material = new SectionMaterial();
material.setId(PropertyUtils.getSnowflakeId()); material.setId(PropertyUtils.getSnowflakeId());
material.setPurpMaterialId(purpMaterialVO.getId());
material.setProjectId(projectId); material.setProjectId(projectId);
material.setSectionId(sectionId); material.setSectionId(sectionId);
material.setDemandId(purpMaterialVO.getRequId()); material.setDemandId(purpMaterialVO.getRequId());

View File

@ -134,4 +134,7 @@ public class SectionMaterial extends BaseEntity implements Serializable {
@ApiModelProperty(value = "单项不含税最高限价") @ApiModelProperty(value = "单项不含税最高限价")
private BigDecimal maxPriceCeiling; private BigDecimal maxPriceCeiling;
@ApiModelProperty(value = "项目中心物料id")
private String purpMaterialId;
} }