diff --git a/FactorySystemBll/TaskBll.cs b/FactorySystemBll/TaskBll.cs index 1e007bc..8e68a29 100644 --- a/FactorySystemBll/TaskBll.cs +++ b/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("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") + .Select("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,b.FBomJson") .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber); } diff --git a/FactorySystemModel/ResponseModel/TaskRow.cs b/FactorySystemModel/ResponseModel/TaskRow.cs index 703cefd..780690e 100644 --- a/FactorySystemModel/ResponseModel/TaskRow.cs +++ b/FactorySystemModel/ResponseModel/TaskRow.cs @@ -53,5 +53,7 @@ namespace FactorySystemModel.ResponseModel /// Desc:是否有FHasBomJson /// public int FHasBomJson { get; set; } + + public string FBomJson { get; set; } } } \ No newline at end of file