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

FactorySystemApi/Controllers/TeamworkController.cs

@@ -139,7 +139,8 @@ namespace FactorySystemApi.Controllers
                             //直接走下一步
                             if (state.ToString().Contains("1")) {
                                 TFS_FTeamwork teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
-                                List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FTestCode, teamwork.FVersionCode);
+                                //List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FTestCode, teamwork.FVersionCode);
+                                List<TFS_Material> materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FFormulaTestCode, teamwork.FVersionCode);
                                 if (materialList.Count == 0) {
                                     TeamworkBll.CreateProductView(teamwork, null, user.FID);
                                     //开始BOM下载

FactorySystemBll/TaskBll.cs

@@ -37,7 +37,7 @@ namespace FactorySystemBll
                 .WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ','))
                 // 协同
                 .WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc)
-                .Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType")
+                .Select<TaskRow>("a.*,b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson")
                 .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
         }
 

FactorySystemModel/ResponseModel/TaskRow.cs

@@ -44,11 +44,14 @@ namespace FactorySystemModel.ResponseModel
         /// </summary>           
         public string FUserName { get; set; }
 
-
         /// <summary>
         /// Desc:半成品号
         /// </summary>      
         public string FMaterialHalfIDs { get; set; }
 
+        /// <summary>
+        /// Desc:是否有FHasBomJson
+        /// </summary>      
+        public int FHasBomJson { get; set; }
     }
 }