diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
index 53f530fd..fbe3bd00 100644
--- a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
+++ b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
@@ -18,5 +18,12 @@ namespace Tnb.BasicData.Interfaces
         /// <param name="queryInput"></param>
         /// <returns></returns>
         public Task<dynamic> GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput);
+
+        /// <summary>
+        /// 根据物料类型获取物料列表
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        public Task<dynamic> GetMaterialByType(Dictionary<string, string> dic);
     }
 }
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs
index f5ba3c65..91a92305 100644
--- a/BasicData/Tnb.BasicData/BasMaterialService.cs
+++ b/BasicData/Tnb.BasicData/BasMaterialService.cs
@@ -160,6 +160,21 @@ namespace Tnb.BasicData
             }
         }
 
+        [HttpPost]
+        public async Task<dynamic> GetMaterialByType(Dictionary<string, string> dic)
+        {
+            string types = dic["types"];
+            string[] typeArr = types.Split(",");
+            List<BasMaterial> list = await _repository.AsSugarClient().Queryable<BasMaterial>().Where(x => x.state=="1").ToListAsync();
+            List<BasMaterial> result = new List<BasMaterial>();
+            foreach (var type in typeArr)
+            {
+                result.AddRange(list.Where(x=>x.category_id.Contains(type)));
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// 获取物料清单下所子集物料id
         /// </summary>
diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs
index 13e35519..a1255946 100644
--- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs
+++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs
@@ -10,5 +10,12 @@ namespace Tnb.EquipMgr.Interfaces
         /// <param name="dic"></param>
         /// <returns></returns>
         public Task<EqpEquipment> GetEntityById(Dictionary<string, string> dic);
+        
+        /// <summary>
+        /// 根据设备类型获取设备列表
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        public Task<dynamic> GetListByTypeId(Dictionary<string, string> dic);
     }
 }
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
index c059dbda..f2be6958 100644
--- a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
@@ -69,5 +69,14 @@ namespace Tnb.EquipMgr
             string id = dic["id"];
             return await _repository.GetSingleAsync(x => x.id == id);
         }
+
+        [HttpPost]
+        public async Task<dynamic> GetListByTypeId(Dictionary<string, string> dic)
+        {
+            string typeIds = dic["typeIds"];
+            string[] typeIdArr = typeIds.Split(",");
+            return await _repository.AsSugarClient().Queryable<EqpEquipment>().Where(x => typeIdArr.Contains(x.equip_type_id))
+                .ToListAsync();
+        }
     }
 }
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs
index d1250d59..ad70afc4 100644
--- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs
+++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainTaskService.cs
@@ -69,8 +69,11 @@ namespace Tnb.EquipMgr
                     var pair = row[nameof(ToolMoldMaintainTask.mold_id)];
                     if (pair.IsNotEmptyOrNull())
                     {
-                        var multi = _dicMold[pair.ToString()!];
-                        row[nameof(ToolMoldMaintainTask.mold_id)] = $"{multi.code}/{multi.name}";
+                        if(_dicMold.TryGetValue(pair.ToString(),out var multi))
+                        {
+                            row[nameof(ToolMoldMaintainTask.mold_id)] = $"{multi.code}/{multi.name}";
+                        }
+                       
                     }
                 }
             }