From 09f4e642b3efa0d11171448b147816da74ad3008 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Thu, 31 Aug 2023 15:28:29 +0800
Subject: [PATCH] commit by yzf

---
 .../Controllers/TeamworkController.cs         | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs
index 7260f05..0de4edb 100644
--- a/FactorySystemApi/Controllers/TeamworkController.cs
+++ b/FactorySystemApi/Controllers/TeamworkController.cs
@@ -1194,14 +1194,38 @@ namespace FactorySystemApi.Controllers
                 }
                 else
                 {
-                    if (field.FName == "基本数量")
+                    if (field.FName == "基本数量" && intType == 5)
                     {
                         selectSql += string.Format("isnull({0},(select TFS_PackageMain.FBomUnit 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 == "组件数量") 
+                    else if (field.FName == "组件数量" && intType == 5)
                     {
                         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 from TFS_PackageMain where TFS_PackageMain.FID =(select top 1 FPackID from TFS_FTeamwork where FID=@FTeamID@))  ) AS '组件数量'");
                     }
+                    else if (field.FName == "基本数量" && intType == 2)
+                    {
+                        selectSql += string.Format("isnull({0},(select TFS_PackageMain.FBomUnit 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 == "组件数量" && intType == 2)
+                    {
+                        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 from TFS_PackageMain where TFS_PackageMain.FID =(select top 1 FPackID from TFS_FTeamwork where FID=@FTeamID@))  ) AS '组件数量'");
+                    }
+                    else if (field.FName == "物料供应标识符" && intType == 2)
+                    {
+                        selectSql += string.Format(@"isnull(CASE 
+	                                                        WHEN TFS_Material.FSupplyCode='(空)' THEN ''
+	                                                        ELSE TFS_Material.FSupplyCode
+                                                        END
+                                                        ,'') as '{1}'", field.FField, field.FName);
+                    }
+                    else if (field.FName == "固定损耗数量" && intType == 2) 
+                    {
+                        selectSql += string.Format(@"isnull(CASE 
+	                                                        WHEN TFS_Material.FFixedLoss='(空)' THEN ''
+	                                                        ELSE TFS_Material.FFixedLoss
+                                                        END
+                                                        ,'') as '{1}'", field.FField, field.FName);
+                    }
                     else
                     {
                         selectSql += string.Format("isnull({0},'') as '{1}'", field.FField, field.FName);