From 4cc4275216cc7128645e25062c0ba92cdb375e51 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 22 May 2024 11:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=89=88-=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=89=A9=E8=B5=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ebpentity/ProjBaseInfoVO.java | 5 +- .../ProjQuoteModelMaterialRelVO.java | 101 ++++++++++++++++++ .../ebpentity/ProjStructureQuoteModelVO.java | 68 ++++++++++++ .../entity/ebpentity/PurpMaterialVO.java | 21 ++++ .../impl/ProjectRecordServiceImpl.java | 1 + .../entity/SectionMaterial.java | 3 + 6 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java index dcd725e..7542330 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java @@ -368,7 +368,7 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "是否启用结构化报价 0否；1是") private String isStructureQuote; - @ApiModelProperty(value = "结构化报价模型 001普通报价模型；002联动报价模型") + @ApiModelProperty(value = "结构化报价模型 001普通报价模型；002联动报价模型；003定额折扣报价模型;004非定额折扣报价模型 ") private String structureQuoteModel; @ApiModelProperty(value = "结构化报价限价类型 001总价限制；002单价+总价限制；003总价+基准单价限制") @@ -389,6 +389,9 @@ public class ProjBaseInfoVO{ @ApiModelProperty("资格条件项列表") private List templateItemList; + @ApiModelProperty("方案报价模型关联关系") + private List quoteModelVOList; + @ApiModelProperty(value = "中标/中选数量-from") private String winFrom; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java new file mode 100644 index 0000000..747cfaa --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjQuoteModelMaterialRelVO.java @@ -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; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java new file mode 100644 index 0000000..ec12834 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjStructureQuoteModelVO.java @@ -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 modelMaterialRelVOList; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java index fd7eb50..4637a33 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java @@ -156,6 +156,27 @@ public class PurpMaterialVO { @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(value = "采购方式") private String purcMode; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 257024f..3a244c2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -907,6 +907,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl