异常开始结束带代码提交

EquipMgr/Tnb.EquipMgr/ToolMoldMaintainPlanService.cs

@@ -5,13 +5,16 @@ using System.Text;
 using System.Threading.Tasks;
 using Aspose.Cells.Drawing;
 using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Extension;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.Logging;
 using JNPF.VisualDev;
 using JNPF.VisualDev.Entitys;
 using JNPF.VisualDev.Interfaces;
+using Mapster;
 using Microsoft.AspNetCore.Mvc;
+using Spire.Pdf.Widget;
 using SqlSugar;
 using Tnb.BasicData;
 using Tnb.EquipMgr.Entities;
@@ -29,12 +32,29 @@ namespace Tnb.EquipMgr
         private readonly ISqlSugarClient _db;
         private readonly IRunService _runService;
         private readonly IVisualDevService _visualDevService;
+        private readonly IToolMoldHouseService _moldHouseService;
+        private readonly IToolMoldLocationService _moldLocationService;
+        private readonly IToolMoldsService _moldService;
         public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
-        public ToolMoldMaintainPlanService(ISqlSugarRepository<ToolMoldMaintainPlan> repository, IRunService runService, IVisualDevService visualDevService) : base(repository.AsSugarClient())
+
+        private static Dictionary<string, object> _dicHouse = new Dictionary<string, object>();
+        private static Dictionary<string, object> _dicLocation = new Dictionary<string, object>();
+
+        public ToolMoldMaintainPlanService(
+            ISqlSugarRepository<ToolMoldMaintainPlan> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IToolMoldHouseService moldHouseService,
+            IToolMoldLocationService moldLocationService,
+            IToolMoldsService moldService
+            ) : base(repository.AsSugarClient())
         {
             _db = repository.AsSugarClient();
             _runService = runService;
             _visualDevService = visualDevService;
+            _moldHouseService = moldHouseService;
+            _moldLocationService = moldLocationService;
+            _moldService = moldService;
             OverideFuncs.CreateAsync = Create;
 
         }
@@ -54,20 +74,46 @@ namespace Tnb.EquipMgr
             }
             return await Task.FromResult("ok");
         }
-
+        /// <summary>
+        /// 根据规则id获取匹配的模具列表
+        /// </summary>
+        /// <param name="planId">计划Id</param>
+        /// <returns></returns>
         [HttpGet]
-        public async Task<dynamic> GetMoldListByPlanId(RelevanceMoldFromPlanInput input)
+        public async Task<dynamic> GetMoldListByPlanId([FromRoute] string planId)
         {
-            var list = await _db.Queryable<ToolMoldMaintainPlanRelation>().Where(it => it.maintain_plan_id == input.item_group_id).ToListAsync();
+            var result = new List<MaintainPlanMoldLstOutput>();
+            if (_dicHouse.Count < 1)
+            {
+                _dicHouse = await _moldHouseService.GetHouseDictionary();
+            }
+            if (_dicLocation.Count < 1)
+            {
+                _dicLocation = await _moldLocationService.GetLocationDictionary();
+            }
+            var list = await _db.Queryable<ToolMoldMaintainPlanRelation>().Where(it => it.maintain_plan_id == planId).ToListAsync();
             if (list?.Count > 0)
             {
                 var ids = list.Select(it => it.mold_id).Distinct().ToList();
                 if (ids?.Count > 0)
                 {
+                    var items = await _moldService.GetListByIds(ids);
+                    _db.ThenMapper(items, it =>
+                    {
+                        if (!it.warehosue_id!.IsNullOrEmpty())
+                        {
+                            it.whcode = _dicHouse.ContainsKey(it.warehosue_id!) ? _dicHouse[it.warehosue_id!].ToString()! : "";
+                        }
+                        if (!it.location_id!.IsNullOrEmpty())
+                        {
+                            it.location_code = _dicLocation.ContainsKey(it.location_id!) ? _dicLocation[it.location_id!].ToString()! : "";
+                        }
+                    });
 
+                    result = items.Adapt<List<MaintainPlanMoldLstOutput>>();
                 }
             }
-            return null;
+            return result;
         }
 
         /// <summary>
@@ -76,15 +122,15 @@ namespace Tnb.EquipMgr
         /// <returns></returns>
         [HttpPost]
         public async Task RelevanceMoldFromPlan(RelevanceMoldFromPlanInput input) =>
-            await Relevance<RelevanceMoldFromPlanInput, ToolMoldMaintainPlanRelation>(input, nameof(ToolMoldMaintainPlanRelation.maintain_plan_id), nameof(ToolMoldMaintainPlanRelation.mold_id), it => it.maintain_plan_id == input.item_group_id);
+            await Relevance<RelevanceMoldFromPlanInput, ToolMoldMaintainPlanRelation>(input, nameof(ToolMoldMaintainPlanRelation.maintain_plan_id), nameof(ToolMoldMaintainPlanRelation.mold_id), it => it.maintain_plan_id == input.id);
         /// <summary>
         /// 删除计划与模具关联关系
         /// </summary>
-        /// <param name="input"></param>
+        /// <param name="input">输入参数</param>
         /// <returns></returns>
         [HttpPost]
         public async Task DeleteMold(RelevanceMoldFromPlanInput input) =>
-            await Delete<ToolMoldMaintainPlanRelation>(it => it.maintain_plan_id == input.item_group_id && input.ids.Contains(it.mold_id));
+            await Delete<ToolMoldMaintainPlanRelation>(it => it.maintain_plan_id == input.id && input.ids.Contains(it.mold_id));
     }
 
 }