diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs
index e4576ff8..b904d84f 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmFgentryInspectController.cs
@@ -53,6 +53,19 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(response);
}
+ ///
+ /// 查询成品入库检验列表 二级
+ ///
+ ///
+ ///
+ [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);
+ }
+
///
/// 查询成品入库检验详情
///
diff --git a/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs b/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs
index 55bff388..18df5efb 100644
--- a/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs
+++ b/ZR.Service/mes/wms/IService/IWmFgentryInspectService.cs
@@ -14,8 +14,9 @@ namespace ZR.Service.mes.wms.IService
{
PagedInfo GetList(WmFgentryInspectQueryDto parm);
PagedInfo GetList_first(WmFgentryInspectQueryDto parm);
-
+ PagedInfo GetList_second(WmFgentryInspectQueryDto parm);
+
WmFgentryInspect GetInfo(int Id);
WmFgentryInspect AddWmFgentryInspect(WmFgentryInspect parm);
diff --git a/ZR.Service/mes/wms/WmFgentryInspectService.cs b/ZR.Service/mes/wms/WmFgentryInspectService.cs
index 7c8d0a86..a9fc16cf 100644
--- a/ZR.Service/mes/wms/WmFgentryInspectService.cs
+++ b/ZR.Service/mes/wms/WmFgentryInspectService.cs
@@ -51,9 +51,7 @@ namespace ZR.Service.mes.wms
.AndIF(parm.endtime!=null&&parm.endtime>new DateTime(1999,1,1), it => it.CreatedTime(parm);
+
List inspects = Queryable()
.Where(predicate.ToExpression()).GroupBy(it => it.Workorder)
.Select(it => new WmFgentryInspect()
@@ -75,6 +73,25 @@ namespace ZR.Service.mes.wms
return response;
}
+ ///
+ /// 获取二级菜单
+ ///
+ ///
+ ///
+ public PagedInfo GetList_second(WmFgentryInspectQueryDto parm)
+ {
+ var predicate = Expressionable.Create()
+ .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(parm);
+ return response;
+ }
///