From b957cfb89c9968f47cc5ce9795e6ffb05bc57fd8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 16:05:48 +0800
Subject: [PATCH] 11

---
 MES.Service/service/BasicData/MesItemsManager.cs |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 933b47e..52a92ad 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -23,14 +23,11 @@
                     if (UpdateItemStatus(db, entity.Id, "B"))
                         return 1;
                     break;
-                case "2":
-                    if (InsertItem(db, entity))
-                        return 1;
-                    break;
                 case "3":
                     if (DeleteItem(db, entity.Id))
                         return 1;
                     break;
+                case "2":
                 case "4":
                     if (InsertOrUpdate(db, entity))
                         return 1;
@@ -63,14 +60,11 @@
                         if (!UpdateItemStatusBatch(db, itemGroup.Value, "B"))
                             throw new NotImplementedException("绂佺敤澶辫触");
                         break;
-                    case "2":
-                        if (!InsertItemBatch(db, itemGroup.Value))
-                            throw new NotImplementedException("鎻掑叆澶辫触");
-                        break;
                     case "3":
                         if (!DeleteItemBatch(db, itemGroup.Value))
                             throw new NotImplementedException("鍒犻櫎澶辫触");
                         break;
+                    case "2":
                     case "4":
                         if (!InsertOrUpdateBatch(db, itemGroup.Value))
                             throw new NotImplementedException("鍚屾澶辫触");
@@ -108,7 +102,8 @@
 
     private bool DeleteItem(SqlSugarScope db, decimal itemId)
     {
-        var deleteById = db.Deleteable<MesItems>().In(itemId).ExecuteCommand();
+        var deleteById = db.Deleteable<MesItems>()
+            .Where(s => s.Id == itemId).ExecuteCommand();
         if (deleteById > 0)
             return true;
 
@@ -179,7 +174,8 @@
     private bool DeleteItemBatch(SqlSugarScope db, List<MesItems> itemList)
     {
         var ids = itemList.Select(it => it.Id).ToArray();
-        var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
+        var deleteByIds = db.Deleteable<MesItems>()
+            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
         if (deleteByIds > 0)
             return true;
 
@@ -197,10 +193,6 @@
 
     private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesItems> itemList)
     {
-        foreach (var entity in itemList)
-            if (!InsertOrUpdate(db, entity))
-                return false;
-
-        return true;
+        return itemList.All(entity => InsertOrUpdate(db, entity));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3