RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

车间呆滞品 增加查询条件

Browse Source
This commit is contained in:
qianhao.xu 2024-11-13 13:40:49 +08:00
parent 61cb12747a
commit 738f18819d
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Admin.WebApi/Controllers/MES/mm/MmSlowMoveMaterialController.cs
View File

@ -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);
}

11
DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
View File

@ -5,8 +5,15 @@ namespace DOAN.Model.MES.mm.Dto
/// <summary>
/// 车间呆滞品盘点查询对象
/// </summary>
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; }
}
/// <summary>
/// 车间呆滞品盘点输入输出对象

9
DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
View File

@ -120,7 +120,14 @@ namespace DOAN.Service.MES.mm
/// <returns></returns>
public PagedInfo<MmSlowMoveMaterialDto> GetList(MmSlowMoveMaterialQueryDto parm)
{
var predicate = Expressionable.Create<MmSlowMoveMaterial>();
var predicate = Expressionable.Create<MmSlowMoveMaterial>()
.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())

8
Infrastructure/WebExtensions/HttpContextExtension.cs
View File

@ -89,11 +89,16 @@ namespace Infrastructure.Extensions
/// <returns></returns>
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;
}
/// <summary>
/// 判断是否是管理员
/// </summary>