diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index 8388d68..ec558c0 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -247,15 +247,15 @@ namespace TaskManager.Controllers { throw new Exception("更新时，实体主键UId不能为空或0"); } - var _first = await _repository.GetByIdAsync(entity.UId); - if (_first == null) + var target = await _repository.GetByIdAsync(entity.UId); + if (target == null) { throw new Exception($"CheryRecurringJobInputPageController.Update报错：根据UId{entity.UId}没有找到记录"); return new JsonResult(new { Code = 400, Message = "修改失败!" }); } - EntityMapper.Trans(_first, entity, "UId"); + EntityMapper.Trans(entity, target, "UId"); - await _repository.UpdateAsync(_first); + await _repository.UpdateAsync(target); return new JsonResult(new { Code = 200, Message = "修改成功!" }); } diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index 0355f91..6a6ddc4 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -405,15 +405,15 @@ namespace TaskManager.Controllers { throw new Exception("更新时，实体主键UId不能为空或0"); } - var _first = await _repository.GetByIdAsync(entity.UId); - if (_first == null) + var target = await _repository.GetByIdAsync(entity.UId); + if (target == null) { throw new Exception($"CheryRecurringJobOutPageController.Update报错：根据UId{entity.UId}没有找到记录"); return new JsonResult(new { Code = 400, Message = "修改失败!" }); } - EntityMapper.Trans(_first, entity, "UId"); + EntityMapper.Trans(entity, target, "UId"); - await _repository.UpdateAsync(_first); + await _repository.UpdateAsync(target); return new JsonResult(new { Code = 200, Message = "修改成功!" }); } /// diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs index cf32cb6..3d0bdc6 100644 --- a/API/Wood.Service/Controllers/NormalBaseController.cs +++ b/API/Wood.Service/Controllers/NormalBaseController.cs @@ -82,15 +82,15 @@ namespace Wood.Service.Controllers { throw new Exception("更新时，实体主键UId不能为空或0"); } - var _first = await _repository.GetByIdAsync(entity.UId); - if (_first == null) + var target = await _repository.GetByIdAsync(entity.UId); + if (target == null) { throw new Exception($"NormalBaseController.Update报错：根据UId{entity.UId}没有找到记录"); return new JsonResult(new { Code = 400, Message = "修改失败!" }); } - EntityMapper.Trans(_first, entity, "UId"); + EntityMapper.Trans(entity, target, "UId"); - await _repository.UpdateAsync(_first); + await _repository.UpdateAsync(target); return new JsonResult(new { Code = 200, Message = "修改成功!" }); } /// diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index dc20c97..8568892 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -178,7 +178,27 @@ namespace Wood.Service.Controllers requestInputBase.Condition.Filters.Remove(processtask); var processresult = await processservice.GetTaskDataPaged(requestInputBase); return Ok(processresult); - + + case "SUPPLIER_CON_MMRP"://M+6月物料需求计划风险确认 + var mmrpservice = _builder.GetRequiredService(); + var mmrptask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(mmrptask); + var mmrpresult = await mmrpservice.GetTaskDataPaged(requestInputBase); + return Ok(mmrpresult); + + case "SUPPLIER_CON_DATE"://日物料需求计划风险确认 + var con_dateservice = _builder.GetRequiredService(); + var con_datetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(con_datetask); + var con_dateresult = await con_dateservice.GetTaskDataPaged(requestInputBase); + return Ok(con_dateresult); + + case "SUPPLIER_CON_PO"://采购订单风险确认 + var con_poservice = _builder.GetRequiredService(); + var con_potask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(con_potask); + var con_poresult = await con_poservice.GetTaskDataPaged(requestInputBase); + return Ok(con_poresult); diff --git a/API/Wood.Util/CommonHelper.cs b/API/Wood.Util/CommonHelper.cs index c00104d..d3c3075 100644 --- a/API/Wood.Util/CommonHelper.cs +++ b/API/Wood.Util/CommonHelper.cs @@ -63,37 +63,37 @@ namespace Wood.Util /// /// Expression动态拼接+泛型缓存 /// - /// - /// - public class EntityMapper//Mapper`2 + /// + /// + public class EntityMapper//Mapper`2 { - private static Func _FUNC = null; + private static Func _FUNC = null; static EntityMapper() { - ParameterExpression parameterExpression = Expression.Parameter(typeof(TIn), "p"); + ParameterExpression parameterExpression = Expression.Parameter(typeof(TSource), "p"); List memberBindingList = new List(); - foreach (var item in typeof(TOut).GetProperties()) + foreach (var item in typeof(TTarget).GetProperties()) { - MemberExpression property = Expression.Property(parameterExpression, typeof(TIn).GetProperty(item.Name)); + MemberExpression property = Expression.Property(parameterExpression, typeof(TSource).GetProperty(item.Name)); MemberBinding memberBinding = Expression.Bind(item, property); memberBindingList.Add(memberBinding); } - foreach (var item in typeof(TOut).GetFields()) + foreach (var item in typeof(TTarget).GetFields()) { - MemberExpression property = Expression.Field(parameterExpression, typeof(TIn).GetField(item.Name)); + MemberExpression property = Expression.Field(parameterExpression, typeof(TSource).GetField(item.Name)); MemberBinding memberBinding = Expression.Bind(item, property); memberBindingList.Add(memberBinding); } - MemberInitExpression memberInitExpression = Expression.MemberInit(Expression.New(typeof(TOut)), memberBindingList.ToArray()); - Expression> lambda = Expression.Lambda>(memberInitExpression, new ParameterExpression[] + MemberInitExpression memberInitExpression = Expression.MemberInit(Expression.New(typeof(TTarget)), memberBindingList.ToArray()); + Expression> lambda = Expression.Lambda>(memberInitExpression, new ParameterExpression[] { parameterExpression }); _FUNC = lambda.Compile();//拼装是一次性的 } - public static TOut Trans(TIn t) + public static TTarget Trans(TSource tSource) { - return _FUNC(t); + return _FUNC(tSource); } } @@ -103,35 +103,28 @@ namespace Wood.Util /// public class EntityMapper { - /// - /// 反射 - /// - /// - /// - /// - /// - public static void Trans(TIn tIn, TOut tOut, string excludeMembers = "") + public static void Trans(TSource tSource, TTarget tTarget, string excludeMembers = "") { string[] excludeMemberArr = excludeMembers.Split(",").Select(itm => itm.Trim()).ToArray(); - foreach (var itemOut in tOut.GetType().GetProperties()) + foreach (var itemOut in tTarget.GetType().GetProperties()) { if (excludeMemberArr.Contains(itemOut.Name)) { continue; } - var propIn = tIn.GetType().GetProperty(itemOut.Name); - itemOut.SetValue(tOut, propIn.GetValue(tIn, null), null); + var propIn = tSource.GetType().GetProperty(itemOut.Name); + itemOut.SetValue(tTarget, propIn.GetValue(tSource, null), null); } - foreach (var itemOut in tOut.GetType().GetFields()) + foreach (var itemOut in tTarget.GetType().GetFields()) { if (excludeMemberArr.Contains(itemOut.Name)) { continue; } - var fieldIn = tIn.GetType().GetField(itemOut.Name); - itemOut.SetValue(tOut, fieldIn.GetValue(tIn)); + var fieldIn = tSource.GetType().GetField(itemOut.Name); + itemOut.SetValue(tTarget, fieldIn.GetValue(tSource)); } } }