Skip to content

P
Property
Commit 628a9cec authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 8fcbc83e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Property.Common/Enum/Property/PropertyFlowEnum.cs
View file @ 628a9cec
...@@ -60,7 +60,7 @@ namespace REBORN.Common.Enum ...@@ -60,7 +60,7 @@ namespace REBORN.Common.Enum
/// <summary> /// <summary>
/// 入库 /// 入库
/// </summary> /// </summary>
[EnumField("入库")] [EnumField("耗材入库")]
StockIn = 11 StockIn = 11
} }
} }
Property.Modele.FixedAssets/SuppliesModule.cs
View file @ 628a9cec
...@@ -3226,7 +3226,7 @@ namespace Property.Module.FixedAssets ...@@ -3226,7 +3226,7 @@ namespace Property.Module.FixedAssets
//获取流程模板 //获取流程模板
var tempmodel = workflow_TemplateRepository.GetEntity(dmodel.TempleteId ?? 0); var tempmodel = workflow_TemplateRepository.GetEntity(dmodel.TempleteId ?? 0);
dmodel.TemplateName = tempmodel.Name; dmodel.TemplateName = tempmodel?.Name ?? "未启用流程";
//获取流程相关信息 //获取流程相关信息
List<Rb_Workflow_AuditRelevance_Extend> warlist = workflow_AuditRelevanceRepository.GetAuditRelevanceList(dmodel.Id, "", null, 1); List<Rb_Workflow_AuditRelevance_Extend> warlist = workflow_AuditRelevanceRepository.GetAuditRelevanceList(dmodel.Id, "", null, 1);
......
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