Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

123456

Browse Source
This commit is contained in:
qianhao.xu
2024-04-18 11:36:36 +08:00
parent c1375ad7af
commit d83d634fc4
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs
View File

@@ -53,6 +53,19 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(response);
}
/// <summary>
/// 查询成品入库检验列表 二级
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("second_level_list")]
[ActionPermissionFilter(Permission = "wmsManagement:wmfgentryinspect:list")]
public IActionResult QueryWmFgentryInspect_second([FromQuery] WmFgentryInspectQueryDto parm)
{
var response = _WmFgentryInspectService.GetList_second(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询成品入库检验详情
/// </summary>

3
ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs
View File

@@ -14,8 +14,9 @@ namespace ZR.Service.mes.wms.IService
{
PagedInfo<WmFgentryInspectDto> GetList(WmFgentryInspectQueryDto parm);
PagedInfo<WmFgentryInspectDto> GetList_first(WmFgentryInspectQueryDto parm);
PagedInfo<WmFgentryInspectDto> GetList_second(WmFgentryInspectQueryDto parm);
WmFgentryInspect GetInfo(int Id);
WmFgentryInspect AddWmFgentryInspect(WmFgentryInspect parm);

23
ZR.Service/mes/wms/WmFgentryInspectService.cs
View File

@@ -51,9 +51,7 @@ namespace ZR.Service.mes.wms
.AndIF(parm.endtime!=null&&parm.endtime>new DateTime(1999,1,1), it => it.CreatedTime<parm.endtime)
;
//var response = Queryable()
// .Where(predicate.ToExpression())
// .ToPage<WmFgentryInspect, WmFgentryInspectDto>(parm);
List<WmFgentryInspect> inspects = Queryable()
.Where(predicate.ToExpression()).GroupBy(it => it.Workorder)
.Select(it => new WmFgentryInspect()
@@ -75,6 +73,25 @@ namespace ZR.Service.mes.wms
return response;
}
/// <summary>
/// 获取二级菜单
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmFgentryInspectDto> GetList_second(WmFgentryInspectQueryDto parm)
{
var predicate = Expressionable.Create<WmFgentryInspect>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
.AndIF(!string.IsNullOrEmpty(parm.Packcode), it => it.Packcode.Contains(parm.Packcode))
.AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber))
.AndIF(parm.starttime != null && parm.starttime > new DateTime(1999, 1, 1), it => it.CreatedTime > parm.starttime)
.AndIF(parm.endtime != null && parm.endtime > new DateTime(1999, 1, 1), it => it.CreatedTime < parm.endtime)
;
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmFgentryInspect, WmFgentryInspectDto>(parm);
return response;
}
/// <summary>