diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmSlowMoveMaterialController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmSlowMoveMaterialController.cs index 0e7f688..539f799 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/mm/MmSlowMoveMaterialController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/mm/MmSlowMoveMaterialController.cs @@ -54,6 +54,8 @@ namespace DOAN.Admin.WebApi.Controllers [ActionPermissionFilter(Permission = "materialManagement:mmslowmovematerial:list")] public IActionResult QueryMmSlowMoveMaterial([FromQuery] MmSlowMoveMaterialQueryDto parm) { + parm.CheckDateArray[0] = DOANConvertDateTime.ConvertLocalDate(parm.CheckDateArray[0]); + parm.CheckDateArray[1] = DOANConvertDateTime.ConvertLocalDate(parm.CheckDateArray[1]); var response = _MmSlowMoveMaterialService.GetList(parm); return SUCCESS(response); } diff --git a/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs b/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs index 41cde6d..86ff2ee 100644 --- a/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs +++ b/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs @@ -5,8 +5,15 @@ namespace DOAN.Model.MES.mm.Dto /// /// 车间呆滞品盘点查询对象 /// - public class MmSlowMoveMaterialQueryDto : PagerInfo - {} + public class MmSlowMoveMaterialQueryDto : PagerInfo + { + public DateTime[] CheckDateArray { get; set; } = new DateTime[2]; + + public string LineCode { get; set; } + public string MaterialCode { get; set; } + + public string MaterialName { get; set; } + } /// /// 车间呆滞品盘点输入输出对象 diff --git a/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs b/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs index bf3caa0..0d3ebb8 100644 --- a/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs +++ b/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs @@ -120,7 +120,14 @@ namespace DOAN.Service.MES.mm /// public PagedInfo GetList(MmSlowMoveMaterialQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(parm.CheckDateArray[0]>DateTime.MinValue,it=>it.CheckDate>=parm.CheckDateArray[0]) + .AndIF(parm.CheckDateArray[1]>DateTime.MinValue,it=>it.CheckDate<=parm.CheckDateArray[1]) + .AndIF(!string.IsNullOrEmpty(parm.MaterialCode),it=>it.MaterialCode.Contains(parm.MaterialCode)) + .AndIF(!string.IsNullOrEmpty(parm.LineCode),it=>it.LineCode.Contains(parm.LineCode)) + .AndIF(!string.IsNullOrEmpty(parm.MaterialName),it=>it.MaterialName.Contains(parm.MaterialName)) + + ; var response = Queryable() .Where(predicate.ToExpression()) diff --git a/Infrastructure/WebExtensions/HttpContextExtension.cs b/Infrastructure/WebExtensions/HttpContextExtension.cs index 1dc3a76..14e6b64 100644 --- a/Infrastructure/WebExtensions/HttpContextExtension.cs +++ b/Infrastructure/WebExtensions/HttpContextExtension.cs @@ -89,11 +89,16 @@ namespace Infrastructure.Extensions /// public static string GetName(this HttpContext context) { + /* + * + * 在 ASP.NET Core 中,context.User?.Identity?.Name 获取的是当前经过身份验证的用户的用户名。这个值会存在是因为当用户成功登录后, + * 系统会创建一个表示该用户的身份(ClaimsPrincipal),并将其与当前的 HTTP 请求上下文(HttpContext)关联起来。 + */ var uid = context.User?.Identity?.Name; return uid; } - + // 把获取 username 改成昵称 public static string GetNickName(this HttpContext context) { @@ -103,6 +108,7 @@ namespace Infrastructure.Extensions return tokenModel?.NickName; } + /// /// 判断是否是管理员 ///