Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi

FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs

@@ -688,7 +688,8 @@ namespace FactorySystemApi.Controllers
             {
                 TFS_Formula formula = BaseBll.GetTempModel<TFS_Formula>(string.Format("FTestCode='{0}'", teamwork.FNewTestCode));
                 OAService oAService = new OAService();
-                specifList[0].Code = teamwork.FNewTestCode;
+                //specifList[0].Code = teamwork.FPlmCode;
+                specifList[0].Code = formula.FPlmCode;
                 specifList[0].Version = formula.FVersionCode;
 
 

FactorySystemApi/Controllers/TeamworkController.cs

@@ -523,7 +523,8 @@ namespace FactorySystemApi.Controllers
                 TFS_Formula formula = BaseBll.GetTempModel<TFS_Formula>(teamwork.FFormulaID);
                 OAService oAService = new OAService();
 
-                specifList[0].Code = formula.FTestCode;
+                //specifList[0].Code = formula.FTestCode;
+                specifList[0].Code = formula.FPlmCode;
                 specifList[0].Version = formula.FVersionCode;
 
                 //修改

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/HalfMaterialTaskBll.cs

@@ -38,7 +38,7 @@ namespace FactorySystemBll
                 .WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ','))
                 // 协同
                 .WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc)
-                .Select<object>("a.*,b.FNewTestCode,b.FVersionCode,a.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,d.FName AS 'FUserName1',(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson")
+                .Select<object>("a.*,b.FNewTestCode,b.FVersionCode,a.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,d.FName AS 'FUserName1',(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson,b.FBomJson")
                 .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
         }