载具更换代码优化

EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs

@@ -94,43 +94,69 @@ namespace Tnb.EquipMgr
             return result;
         }
         /// <summary>
-        /// 根据模具ID获取，保养组及项目信息
+        /// 根据计划Id、模具ID获取，保养组及项目信息
         /// </summary>
-        /// <param name="moldId">模具ID</param>
-        /// <returns></returns>
+        /// <param name="input">
+        /// 参数：
+        /// <br/>{
+        /// <br/>    plan_id:计划Id
+        /// <br/>    mold_id:模具Id
+        /// <br/>}
+        /// </param>
+        /// <remarks>
+        /// returns:
+        /// <br/>{
+        /// <br/>    plan_id:计划ID
+        /// <br/>    mold_id:模具ID
+        /// <br/>    item_group_id:保养组ID
+        /// <br/>    item_group_name:保养组名称
+        /// <br/>    item_id:保养项ID
+        /// <br/>    item_name:保养项名称
+        /// <br/>}
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"></exception>
         [HttpGet]
-        public async Task<dynamic> GetCheckItemAndGrpByMoldId([FromRoute] string moldId)
+        public async Task<dynamic> GetCheckItemAndGrpByMoldId([FromQuery] CheckItemQueryinput input)
         {
-            if (moldId.IsNullOrEmpty()) throw new ArgumentException($"parameter {nameof(moldId)} not be null or empty");
-            {
-
-                var checkItems = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.mold_id == moldId).Select(it => new
+            if (input == null) throw new ArgumentNullException(nameof(input));
+            var items = await _db.Queryable<ToolMoldMaintainPlanRelation>()
+                .InnerJoin<ToolMoldMaintainGroupRelation>((a, b) => a.mold_id == b.mold_id)
+                .InnerJoin<ToolMoldMaintainGroupItem>((a, b, c) => b.item_group_id == c.item_group_id)
+                .InnerJoin<ToolMoldMaintainGroup>((a, b, c, d) => c.item_group_id == d.id)
+                .InnerJoin<ToolMoldMaintainItem>((a, b, c, d, e) => c.item_id == e.id)
+                .Where((a) => a.maintain_plan_id == input.plan_id && a.mold_id == input.mold_id)
+                .Select((a, b, c, d, e) => new CheckItemOutput
                 {
-                    item_group_id = it.item_group_id,
-                    item_group_name = it.item_group_name,
-                    item_id = it.item_id,
-                    item_name = it.item_name,
-                    status = it.status,
-                }).ToListAsync();
-
-                //var checkItems = await _db.Queryable<ToolMoldMaintainGroupRelation, ToolMoldMaintainGroup, ToolMoldMaintainGroupItem, ToolMoldMaintainItem>((a, b, c, d) => new JoinQueryInfos
-                //    (
-                //       JoinType.Inner, a.item_group_id == b.id,
-                //      JoinType.Inner, b.id == c.item_group_id,
-                //      JoinType.Inner, c.item_id == d.id
-                //    ))
-                //    .Where(a => a.mold_id == moldId)
-                //    .Select((a, b, c, d) => new
-                //    {
-                //        item_group_id = b.id,
-                //        item_group_name = b.name,
-                //        item_id = d.id,
-                //        item_name = d.name,
-                //        status = d.status,
-                //    }).ToListAsync();
-                return checkItems;
+                    plan_id = a.maintain_plan_id,
+                    mold_id = a.mold_id,
+                    item_group_id = d.id,
+                    item_group_name = d.name,
+                    item_id = e.id,
+                    item_name = e.name,
+                })
+                .ToListAsync();
+            //items.ForEach(it => it.status = 0);
+            var checkItems = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.plan_id == input.plan_id && it.mold_id == input.mold_id).Select(it => new
+            {
+                plan_id = it.plan_id,
+                item_id = it.item_id,
+                item_group_id = it.item_group_id,
+                mold_id = it.mold_id,
+            }).ToListAsync();
+            if (items?.Count > 0 && checkItems?.Count > 0)
+            {
+                foreach (var item in items)
+                {
+                    foreach (var checkItem in checkItems)
+                    {
+                        if (item.plan_id == checkItem.plan_id && item.mold_id == checkItem.mold_id && item.item_group_id == checkItem.item_group_id && item.item_id == checkItem.item_id)
+                        {
+                            item.status = 1;
+                        }
+                    }
+                }
             }
-            return Enumerable.Empty<dynamic>();
+            return items;
         }
 
 
@@ -220,8 +246,18 @@ namespace Tnb.EquipMgr
         public async Task MaintainItemFinish(MoldMaintainRunUpInput input)
         {
             if (input == null) throw new ArgumentNullException("input");
-            if (input.itemIds == null || input.itemIds.Count == 0) throw new ArgumentException($"parameter {nameof(input.itemIds)} not be null or empty");
-            var row = await _db.Updateable<ToolMoldMaintainItemRecord>().SetColumns(it => new ToolMoldMaintainItemRecord { status = 1 }).Where(it => input.itemIds.Contains(it.id)).ExecuteCommandAsync();
+            if (input.items == null || input.items.Count == 0) throw new ArgumentException($"parameter {nameof(input.items)} not be null or empty");
+            List<ToolMoldMaintainItemRecord> records = new();
+            foreach (var item in input.items)
+            {
+                ToolMoldMaintainItemRecord record = new();
+                record.plan_id = input.plan_id;
+                record.mold_id = input.mold_id;
+                record.item_group_id = item.item_group_id;
+                record.item_id = item.item_id;
+                records.Add(record);
+            }
+            var row = await _db.Insertable(records).ExecuteCommandAsync();
             if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
         }