diff --git a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs index cddabe4..c347a8b 100644 --- a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs @@ -251,7 +251,9 @@ namespace FactorySystemApi.Controllers //创建 TFS_FTeamwork int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork"); - TFS_Material tFS_Material = BaseBll.GetTempModel(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString())); + TeamworkBll TeamworkBll = new TeamworkBll(); + List materialList = TeamworkBll.CheckMaterialListByTest(inParam["FNewTestCode"].ToString(), inParam["FVersionCode"].ToString()); + //TFS_Material tFS_Material = BaseBll.GetTempModel(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString())); List editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory); ids = editMaterialList.Select(m => m.FID).Distinct().ToList(); @@ -274,7 +276,7 @@ namespace FactorySystemApi.Controllers - if (tFS_Material == null) + if (materialList.Count()==0) { //开始BOM下载 int dow = DockGetBomData(teamwork.FID, user.FID); diff --git a/FactorySystemApi/Web.config b/FactorySystemApi/Web.config index 117f35f..2d977e7 100644 --- a/FactorySystemApi/Web.config +++ b/FactorySystemApi/Web.config @@ -12,8 +12,8 @@ - - + +