From 08a3102b7b9996dccff36266757e8b28f2baba91 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sat, 3 Jun 2023 22:20:10 +0800
Subject: [PATCH] commit by yzf

---
 .../Controllers/HalfMaterialTeamworkController.cs           | 6 ++++--
 FactorySystemApi/Web.config                                 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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<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);
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 @@
   <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=120.55.81.57;uid=sa;pwd=1qaz@WSX;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="Sap_UserName" value="mcs_con" />
 	<add key="Sap_Upload_UserName" value="chenjie" />