diff --git a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
index 8314bd4..203827e 100644
--- a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
+++ b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
@@ -269,43 +269,44 @@ namespace FactorySystemApi.Controllers
                                 TFS_HalfMaterialFTeamwork teamwork = BaseBll.GetTempModel<TFS_HalfMaterialFTeamwork>(teamId);
 
 
-                                //if (editMaterialList.Count() == 0) 
-                                //{
-                                //    MaterialTeamworkBll.CreateProductView(teamwork, null, user.FID);
-                                //}
-
-                                //if (editMaterialList.Count() == 0)
-                                //{
-                                //    //MaterialTeamworkBll.CreateProductView(teamwork, null, user.FID);
-                                //    TFS_Material material = editMaterialList.Find(s => s.FType == "20");//默认取第一个20的，没找到取第一个
-                                //    if (material == null) material = editMaterialList.FirstOrDefault();
-                                //    db.Updateable<TFS_HalfMaterialFTeamwork>(new { FMaterialHalfIDs = material.FID }).Where(s => s.FID == teamwork.FID).ExecuteCommand();
-                                //}
-                                //else
-                                //{
-                                //    //MaterialTeamworkBll.CreateProductView(teamwork, editMaterialList, user.FID);
-                                //}
-
-                                //开始BOM下载
-                                int dow = DockGetBomData(teamwork.FID, user.FID);
-                                if (dow > 0)
+                                //TeamworkBll TeamworkBll = new TeamworkBll();
+                                //List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FNewTestCode, teamwork.FNewVersionCode);
+
+                                TFS_Material tFS_Material = BaseBll.GetTempModel<TFS_Material>(string.Format("FTestCode='{0}'", teamwork.FNewTestCode));
+
+                                if (tFS_Material == null) 
                                 {
-                                    MaterialTeamworkBll.HasMaterialTestCode(teamwork);
-                                    BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
-                                    BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
+                                    //开始BOM下载
+                                    int dow = DockGetBomData(teamwork.FID, user.FID);
+                                    if (dow > 0)
+                                    {
+                                        //MaterialTeamworkBll.HasMaterialTestCode(teamwork);
+                                        BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
+                                        BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
+                                    }
+                                    else
+                                    {
+
+                                        BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
+                                        BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.BOM下载, 1, 1);
+                                        //BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
+
+                                        //apiResult.Error("未能找到物料");
+
+                                        //BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
+                                        //BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
+                                    }
                                 }
                                 else
                                 {
+                                    if (editMaterialList.Count() == 0) 
+                                    {
+                                        BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
+                                        apiResult.Error("未能找到物料");
 
-                                    BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
-                                    BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.BOM下载, 1, 1);
-                                    //BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
-
-                                    //apiResult.Error("未能找到物料");
-
-                                    //BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
-                                    //BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
+                                    }
                                 }
+                              
 
                             }
                             else
@@ -727,8 +728,8 @@ namespace FactorySystemApi.Controllers
                         * 在创建各类事项前，先创建物料分类事项
                         * 此处创建各类事项流程中断，转移至物料分类事项提交后进行
                         * **/
-                        BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项
-                        BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
+                        //BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项
+                        //BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
 
                         HalfMaterialTaskBll halfMaterialTaskBll = new HalfMaterialTaskBll();
                         halfMaterialTaskBll.CloseHalfMaterialTask(teamId, userId, (int)Constant.HalfMaterialProcessType.BOM下载);
diff --git a/FactorySystemBll/HalfMaterialTeamworkBll.cs b/FactorySystemBll/HalfMaterialTeamworkBll.cs
index 74b2155..46710b4 100644
--- a/FactorySystemBll/HalfMaterialTeamworkBll.cs
+++ b/FactorySystemBll/HalfMaterialTeamworkBll.cs
@@ -601,8 +601,7 @@ namespace FactorySystemBll
             {
                 foreach (TFS_Material item in temps)
                 {
-                    //if (first.FIsNew || item.FIsNew)
-                    fids += item.FID + ",";//父级新则子一级全部都要、自己是新
+                    if (first.FIsNew || item.FIsNew)fids += item.FID + ",";//父级新则子一级全部都要、自己是新
                     dtoList.Add(new BomFormulaDto() { mId = item.FID, isNew = item.FIsNew, childs = GetBomFormulaChild(item, formulaList, out string nextIds) });
                     if (!string.IsNullOrEmpty(nextIds)) fids += nextIds + ",";
                 }