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

FactorySystemApi/Controllers/SapUploadController.cs

@@ -9,6 +9,7 @@ using Newtonsoft.Json;
 using FactorySystemApi.Sap_ProductVersion;
 using FactorySystemApi.Sap_Bom;
 using FactorySystemApi.Sap_ViewMaterial;
+using System.Linq;
 
 namespace FactorySystemApi.Controllers
 {
@@ -91,12 +92,22 @@ namespace FactorySystemApi.Controllers
 
                 return ExceptionHelper.TryReturnException(() =>
                 {
+
                     si_pp079_mcs_senderClient senderClient = new si_pp079_mcs_senderClient();
                     senderClient.ClientCredentials.UserName.UserName = AppSettingsHelper.GetAppSettingVal("Sap_Upload_UserName");
                     senderClient.ClientCredentials.UserName.Password = AppSettingsHelper.GetAppSettingVal("Sap_Password");
 
                     dt_pp079_resHEAD[] resData = senderClient.si_pp079_mcs_sender(req);
                     apiResult.Data = 1;
+                    for (int i = 0; i < resData.Count(); i++)
+                    {
+                        if ("E".Equals(resData[i].TYPE))
+                        {
+                            apiResult.Data = resData[i].INFOTEXT;
+                            apiResult.Message = resData[i].INFOTEXT;
+                            break;
+                        }
+                    }
                 }, apiResult, Request, req);
             }
             else
@@ -166,6 +177,17 @@ namespace FactorySystemApi.Controllers
                     dt_pp080_resHEAD[] resData = senderClient.si_pp080_mcs_sender(req);
                     apiResult.Data = 1;
 
+                    for (int i = 0; i < resData.Count(); i++)
+                    {
+                        if ("E".Equals(resData[i].STATUS))
+                        {
+                            apiResult.Data = resData[i].INFOTEXT;
+                            apiResult.Message = resData[i].INFOTEXT;
+                            break;
+                        }
+                    }
+                    
+
                 }, apiResult, Request, req);                
             }
             else

FactorySystemApi/Controllers/TeamworkController.cs

@@ -1182,7 +1182,18 @@ namespace FactorySystemApi.Controllers
                 }
                 else
                 {
-                    selectSql += string.Format("isnull({0},'') as '{1}'", field.FField, field.FName);
+                    if (field.FName == "基本数量")
+                    {
+                        selectSql += string.Format("isnull({0},(select TFS_PackageMain.FBomUnit*1000 from TFS_PackageMain where TFS_PackageMain.FID =(select top 1 FPackID from TFS_FTeamwork where FID=@FTeamID@))) as '{1}'", field.FField, field.FName);
+                    }
+                    else if (field.FName == "组件数量") 
+                    {
+                        selectSql += string.Format(@"isnull( ( CASE WHEN TFS_ViewMaterial.FExtraQuantity IS NULL OR  TFS_ViewMaterial.FExtraQuantity= '' THEN TFS_PackageChild.FCount ELSE TFS_ViewMaterial.FExtraQuantity END ), (select TFS_PackageMain.FBomUnit*1000 from TFS_PackageMain where TFS_PackageMain.FID =(select top 1 FPackID from TFS_FTeamwork where FID=@FTeamID@))  ) AS '组件数量'");
+                    }
+                    else
+                    {
+                        selectSql += string.Format("isnull({0},'') as '{1}'", field.FField, field.FName);
+                    }
                 }
                 selectSql += ",";
             }

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.156,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.156,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="plm_com" />