Skip to content

P
PropertyEdu
Commit 6769d7ac authored by liudong1993's avatar liudong1993
Browse files
Options

调整

parent 537b4191
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 71 deletions
Property.Common/Enum/Property/PropertyFlowEnum.cs
View file @ 6769d7ac
......@@ -58,9 +58,9 @@ namespace REBORN.Common.Enum
[EnumField("变更领用人")]
Change = 10,
/// <summary>
/// 入库
/// 入库 2021-04-15 ld 暂时屏蔽 这是入库审核流程（电商作废的）
/// </summary>
[EnumField("耗材入库")]
StockIn = 11
//[EnumField("耗材入库")]
//StockIn = 11
}
}
Property.DataHelper/Import/PropertyBetchDataHelper.cs
View file @ 6769d7ac
......@@ -82,9 +82,9 @@ namespace REBORN.DataHelper
{
model.UseMonths = Convert.ToInt32(dr["使用月份期限"].ToString().Trim());
}
if (dr.Table.Columns.Contains("所属公司") && !string.IsNullOrEmpty(dr["所属公司"].ToString().Trim()))
if (dr.Table.Columns.Contains("所属校区") && !string.IsNullOrEmpty(dr["所属校区"].ToString().Trim()))
{
model.BranchName = dr["所属公司"].ToString().Trim();
model.BranchName = dr["所属校区"].ToString().Trim();
}
if (dr.Table.Columns.Contains("供应商") && !string.IsNullOrEmpty(dr["供应商"].ToString().Trim()))
{
......
Property.Model/Entity/PropertyFlow/Rb_Workflow_Auditrecord.cs
View file @ 6769d7ac
......@@ -54,9 +54,9 @@ namespace Property.Model.Entity
set;
}
/// <summary>
/// 1请假 2出差 3 外出 4 补卡
/// 0资产 1耗材
/// </summary>
public WFTTemplateTypeEnum? TemplateType
public int? TemplateType
{
get;
set;
......
Property.Model/Entity/PropertyFlow/Rb_Workflow_CopyToPeople.cs
View file @ 6769d7ac
......@@ -37,9 +37,9 @@ namespace Property.Model.Entity
set;
}
/// <summary>
/// 1请假 2出差 3 外出 4 补卡
/// 0资产 1耗材
/// </summary>
public WFTTemplateTypeEnum? TemplateType
public int? TemplateType
{
get;
set;
......
Property.Modele.FixedAssets/PropertyModule.cs
View file @ 6769d7ac
......@@ -498,7 +498,7 @@ namespace Property.Module.FixedAssets
//公司
var bModel= blist.Where(x => x.SName.Contains(item.BranchName)).FirstOrDefault();
if (bModel == null) {
return ApiResult.ParamIsNull("ID:" + item.Id + ",资产名称:" + item.Name + ",领用人:" + item.EmName + " 未匹配到公司信息！请修改此条数据后再试");
return ApiResult.ParamIsNull("ID:" + item.Id + ",资产名称:" + item.Name + ",领用人:" + item.EmName + " 未匹配到校区信息！请修改此条数据后再试");
}
item.BranchId = bModel.SId;
//分类
......@@ -2131,7 +2131,7 @@ namespace Property.Module.FixedAssets
//获取流程相关信息
List<Rb_Workflow_AuditRelevance_Extend> warlist = workflow_AuditRelevanceRepository.GetAuditRelevanceList(dmodel.Id);
List<Rb_Workflow_Auditrecord_Extend> walist = new List<Rb_Workflow_Auditrecord_Extend>();
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = dmodel.Id });
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = dmodel.Id, TemplateType = 0 });
dmodel.DetailList = urlist.Where(x => x.ReceiveId == dmodel.Id).ToList();
......@@ -2305,7 +2305,7 @@ namespace Property.Module.FixedAssets
List<Rb_Workflow_Auditrecord_Extend> walist = new List<Rb_Workflow_Auditrecord_Extend>();
if (Type == 1)
{
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { FrIdStr = rstr });
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { FrIdStr = rstr, TemplateType = 0 });
}
foreach (var item in list)
......@@ -2384,7 +2384,7 @@ namespace Property.Module.FixedAssets
List<Rb_Workflow_Auditrecord_Extend> walist = new List<Rb_Workflow_Auditrecord_Extend>();
if (Type == 1)
{
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { FrIdStr = rstr });
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { FrIdStr = rstr, TemplateType = 0 });
}
foreach (var item in list)
......
Property.Modele.FixedAssets/SuppliesModule.cs
View file @ 6769d7ac
......@@ -3404,7 +3404,7 @@ namespace Property.Module.FixedAssets
//获取流程相关信息
List<Rb_Workflow_AuditRelevance_Extend> warlist = workflow_AuditRelevanceRepository.GetAuditRelevanceList(dmodel.Id, "", null, 1);
List<Rb_Workflow_Auditrecord_Extend> walist = new List<Rb_Workflow_Auditrecord_Extend>();
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = dmodel.Id });
walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = dmodel.Id, TemplateType = 1 });
//流程
dmodel.AuditSteps = new List<Rb_Workflow_AuditRelevance_Extend>();
......
Property.Repository/PropertyFlow/Rb_Workflow_AuditrecordRepository.cs
View file @ 6769d7ac
......@@ -22,13 +22,17 @@ namespace Property.Repository
/// </summary>
/// <param name="WorkFlowId"></param>
/// <returns></returns>
public List<Rb_Workflow_Auditrecord_Extend> GetAuditRecordList(int WorkFlowId)
public List<Rb_Workflow_Auditrecord_Extend> GetAuditRecordList(int WorkFlowId, int TemplateType)
{
string where = $@" where 1=1 ";
if (WorkFlowId > 0)
{
where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.WorkFlowId) }={WorkFlowId}";
}
if (TemplateType >= 0)
{
where += $@" and ar.{nameof(Rb_Workflow_AuditRelevance.TemplateType) }={TemplateType}";
}
string sql = $@"SELECT ar.* from rb_workflow_auditrecord ar {where}";
return Get<Rb_Workflow_Auditrecord_Extend>(sql).ToList();
}
......@@ -55,9 +59,9 @@ namespace Property.Repository
{
where += $@" and ar.{nameof(Rb_Workflow_Auditrecord.WorkFlowId) } in({model.FrIdStr})";
}
if (model.TemplateType > 0)
if (model.TemplateType >= 0)
{
where += $@" and ar.{nameof(Rb_Workflow_Auditrecord.TemplateType)}={(int)model.TemplateType}";
where += $@" and ar.{nameof(Rb_Workflow_Auditrecord.TemplateType)}={model.TemplateType}";
}
if (model.AuditId > 0)
{
......
Property.Repository/PropertyFlow/Rb_Workflow_CopyToPeopleRepository.cs
View file @ 6769d7ac
......@@ -16,9 +16,9 @@ namespace Property.Repository
/// </summary>
/// <param name="WorkFlowId"></param>
/// <returns></returns>
public List<Rb_Workflow_CopyToPeople_Extend> GetCopyToPeopleList(int WorkFlowId)
public List<Rb_Workflow_CopyToPeople_Extend> GetCopyToPeopleList(int WorkFlowId, int TemplateType)
{
string where = $@" where 1=1 and c.{nameof(Rb_Workflow_CopyToPeople.WorkFlowId)}={WorkFlowId} ";
string where = $@" where 1=1 and c.{nameof(Rb_Workflow_CopyToPeople.WorkFlowId)}={WorkFlowId} and c.{nameof(Rb_Workflow_CopyToPeople.TemplateType)}={TemplateType} ";
return Get<Rb_Workflow_CopyToPeople_Extend>($@" select c.* from Rb_Workflow_CopyToPeople c {where}").ToList();
}
}
......
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @ 6769d7ac
......@@ -1166,7 +1166,7 @@ namespace Property.WebApi.Controllers.User
{
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"领取单号"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"公司名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"校区名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"部门名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"领用人"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"领取日期"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -1321,7 +1321,7 @@ namespace Property.WebApi.Controllers.User
if ((demodel.BranchId ?? -1) < -1)
{
return ApiResult.ParamIsNull("请选择公司别");
return ApiResult.ParamIsNull("请选择校区");
}
if (demodel.WeekdayList == null || !demodel.WeekdayList.Any())
{
......@@ -1364,7 +1364,7 @@ namespace Property.WebApi.Controllers.User
//验证公司别是否重复
if (suppliesModule.ValidateBranch(demodel, userInfo))
{
return ApiResult.Failed("该公司已存在记录，无法新增");
return ApiResult.Failed("该校区已存在记录，无法新增");
}
demodel.CreateBy = userInfo.EmployeeId;
......
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