commit by yzf

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<TFS_Material>(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString()));
+                    TeamworkBll TeamworkBll = new TeamworkBll();
+                    List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(inParam["FNewTestCode"].ToString(), inParam["FVersionCode"].ToString());
+                    //TFS_Material tFS_Material = BaseBll.GetTempModel<TFS_Material>(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString()));
                     List<TFS_Material> 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);

FactorySystemApi/Web.config

@@ -12,8 +12,8 @@
   <appSettings>
     <add key="ApiAuthSecretKey" value="zhkxfs" />
     <!--<add key="ConnectionString" value="server=49.235.68.145,3456;uid=sa;pwd=zhenxuan@2019;database=FactorySystem" />-->
-	  <add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />
+	  <!--<add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />-->
-	<!--<add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />-->
+	<add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />
 
     <add key="Sap_UserName" value="mcs_con" />
 	<add key="Sap_Upload_UserName" value="chenjie" />

FactorySystemBll/HalfMaterialTeamworkBll.cs

@@ -792,7 +792,7 @@ namespace FactorySystemBll
 
             if (string.IsNullOrWhiteSpace(idList))
             {
-                sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_ViewMaterial set FHalfMaterialTeamID={2},FBaseTestCode={1} WHERE FMaterialID in ({1});update TFS_MaterialInfo set FTestCode='{0}',FBaseTestCode='{0}'  WHERE FDataID IN({1})", testCode2, string.Join(",", ids), temId);
+                sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_ViewMaterial set FHalfMaterialTeamID={2},FBaseTestCode='{0}' WHERE FMaterialID in ({1});update TFS_MaterialInfo set FTestCode='{0}',FBaseTestCode='{0}'  WHERE FDataID IN({1})", testCode2, string.Join(",", ids), temId);
             }
             else
             {