From d3d44882b354edc9815912e10d4da71c35031482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Sat, 22 Feb 2025 14:28:28 +0800
Subject: [PATCH] =?UTF-8?q?GP12=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/qc/GP12/QcGp12Controller.cs           |  2 +-
 ZR.Service/mes/qc/QcGp12Service.cs            | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

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<QcGp12AlterationDefectDto> defectList = new();
             var predicate = Expressionable.Create<QcGp12BaseDefect>().And(it => it.Status == "1");
-            List<string> groupList = Context
+            /*List<string> groupList = Context
                 .Queryable<QcGp12BaseDefect>()
                 .Where(predicate.ToExpression())
                 .GroupBy(it => it.Group)
                 .Select(it => it.Group)
-                .ToList();
+                .ToList();*/
+            List<string>  groupList = new()
+            {
+                "油漆",
+                "设备",
+                "毛坯",
+                "程序",
+                "班组操作"
+            };
             foreach (string group in groupList)
             {
                 QcGp12AlterationDefectDto defectDto = new();
@@ -180,12 +188,20 @@ namespace ZR.Service.Business
                 .Create<QcGp12BaseDefect>()
                 .And(it => it.Type == "打磨")
                 .And(it => it.Status == "1");
-            List<string> groupList = Context
+           /* List<string> groupList = Context
                 .Queryable<QcGp12BaseDefect>()
                 .Where(predicate.ToExpression())
                 .GroupBy(it => it.Group)
                 .Select(it => it.Group)
-                .ToList();
+                .ToList();*/
+            List<string> groupList = new()
+            {
+                "油漆",
+                "设备",
+                "毛坯",
+                "程序",
+                "班组操作"
+            };
             foreach (string group in groupList)
             {
                 QcGp12AlterationDefectDto defectDto = new();