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

FactorySystemApi/Controllers/TeamworkController.cs

@@ -1196,11 +1196,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
                     {
@@ -1227,7 +1227,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]["固定损耗数量"] = "";