From 51079647b0f820d4b5ee45aff9e3acd598a79cb6 Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Sat, 12 Aug 2023 16:55:32 +0800 Subject: [PATCH] commit by yzf --- FactorySystemApi/Controllers/TeamworkController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs index ea81fe2..93c9378 100644 --- a/FactorySystemApi/Controllers/TeamworkController.cs +++ b/FactorySystemApi/Controllers/TeamworkController.cs @@ -1169,11 +1169,11 @@ namespace FactorySystemApi.Controllers { 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); + 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 == "组件数量") { - 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 '组件数量'"); + 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 { @@ -1200,7 +1200,7 @@ namespace FactorySystemApi.Controllers //生产组装BOM处理 for (int i = 0; i < rowCount; i++) { - if (hasField[0]) dataList.Rows[i]["BOM用途"] = "Y"; + if (hasField[0]) dataList.Rows[i]["BOM用途"] = "1"; if (hasField[1]) dataList.Rows[i]["子项序号"] = (i + 1) * 10; if (hasField[2]) dataList.Rows[i]["组件损耗率"] = ""; if (hasField[3]) dataList.Rows[i]["固定损耗数量"] = "";