From 67d5df87dcdf21454e71e1745e48f9a93f83cb1a Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Tue, 30 May 2023 17:02:14 +0800
Subject: [PATCH] commoit by yzf

---
 FactorySystemApi/Web.config                 |  4 +--
 FactorySystemBll/HalfMaterialTeamworkBll.cs |  4 +--
 FactorySystemBll/ViewBll.cs                 | 33 ++++++++++++++++++++-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/FactorySystemApi/Web.config b/FactorySystemApi/Web.config
index 2d977e7..117f35f 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" />
diff --git a/FactorySystemBll/HalfMaterialTeamworkBll.cs b/FactorySystemBll/HalfMaterialTeamworkBll.cs
index 754a788..4686388 100644
--- a/FactorySystemBll/HalfMaterialTeamworkBll.cs
+++ b/FactorySystemBll/HalfMaterialTeamworkBll.cs
@@ -792,11 +792,11 @@ 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} WHERE FMaterialID in ({1});update TFS_MaterialInfo set FTestCode='{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={1} WHERE FMaterialID in ({1});update TFS_MaterialInfo set FTestCode='{0}',FBaseTestCode='{0}'  WHERE FDataID IN({1})", testCode2, string.Join(",", ids), temId);
             }
             else
             {
-                sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_MaterialInfo set FTestCode='{0}'  WHERE FDataID IN({1})", testCode, idList);
+                sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_MaterialInfo set FTestCode='{0}',FBaseTestCode='{0}'  WHERE FDataID IN({1})", testCode, idList);
             }
             if (materialList.Count() > 0)
             {
diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs
index e9f1ab7..9338b5b 100644
--- a/FactorySystemBll/ViewBll.cs
+++ b/FactorySystemBll/ViewBll.cs
@@ -412,7 +412,8 @@ namespace FactorySystemBll
                         FType2 = temp.FTypeID2,
                         FMaterialGroup = temp.FMaterialGroup,
                         FMaterialType = temp.FMaterialType,
-                        FTestCode= temp.FTestCode
+                        FTestCode= temp.FTestCode,
+                        FBaseTestCode=temp.FTestCode
                     };
                     db.Insertable(info).IgnoreColumns(true).ExecuteCommand();
                 }
@@ -887,6 +888,36 @@ namespace FactorySystemBll
             {
                 for (int i = 0; i < infoList.Count; i++)
                 {
+                    if (infoList[i].ContainsKey("FTestCode")) 
+                    {
+                        if (materialList[i].ContainsKey("FTestCode")) 
+                        {
+                            infoList[i]["FTestCode"] = materialList[i]["FTestCode"].ToString();
+                        }
+                    }
+                    else 
+                    {
+                        if (materialList[i].ContainsKey("FTestCode")) 
+                        {
+                            infoList[i].Add("FTestCode", materialList[i]["FTestCode"].ToString());
+                        }
+                    }
+
+                    if (infoList[i].ContainsKey("FBaseTestCode")) 
+                    {
+                        if (viewList[i].ContainsKey("FBaseTestCode")) 
+                        {
+                            infoList[i]["FBaseTestCode"] = viewList[i]["FBaseTestCode"].ToString();
+                        }
+                    }
+                    else 
+                    {
+                        if (viewList[i].ContainsKey("FBaseTestCode")) 
+                        {
+                            infoList[i].Add("FBaseTestCode", viewList[i]["FBaseTestCode"].ToString());
+                        }
+                    }
+
                     infoList[i]["FDataID"] = infoList[i]["FMaterialID"];
                     infoList[i].Remove("FMaterialID");
                     infoList[i].Add("FType", 2);