From c02ff3f682398f022488f98b87a79d4a8e04b5dd Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 11:00:11 +0800
Subject: [PATCH] 接口更新

---
 MES.Service/service/BasicData/MesCustomerManager.cs |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 2965234..8870f95 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -23,14 +23,11 @@
                     if (UpdateCustomerStatus(db, entity.Id, "B"))
                         return 1;
                     break;
-                case "2":
-                    if (InsertCustomer(db, entity))
-                        return 1;
-                    break;
                 case "3":
                     if (DeleteCustomer(db, entity.Id))
                         return 1;
                     break;
+                case "2":
                 case "4":
                     if (InsertOrUpdate(db, entity))
                         return 1;
@@ -110,8 +107,8 @@
 
     private bool DeleteCustomer(SqlSugarScope db, decimal customerId)
     {
-        var deleteById = db.Deleteable<MesCustomer>().In(customerId)
-            .ExecuteCommand();
+        var deleteById = db.Deleteable<MesCustomer>()
+            .Where(s => s.Id == customerId).ExecuteCommand();
         if (deleteById > 0)
             return true;
 
@@ -139,7 +136,8 @@
             LastupdateDate = DateTime.Now,
             Company = "1000",
             Factory = "1000",
-            DataType = customer.FDocumentStatus
+            DataType = customer.FDocumentStatus,
+            Type = customer.Type
         };
     }
 
@@ -171,7 +169,8 @@
         List<MesCustomer> customerList)
     {
         var ids = customerList.Select(it => it.Id).ToArray();
-        var deleteByIds = db.Deleteable<MesCustomer>().In(ids).ExecuteCommand();
+        var deleteByIds = db.Deleteable<MesCustomer>()
+            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
         if (deleteByIds > 0)
             return true;
 
@@ -185,19 +184,12 @@
 
         var insert = db.Insertable(entity).ExecuteCommand();
 
-        if (insert > 0)
-            return true;
-
-        return false;
+        return insert > 0;
     }
 
     private bool InsertOrUpdateBatch(SqlSugarScope db,
         List<MesCustomer> customerList)
     {
-        foreach (var entity in customerList)
-            if (!InsertOrUpdate(db, entity))
-                return false;
-
-        return true;
+        return customerList.All(entity => InsertOrUpdate(db, entity));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3