commit by yzf

2 years ago · 09f4e642b3
parent 82b0cfc162
commit 09f4e642b3
1 changed files with 26 additions and 2 deletions
--- 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);