From c58b5315ae31cc51a3e95a41818299913c0b3002 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 26 八月 2025 14:05:10 +0800
Subject: [PATCH] 首检获取检验项目前删除原有的检验项

---
 MES.Service/service/QC/SJService.cs |   47 +++++++++++++++++++++++------------------------
 1 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index c139b94..9b89e5d 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -136,15 +136,10 @@
     public List<QsItemIpiItem> getQSItems(decimal? pid, decimal? id)
     {
         var db = SqlSugarHelper.GetInstance();
-        var qsItemIpiItems = db
-            .Queryable<QsItemIpiItem>()
-            .WhereIF(pid > 0, a => a.Pid == pid)
-            .WhereIF(id > 0, a => a.Id == id).ToList();
+        var qsItemIpiItems = db.Queryable<QsItemIpiItem>().WhereIF(pid > 0, a => a.Pid == pid).WhereIF(id > 0, a => a.Id == id).ToList();
 
         var array = qsItemIpiItems.Select(s => s.Id).ToArray();
-        var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>()
-            .Where(s => array.Contains(s.Pid))
-            .GroupBy(s => s.Pid)
+        var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>().Where(s => array.Contains(s.Pid)).GroupBy(s => s.Pid)
             .Select(s => new
             {
                 s.Pid,
@@ -172,9 +167,7 @@
         });
 
         //浣跨敤linq琛ㄨ揪寮忚繃婊ゅ嚭鍥剧墖id涓嶄负绌虹殑鏁版嵁
-        var itemIpiItems =
-            qsItemIpiItems.Where(s => s.Picture is { Length: > 0 })
-                .ToList();
+        var itemIpiItems =qsItemIpiItems.Where(s => s.Picture is { Length: > 0 }).ToList();
         if (itemIpiItems.Count > 0)
             itemIpiItems.ForEach(s =>
             {
@@ -197,16 +190,14 @@
             db =>
             {
                 qsItemIpiReq.StatusDate = DateTime.Now;
-                var pid = db.Insertable(qsItemIpiReq)
-                    .ExecuteReturnIdentity();
+                var pid = db.Insertable(qsItemIpiReq).ExecuteReturnIdentity();
                 qsItemIpiReq.Id = pid;
 
                 item.gid = pid;
 
                 qsItemIpiItems.ForEach(s => s.Pid = pid);
 
-                return db.Insertable(qsItemIpiItems)
-                    .ExecuteCommand();
+                return db.Insertable(qsItemIpiItems).ExecuteCommand();
             });
         item.Items = getQSItems(qsItemIpiReq.Id, null);
 
@@ -235,22 +226,33 @@
 
     public QsItem SaveItem(QsItem item)
     {
+        var db = SqlSugarHelper.GetInstance();
+
+        var del = db.Deleteable<QsItemIpiItem>()
+            .Where(s=>s.Pid == item.gid)
+            .ExecuteCommand();
+
+        //QsItemIpiItemDetail
+        var del1 = db.Deleteable<QsItemIpiItemDetail>()
+            .Where(s => s.Gid == item.gid)
+            .ExecuteCommand();
+
         var qsItemIpiItems = item.Items;
         SqlSugarHelper.UseTransactionWithOracle(
             db =>
             {
                 qsItemIpiItems.ForEach(s => s.Pid = item.gid);
-
-                return db.Insertable(qsItemIpiItems)
-                    .ExecuteCommand();
+                return db.Insertable(qsItemIpiItems).ExecuteCommand();
             });
         item.Items = getQSItems(item.gid, null);
 
         //娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
         item.Items.ForEach(s =>
         {
-            if (s.MaxValue != null || s.StandardValue != null ||
-                s.MinValue != null) return;
+            if (s.MaxValue != null || s.StandardValue != null || s.MinValue != null)
+            {
+                return;
+            }
             var detail = new QsItemIpiItemDetail();
             detail.Pid = s.Id;
             detail.Gid = item.gid;
@@ -282,7 +284,6 @@
                 item.CreateDate = DateTime.Now;
                 result.Add(item);
             }
-
             return db.Insertable(result).ExecuteCommand();
         });
 
@@ -434,8 +435,7 @@
         return SqlSugarHelper.UseTransactionWithOracle(db =>
         {
             return db.Updateable<QsItemIpiItem>()
-                .SetColumns(it =>
-                    it.Notes == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+                .SetColumns(it =>it.Notes == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
                 .Where(it => it.Id == dto.pid)
                 .ExecuteCommand();
         });
@@ -447,8 +447,7 @@
         return SqlSugarHelper.UseTransactionWithOracle(db =>
         {
             return db.Updateable<QsItemIpiItemDetail>()
-                .SetColumns(it =>
-                    it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+                .SetColumns(it =>it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
                 .Where(it => it.Id == dto.id)
                 .ExecuteCommand();
         });

--
Gitblit v1.9.3