diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12Controller.cs b/ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12Controller.cs index 11ae4675..0786b21b 100644 --- a/ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12Controller.cs @@ -146,7 +146,7 @@ namespace ZR.Admin.WebApi.Controllers return SUCCESS(response); }catch(Exception ex) { - return SUCCESS("请刷新页面"); + return SUCCESS("请刷新页面,错误代码:" + ex.Message); } } diff --git a/ZR.Service/mes/qc/QcGp12Service.cs b/ZR.Service/mes/qc/QcGp12Service.cs index c0c90020..27194887 100644 --- a/ZR.Service/mes/qc/QcGp12Service.cs +++ b/ZR.Service/mes/qc/QcGp12Service.cs @@ -145,12 +145,20 @@ namespace ZR.Service.Business { List defectList = new(); var predicate = Expressionable.Create().And(it => it.Status == "1"); - List groupList = Context + /*List groupList = Context .Queryable() .Where(predicate.ToExpression()) .GroupBy(it => it.Group) .Select(it => it.Group) - .ToList(); + .ToList();*/ + List groupList = new() + { + "油漆", + "设备", + "毛坯", + "程序", + "班组操作" + }; foreach (string group in groupList) { QcGp12AlterationDefectDto defectDto = new(); @@ -180,12 +188,20 @@ namespace ZR.Service.Business .Create() .And(it => it.Type == "打磨") .And(it => it.Status == "1"); - List groupList = Context + /* List groupList = Context .Queryable() .Where(predicate.ToExpression()) .GroupBy(it => it.Group) .Select(it => it.Group) - .ToList(); + .ToList();*/ + List groupList = new() + { + "油漆", + "设备", + "毛坯", + "程序", + "班组操作" + }; foreach (string group in groupList) { QcGp12AlterationDefectDto defectDto = new();