liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat' into 'master'

Browse Source 
修改实体

See merge request eshop/biz_service_ebtp_project!64
This commit is contained in:
付庆吉
2022-06-25 14:41:26 +08:00
parent 05ee0d1f89 ba03f227cc
commit 4eaf098d53
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,9 @@ public class PurpMaterialVO {
@ApiModelProperty(value = "需求数量") @ApiModelProperty(value = "需求数量")
private BigDecimal inRequNum; private BigDecimal inRequNum;
@ApiModelProperty(value = "需求数量")
private BigDecimal requNum;
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")
private String unit; private String unit;

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

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