From d83d634fc4c78213f9aa9a59314edeeb7aab5a4d Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 18 Apr 2024 11:36:36 +0800
Subject: [PATCH] 123456

---
 .../mes/wms/WmFgentryInspectController.cs     | 13 +++++++++++
 .../wms/IService/IWmFgentryInspectService.cs  |  3 ++-
 ZR.Service/mes/wms/WmFgentryInspectService.cs | 23 ++++++++++++++++---
 3 files changed, 35 insertions(+), 4 deletions(-)

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);
         }
 
+        /// <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>
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<WmFgentryInspectDto> GetList(WmFgentryInspectQueryDto parm);
         PagedInfo<WmFgentryInspectDto> GetList_first(WmFgentryInspectQueryDto parm);
-        
+        PagedInfo<WmFgentryInspectDto> 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.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>