Skip to content

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

调整

parent 537b4191
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.Modele.FixedAssets/WorkFlowModule.cs
View file @ 6769d7ac
......@@ -333,7 +333,7 @@ namespace Property.Module.FixedAssets
AuditEmIds.Add(item);
}
AuditEmIds = AuditEmIds.Distinct().ToList();
InsertBatcheAuditRecord2(newList, useReceiveId, trans, auditRelevance);
InsertBatcheAuditRecord2(newList, useReceiveId, trans, auditRelevance, TemplateType);
if (auditRelevanceList.LastOrDefault().Id == auditRelevance.Id)
{
//最后一步了 执行操作
......@@ -358,7 +358,7 @@ namespace Property.Module.FixedAssets
if (auditRelevance.AuditWay == WFTAuditWayEnum.Countersign)
{
//会签
InsertBatcheAuditRecord3(newList, AuditEmId, 1, useReceiveId, trans, auditRelevance, oldAuditEmIds);
InsertBatcheAuditRecord3(newList, AuditEmId, 1, useReceiveId, trans, auditRelevance, oldAuditEmIds, TemplateType);
#region 添加抄送人
List<Rb_Workflow_Audituser_Extend> aduitUserList = workflow_AuditUserRepository.GetDefaultAuditUser(conditionModel.Id);
if (aduitUserList.Count > 0)
......@@ -374,7 +374,7 @@ namespace Property.Module.FixedAssets
ReadStauts = 1,
Stauts = WFRrocessStatus.NotAudit,
WorkFlowId = useReceiveId,
TemplateType = 0
TemplateType = TemplateType
};
copyToPeopleList.Add(copyToPeople);
}
......@@ -391,7 +391,7 @@ namespace Property.Module.FixedAssets
AuditEmIds.Add(item);
}
AuditEmIds = AuditEmIds.Distinct().ToList();
InsertBatcheAuditRecord3(newList, AuditEmId, 2, useReceiveId, trans, auditRelevance, oldAuditEmIds);
InsertBatcheAuditRecord3(newList, AuditEmId, 2, useReceiveId, trans, auditRelevance, oldAuditEmIds, TemplateType);
if (auditRelevanceList.LastOrDefault().Id == auditRelevance.Id)
{
//通过了 需要更新资产状态
......@@ -405,7 +405,7 @@ namespace Property.Module.FixedAssets
}
else
{
InsertBatcheAuditRecord(newList, useReceiveId, trans, auditRelevance);
InsertBatcheAuditRecord(newList, useReceiveId, trans, auditRelevance, TemplateType);
#region 添加抄送人
List<Rb_Workflow_Audituser_Extend> aduitUserList = workflow_AuditUserRepository.GetDefaultAuditUser(conditionModel.Id);
if (aduitUserList.Count > 0)
......@@ -419,7 +419,7 @@ namespace Property.Module.FixedAssets
ReadStauts = 1,
Stauts = WFRrocessStatus.NotAudit,
WorkFlowId = useReceiveId,
TemplateType = 0
TemplateType = TemplateType
};
copyToPeopleList.Add(copyToPeople);
}
......@@ -431,7 +431,7 @@ namespace Property.Module.FixedAssets
}
else
{
InsertBatcheAuditRecord(newList, useReceiveId, trans, auditRelevance);
InsertBatcheAuditRecord(newList, useReceiveId, trans, auditRelevance, TemplateType);
#region 添加抄送人
List<Rb_Workflow_Audituser_Extend> aduitUserList = workflow_AuditUserRepository.GetDefaultAuditUser(conditionModel.Id);
if (aduitUserList.Count > 0)
......@@ -445,7 +445,7 @@ namespace Property.Module.FixedAssets
ReadStauts = 1,
Stauts = WFRrocessStatus.NotAudit,
WorkFlowId = useReceiveId,
TemplateType = 0
TemplateType = TemplateType
};
copyToPeopleList.Add(copyToPeople);
}
......@@ -577,7 +577,7 @@ namespace Property.Module.FixedAssets
{
AuditEmIds = new List<int>();
//历史审批人
AuditEmIds = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = wfId, AuditStatus = WFRrocessStatus.AuditThrough })?.Select(x => x.AuditEmId.Value).ToList();
AuditEmIds = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = wfId, TemplateType= TeamplateType, AuditStatus = WFRrocessStatus.AuditThrough })?.Select(x => x.AuditEmId.Value).ToList();
//制单人
AuditEmIds.Add(CreateBy);
AuditEmIds.Add(AuditEmId);
......@@ -725,7 +725,7 @@ namespace Property.Module.FixedAssets
}
AuditEmIds = AuditEmIds.Distinct().ToList();
var auditRelevanceList = GetAuditRelevanceList(wfId, TeamplateType).OrderBy(x => x.Sort).ToList();
InsertBatcheAuditRecord2(newList, wfId, financetrans, auditRelevance);
InsertBatcheAuditRecord2(newList, wfId, financetrans, auditRelevance, TeamplateType);
if (auditRelevanceList != null && auditRelevanceList.Count > 0)
{
if (auditRelevanceList?.LastOrDefault().Id == auditRelevance.Id)
......@@ -750,7 +750,7 @@ namespace Property.Module.FixedAssets
if (auditRelevance.AuditWay == WFTAuditWayEnum.Countersign)
{
//会签
InsertBatcheAuditRecord3(newList, AuditEmId, 1, wfId, financetrans, auditRelevance, oldAuditEmIds);
InsertBatcheAuditRecord3(newList, AuditEmId, 1, wfId, financetrans, auditRelevance, oldAuditEmIds, TeamplateType);
}
else if (auditRelevance.AuditWay == WFTAuditWayEnum.OrSign)
{
......@@ -761,7 +761,7 @@ namespace Property.Module.FixedAssets
}
AuditEmIds = AuditEmIds.Distinct().ToList();
var auditRelevanceList = GetAuditRelevanceList(wfId, TeamplateType).OrderBy(x => x.Sort).ToList();
InsertBatcheAuditRecord3(newList, AuditEmId, 2, wfId, financetrans, auditRelevance, oldAuditEmIds);
InsertBatcheAuditRecord3(newList, AuditEmId, 2, wfId, financetrans, auditRelevance, oldAuditEmIds, TeamplateType);
if (auditRelevanceList.LastOrDefault().Id == auditRelevance.Id)
{
//更新资产状态信息
......@@ -774,13 +774,13 @@ namespace Property.Module.FixedAssets
}
else
{
InsertBatcheAuditRecord(newList, wfId, financetrans, auditRelevance);
InsertBatcheAuditRecord(newList, wfId, financetrans, auditRelevance, TeamplateType);
}
}
else
{
InsertBatcheAuditRecord(newList, wfId, financetrans, auditRelevance);
InsertBatcheAuditRecord(newList, wfId, financetrans, auditRelevance, TeamplateType);
}
}
//else
......@@ -820,7 +820,7 @@ namespace Property.Module.FixedAssets
#region 删除审核人记录
{
#region 删除审核资源文件
List<Rb_Workflow_Auditrecord_Extend> auditRecordList = GetAuditRecordInfoList(workFlowId);
List<Rb_Workflow_Auditrecord_Extend> auditRecordList = GetAuditRecordInfoList(workFlowId, TeamplateType);
foreach (var item in auditRecordList)
{
List<string> imgList = new List<string>();
......@@ -873,6 +873,12 @@ namespace Property.Module.FixedAssets
FiledName = nameof(Rb_Workflow_AuditRelevance.WorkFlowId),
FiledValue = workFlowId,
OperatorEnum = OperatorEnum.Equal
},
new WhereHelper()
{
FiledName = nameof(Rb_Workflow_AuditRelevance.TemplateType),
FiledValue = TeamplateType,
OperatorEnum = OperatorEnum.Equal
}
};
workflow_CopyToPeopleRepository.Delete(whereHelpers, trans);
......@@ -928,10 +934,10 @@ namespace Property.Module.FixedAssets
/// <param name="wfId"></param>
/// <param name="trans"></param>
/// <param name="auditRelevance"></param>
private void InsertBatcheAuditRecord(List<int> empIds, int wfId, System.Data.IDbTransaction trans, Rb_Workflow_AuditRelevance auditRelevance)
private void InsertBatcheAuditRecord(List<int> empIds, int wfId, System.Data.IDbTransaction trans, Rb_Workflow_AuditRelevance auditRelevance,int TemplateType)
{
List<Rb_Workflow_Auditrecord> auditrecordList = new List<Rb_Workflow_Auditrecord>();
var recordlist = GetAuditRecordInfoList(wfId);
var recordlist = GetAuditRecordInfoList(wfId, TemplateType);
if (recordlist != null && recordlist.Count() > 0 && recordlist.Where(x => x.AuditId == auditRelevance.Id).ToList().Count() > 0)
{
workflow_AuditrecordRepository.DeleteBatch(recordlist.Where(x => x.AuditId == auditRelevance.Id).ToList(), trans);
......@@ -947,7 +953,7 @@ namespace Property.Module.FixedAssets
CreateTime = DateTime.Now,
UpdateBy = item,
UpdateTime = DateTime.Now,
TemplateType = 0,
TemplateType = TemplateType,
WorkFlowId = wfId
};
auditrecordList.Add(auditrecord);
......@@ -964,7 +970,7 @@ namespace Property.Module.FixedAssets
/// <param name="wfId"></param>
/// <param name="trans"></param>
/// <param name="auditRelevance"></param>
private void InsertBatcheAuditRecord2(List<int> empIds, int wfId, System.Data.IDbTransaction trans, Rb_Workflow_AuditRelevance auditRelevance)
private void InsertBatcheAuditRecord2(List<int> empIds, int wfId, System.Data.IDbTransaction trans, Rb_Workflow_AuditRelevance auditRelevance, int TemplateType)
{
List<Rb_Workflow_Auditrecord> auditrecordList = new List<Rb_Workflow_Auditrecord>();
foreach (var item in empIds)
......@@ -978,7 +984,7 @@ namespace Property.Module.FixedAssets
CreateTime = DateTime.Now,
UpdateBy = item,
UpdateTime = DateTime.Now,
TemplateType = 0,
TemplateType = TemplateType,
WorkFlowId = wfId
};
auditrecordList.Add(auditrecord);
......@@ -999,10 +1005,10 @@ namespace Property.Module.FixedAssets
/// <param name="wfId"></param>
/// <param name="trans"></param>
/// <param name="auditRelevance"></param>
private void InsertBatcheAuditRecord3(List<int> empIds, int AuditEmpId, int Type, int wfId, System.Data.IDbTransaction trans, Rb_Workflow_AuditRelevance auditRelevance, List<int> oldAuditEmIds)
private void InsertBatcheAuditRecord3(List<int> empIds, int AuditEmpId, int Type, int wfId, System.Data.IDbTransaction trans, Rb_Workflow_AuditRelevance auditRelevance, List<int> oldAuditEmIds, int TemplateType)
{
List<Rb_Workflow_Auditrecord> auditrecordList = new List<Rb_Workflow_Auditrecord>();
var recordlist = GetAuditRecordInfoList(wfId);
var recordlist = GetAuditRecordInfoList(wfId, TemplateType);
if (recordlist != null && recordlist.Count() > 0 && recordlist.Where(x => x.AuditId == auditRelevance.Id).ToList().Count() > 0)
{
workflow_AuditrecordRepository.DeleteBatch(recordlist.Where(x => x.AuditId == auditRelevance.Id).ToList(), trans);
......@@ -1029,7 +1035,7 @@ namespace Property.Module.FixedAssets
CreateTime = DateTime.Now,
UpdateBy = item,
UpdateTime = DateTime.Now,
TemplateType = 0,
TemplateType = TemplateType,
WorkFlowId = wfId
};
if (item == AuditEmpId || NowAudit.Contains(item))
......@@ -1065,9 +1071,9 @@ namespace Property.Module.FixedAssets
/// </summary>
/// <param name="workFlowId"></param>
/// <returns></returns>
public List<Rb_Workflow_Auditrecord_Extend> GetAuditRecordInfoList(int workFlowId)
public List<Rb_Workflow_Auditrecord_Extend> GetAuditRecordInfoList(int workFlowId, int TemplateType)
{
var list = workflow_AuditrecordRepository.GetAuditRecordList(workFlowId);
var list = workflow_AuditrecordRepository.GetAuditRecordList(workFlowId, TemplateType);
foreach (var item in list)
{
var emList = employeeRepository.GetEmployeeInfo(item.AuditEmId ?? 0);
......@@ -1170,7 +1176,7 @@ namespace Property.Module.FixedAssets
var AuditAccountList = new List<EmAccoutIdModel>();
var CopyAccountList = new List<EmAccoutIdModel>();
// 审核记录
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId);
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId, 0);
string ImageStr = "";
//图片处理
if (imageList.Any())
......@@ -1665,7 +1671,7 @@ namespace Property.Module.FixedAssets
}
//更新抄送人状态
var CopyToPeopleList = GetCopyToPeopleList(WorkFlowId);
var CopyToPeopleList = GetCopyToPeopleList(WorkFlowId, 0);
foreach (var item in CopyToPeopleList)
{
item.Stauts = WFRrocessStatus.AuditThrough;
......@@ -2166,7 +2172,7 @@ namespace Property.Module.FixedAssets
var trans = workflow_AuditRelevanceRepository.DbTransaction;
try
{
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId);
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId, 0);
string ImageStr = "";
//图片处理
if (imageList.Any())
......@@ -2368,9 +2374,9 @@ namespace Property.Module.FixedAssets
/// </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)
{
var list = workflow_CopyToPeopleRepository.GetCopyToPeopleList(WorkFlowId);
var list = workflow_CopyToPeopleRepository.GetCopyToPeopleList(WorkFlowId, TemplateType);
foreach (var item in list)
{
var emList = employeeRepository.GetEmployeeInfo(item.EmployeeId ?? 0);
......@@ -2431,7 +2437,7 @@ namespace Property.Module.FixedAssets
var AuditAccountList = new List<EmAccoutIdModel>();
var CopyAccountList = new List<EmAccoutIdModel>();
// 审核记录
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId);
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId, 1);
string ImageStr = "";
//图片处理
if (imageList.Any())
......@@ -2824,7 +2830,7 @@ namespace Property.Module.FixedAssets
}
}
//更新抄送人状态
var CopyToPeopleList = GetCopyToPeopleList(WorkFlowId);
var CopyToPeopleList = GetCopyToPeopleList(WorkFlowId, 1);
foreach (var item in CopyToPeopleList)
{
item.Stauts = WFRrocessStatus.AuditThrough;
......@@ -3255,7 +3261,7 @@ namespace Property.Module.FixedAssets
var trans = workflow_AuditRelevanceRepository.DbTransaction;
try
{
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId);
var aurList = workflow_AuditrecordRepository.GetAuditRecordList(WorkFlowId, 1);
string ImageStr = "";
//图片处理
if (imageList.Any())
......
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/PropertyController.cs
View file @ 6769d7ac
......@@ -291,7 +291,7 @@ namespace Property.WebApi.Controllers.User
new ExcelColumn(value:"单位"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"型号"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
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=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"使用日期"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }
......@@ -366,7 +366,7 @@ namespace Property.WebApi.Controllers.User
ExcelDataSource header = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"公司"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"校区"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"部门"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"人员"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"使用日期"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -381,7 +381,7 @@ namespace Property.WebApi.Controllers.User
new ExcelColumn(value:"单位"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"型号"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
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 }
},
};
......@@ -597,7 +597,7 @@ namespace Property.WebApi.Controllers.User
}
if (string.IsNullOrEmpty(demodel.BranchName))
{
return ApiResult.ParamIsNull("所属公司不能为空");
return ApiResult.ParamIsNull("所属校区不能为空");
}
if (string.IsNullOrEmpty(demodel.SupplierName))
{
......@@ -694,7 +694,7 @@ namespace Property.WebApi.Controllers.User
}
if (!demodel.BranchId.HasValue)
{
return ApiResult.ParamIsNull("请选择资产所属公司");
return ApiResult.ParamIsNull("请选择资产所属校区");
}
demodel.Status = 0;
......@@ -1097,7 +1097,7 @@ namespace Property.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"状态"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"单号"){CellWidth=20,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=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"领用人"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"领取时间"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -2144,7 +2144,7 @@ namespace Property.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"状态"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"单号"){CellWidth=20,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=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"借用人"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"借取时间"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -2702,14 +2702,14 @@ namespace Property.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"状态"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"单号"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"调入公司"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"调入校区"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"调拨时间"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
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=20,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 },
new ExcelColumn(value:"操作时间"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
},
......@@ -2801,7 +2801,7 @@ namespace Property.WebApi.Controllers.User
if ((demodel.InBranchId ?? -1) <= -1)
{
return ApiResult.ParamIsNull("请选择调入公司");
return ApiResult.ParamIsNull("请选择调入校区");
}
if (!demodel.Time.HasValue)
{
......@@ -2843,7 +2843,7 @@ namespace Property.WebApi.Controllers.User
foreach (var item in PList) {
if (item.BranchId == demodel.InBranchId) {
return ApiResult.Failed("资产：" + item.PropertyNum + " 所在公司为调入公司！");
return ApiResult.Failed("资产：" + item.PropertyNum + " 所在校区为调入校区！");
}
}
......@@ -4104,7 +4104,7 @@ namespace Property.WebApi.Controllers.User
new ExcelColumn(value:"品牌"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"设备序列号"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
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=20,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 },
......@@ -4250,7 +4250,7 @@ namespace Property.WebApi.Controllers.User
ExcelDataSource header = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
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=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -4439,7 +4439,7 @@ namespace Property.WebApi.Controllers.User
new ExcelColumn(value:"资产状态"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"品牌"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"使用人"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"所属公司"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"所属校区"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"操作类型"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"操作时间"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"操作人"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......@@ -4602,7 +4602,7 @@ namespace Property.WebApi.Controllers.User
new ExcelColumn(value:"型号"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"序列号"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"金额"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"所属公司"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }
new ExcelColumn(value:"所属校区"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }
},
};
slist.Add(header);
......@@ -4725,7 +4725,7 @@ namespace Property.WebApi.Controllers.User
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=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"所属公司"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"所属校区"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"预计使用期限"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"到期时间"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
},
......
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