修改竞拍委托物资实体

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java

@@ -9,9 +9,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -19,13 +20,13 @@ import java.util.Date;
  * </p>
  *
  * @author liuyx
- * @date 2020-10-06
  * @version V1.0
+ * @date 2020-10-06
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value="PurpMaterial对象", description="项目物料表")
+@ApiModel(value = "PurpMaterial对象", description = "项目物料表")
-public class PurpMaterialVO{
+public class PurpMaterialVO {
 
 
     @ApiModelProperty(value = "采购处置内容主键")
@@ -96,7 +97,7 @@ public class PurpMaterialVO{
     private String inventId;
 
     @ApiModelProperty(value = "商品SKU")
-    private String goodsSKU;
+    private String goodsSku;
 
     @ApiModelProperty(value = "库龄")
     private String libraryAge;
@@ -114,7 +115,7 @@ public class PurpMaterialVO{
     private BigDecimal num;
 
     @ApiModelProperty(value = "需求数量")
-    private BigDecimal requNum;
+    private BigDecimal inRequNum;
 
     @ApiModelProperty(value = "单位")
     private String unit;
@@ -132,17 +133,24 @@ public class PurpMaterialVO{
     private BigDecimal totalStartAmt;
 
     @ApiModelProperty(value = "统一目录名称")
-    private String uniftCatalogName;
+    private String unifDirecName;
 
     @ApiModelProperty(value = "统一目录编码")
-    private String uniftCatalogCode;
+    private String unifDirecCode;
-	
+
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "资产价值")
+    private BigDecimal assetVal;
+
+    @ApiModelProperty(value = "采购方式")
+    private String purcMode;
+
     @ApiModelProperty(value = "最后更新时间戳")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastUpdateTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime lastUpdateTime;
 
     @ApiModelProperty(value = "备用字段1")
     private String attribute1;
@@ -158,4 +166,64 @@ public class PurpMaterialVO{
 
     @ApiModelProperty(value = "备用字段5")
     private String attribute5;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty("编辑人")
+    private String updateBy;
+
+    @ApiModelProperty("编辑时间")
+    private LocalDateTime updateDate;
+
+    @ApiModelProperty("逻辑删除")
+    private String deleteFlag;
+
+    @ApiModelProperty(value = "剩余数量")
+    private BigDecimal unDealNum;
+
+    @ApiModelProperty(value = "剩余金额")
+    private BigDecimal unBudgetAmt;
+
+    @ApiModelProperty(value = "引用金额")
+    private BigDecimal inBudgetAmt;
+
+    @ApiModelProperty(value = "剩余预计预算金额（含税）元")
+    private BigDecimal supplyBudgetAmt;
+
+    @ApiModelProperty(value = "引用预计预算金额（含税)元")
+    private BigDecimal inBudgetAmtTax;
+
+    @ApiModelProperty(value = "库存名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "库存编码")
+    private String categoryCode;
+
+    @ApiModelProperty(value = "仓库名称")
+    private String depotName;
+
+    @ApiModelProperty(value = "仓库编号")
+    private String depotId;
+
+    @ApiModelProperty(value = "产品id")
+    private String goodsNo;
+
+    @ApiModelProperty(value = "库存数量")
+    private BigDecimal storeNums;
+
+    @ApiModelProperty(value = "冻结数量")
+    private BigDecimal frozenNum;
+
+    @ApiModelProperty(value = "处置价格")
+    private BigDecimal decimalPrice;
+
+    @ApiModelProperty(value = "供应商编号")
+    private String supplierNo;
+
+    @ApiModelProperty(value = "供应商")
+    private String supplier;
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java

@@ -845,7 +845,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
                 material.setDemandName(purpMaterialVO.getRequName());
                 material.setMaterialExplain(purpMaterialVO.getMaterialDesc());
                 material.setMaterialTypeName(purpMaterialVO.getMaterialCategoryName());
-                material.setProcurementCount(purpMaterialVO.getRequNum());
+                material.setProcurementCount(purpMaterialVO.getInRequNum());
                 material.setMaterialUnit(purpMaterialVO.getUnit());
                 material.setBasePrice(purpMaterialVO.getUnitAmt());
                 resultList.add(material);