Compare commits

..

No commits in common. '9d3fbdf41dc809ecd5cf13d4b57df68d9125800e' and 'ff6f23683d780506199cd87435a7f23f321d2bfb' have entirely different histories.

@ -37,7 +37,7 @@ namespace FactorySystemBll
.WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ',')) .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) .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,(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson,b.FBomJson") .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); .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber);
} }

@ -53,7 +53,5 @@ namespace FactorySystemModel.ResponseModel
/// Desc:是否有FHasBomJson /// Desc:是否有FHasBomJson
/// </summary> /// </summary>
public int FHasBomJson { get; set; } public int FHasBomJson { get; set; }
public string FBomJson { get; set; }
} }
} }
Loading…
Cancel
Save