Commit e686711e by “zcwang”

modify: 引用工单返回供应商名称

parent b84da93f
......@@ -934,14 +934,24 @@ public class ChangeFlowBiz {
if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
Assert.isTrue(changeRecord.getCreateSupplier().equals(supplier), "不能引用非本供应商工单");
}
String changeSupplier = changeRecord.getChangeSupplier();
String changeSupplierName = "";
if (StringUtils.isNotBlank(changeSupplier)) {
List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
if (CollectionUtils.isNotEmpty(supplierSimple)) {
SupplierSimpleRsp supplierInfo = supplierSimple.get(0);
changeSupplierName = supplierInfo.getSupplierName();
}
}
// 获取附件
List<ChangeFlowFile> changeFileList = changeFileService.getChangeFileList(changeRecord.getId());
return BasicChangeFlowVO.builder().parentChangeClassId(changeRecord.getParentChangeClassId())
.sonChangeClassId(changeRecord.getSonChangeClassId()).changeSubject(changeRecord.getChangeSubject())
.changeItem(changeRecord.getChangeItem()).changeSupplier(changeRecord.getChangeSupplier())
.changeReason(changeRecord.getChangeReason()).changeContent(changeRecord.getChangeContent())
.changeRiskDesc(changeRecord.getChangeRiskDesc()).changeProfit(changeRecord.getChangeProfit())
.changeProfitDesc(changeRecord.getChangeProfitDesc()).files(changeFileList).build();
.sonChangeClassId(changeRecord.getSonChangeClassId()).changeSubject(changeRecord.getChangeSubject())
.changeItem(changeRecord.getChangeItem()).changeSupplier(changeSupplier)
.changeSupplierName(changeSupplierName).changeReason(changeRecord.getChangeReason())
.changeContent(changeRecord.getChangeContent()).changeRiskDesc(changeRecord.getChangeRiskDesc())
.changeProfit(changeRecord.getChangeProfit()).changeProfitDesc(changeRecord.getChangeProfitDesc())
.files(changeFileList).build();
}
public ChangeFlowVO detail(Long flowId) {
......
......@@ -52,6 +52,11 @@ public class BasicChangeFlowVO {
private String changeSupplier;
/**
* 变更供应商详情展示,供应商名称
*/
private String changeSupplierName;
/**
* 变更原因
*/
private String changeReason;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment