From b2bc0cccd77524b3ba1f05d5f7854324ce62ba2e Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 12 二月 2025 18:12:14 +0800
Subject: [PATCH] 泰莱姆首检巡检添加

---
 MES.Service/service/QC/XJService.cs |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index ad76d93..cc2ff82 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -47,7 +47,7 @@
         return db.Queryable<Womdaa>()
             .Where(a =>
                 a.Daa001 == daa001 &&
-                statusArray.Contains(a.Daa018))
+                a.Daa018 != "瀹屽伐")
             .ToList();
     }
 
@@ -58,7 +58,7 @@
         return db.Queryable<Womdaa, MesLine>((a, b) =>
                 new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
             .Where((a, b) => b.LineName != null &&
-                             statusArray.Contains(a.Daa018))
+                             a.Daa018 != "瀹屽伐")
             .GroupBy((a, b) => new
             {
                 b.LineNo, b.LineName
@@ -78,12 +78,13 @@
             .Where((a, b) =>
                 a.Daa015 == daa020 &&
                 b.ItemNo == item &&
-                statusArray.Contains(a.Daa018))
+                a.Daa018 != "瀹屽伐")
             .Select<Womdaa>(a => new Womdaa
             {
                 Id = a.Id,
                 Daa001 = a.Daa001,
-                Daa003 = a.Daa003
+                Daa003 = a.Daa003,
+                Daa008 = a.Daa008
             }).ToList();
     }
 
@@ -92,14 +93,16 @@
         var db = SqlSugarHelper.GetInstance();
         return db.Queryable<Womdaa, MesItems>((a, b) =>
                 new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
-            .Where((a, b) => statusArray.Contains(a.Daa018) &&
+            .Where((a, b) => a.Daa018 != "瀹屽伐" &&
                              a.Daa015 == lineNo)
             .OrderBy((a, b) => b.ItemName)
             .Select<MesItems>((a, b) =>
                 new MesItems
                 {
+                    ItemId = b.ItemId,
                     ItemNo = b.ItemNo,
-                    ItemName = b.ItemName
+                    ItemName = b.ItemName,
+                    ItemModel = b.ItemModel
                 }).ToList();
     }
 
@@ -120,7 +123,7 @@
                 new JoinQueryInfos(
                     JoinType.Inner, s.BillNo == a.Daa001,
                     JoinType.Left, a.Daa015 == c.LineNo,
-                    JoinType.Left, s.ItemNo == b.ItemNo
+                    JoinType.Left, s.ItemId == b.Id
                 )
             )
             .WhereIF(lineNo != null && lineNo.Length > 0,
@@ -136,36 +139,37 @@
             .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
             .Select((s, a, c, b) => new QsQaItemXj
             {
-                MoidNum = s.MoidNum,
                 Daa020 = c.LineNo,
                 Id = s.Id,
+                PlanQty = a.Daa008,
                 CreateBy = s.CreateBy,
                 CreateDate = s.CreateDate,
                 ReleaseNo = s.ReleaseNo,
                 ItemNo = s.ItemNo,
-                ItemUnit = s.ItemUnit,
                 BillNo = s.BillNo,
+                ItemName = b.ItemName,
+                ItemModel = b.ItemModel,
                 FcheckBy = s.FcheckBy,
                 FcheckResu = s.FcheckResu,
-                Remarks = s.Remarks,
+                Remarks = s.Remarks
             }).OrderBy(s => s.CreateDate, OrderByType.Desc)
             .ToPageList(queryObj.PageIndex, queryObj.Limit);
     }
 
 
-    public List<QsQaItemXj01> setJYItem(string itemNo)
+    public List<QsQaItemXj01> setJYItem(decimal itemId)
     {
         var db = SqlSugarHelper.GetInstance();
 
         var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
-            && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+            && s.ItemId == itemId && s.Fsubmit == 1).Count();
 
         if (count <= 0) return new List<QsQaItemXj01>();
 
         return db
             .Queryable<MesQualityStandard>()
             .Where(b => b.QsType == "2"
-                        && b.ItemNo == itemNo).Select(
+                        && b.ItemId == itemId).Select(
                 b => new QsQaItemXj01
                 {
                     ProjName = b.ProjName,

--
Gitblit v1.9.3