Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -529,6 +529,7 @@ namespace Tnb.ProductionMgr
                 .WhereIF(moTypeList != null && moTypeList.Count > 0, (a, b, c, d, e) => moTypeList.Contains(a.mo_type))
                 .WhereIF(!string.IsNullOrEmpty(moCode),(a,b,c,d,e)=>a.mo_code.Contains(moCode))
                 .WhereIF(!string.IsNullOrEmpty(combineMoCode),(a,b,c,d,e)=>a.combine_mo_code.Contains(combineMoCode))
+                .Where((a,b,c,d,e)=>SqlFunc.IsNullOrEmpty(a.parent_id))
                 .OrderByDescending((a,b,c,d,e)=>a.create_time)
                 .Select((a, b, c, d, e) => new PrdMoListTreeOutput
                 {