From 5de35354e8dfcb4933350d0d1b645d400bcf23ab Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 22 七月 2025 15:30:09 +0800
Subject: [PATCH] 优化多组织

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

diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 6fef5bc..724eac6 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -10,7 +10,7 @@
     public bool Save(ErpCustomer customer)
     {
         var entity = GetMesCustomer(customer);
-
+        
         return UseTransaction(db =>
         {
             switch (customer.Type)
@@ -55,11 +55,13 @@
                 switch (customerGroup.Key)
                 {
                     case "0":
-                        if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"A"))
+                        if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+                                "A"))
                             throw new NotImplementedException("鍚敤澶辫触");
                         break;
                     case "1":
-                        if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"B"))
+                        if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+                                "B"))
                             throw new NotImplementedException("绂佺敤澶辫触");
                         break;
                     case "2":
@@ -90,10 +92,10 @@
 
     private bool InsertCustomer(SqlSugarScope db, MesCustomer entity)
     {
-        var exists = db.Queryable<MesCustomer>().Any(e => e.Id == entity.Id);
+        var exists = db.Queryable<MesCustomer>().Any(e => e.Id == entity.Id && e.CustNo==entity.CustNo);
         if (exists)
         {
-            var result = db.Updateable<MesCustomer>().ExecuteCommand();
+            var result = db.Updateable(entity).Where(e => e.Id == entity.Id && e.CustNo == entity.CustNo).ExecuteCommand();
             return true;
         }
         else
@@ -111,10 +113,10 @@
     }
     private bool InsertOrUpdate(SqlSugarScope db, MesCustomer entity)
     {
-        var exists = db.Queryable<MesCustomer>().Any(e => e.Id == entity.Id);
+        var exists = db.Queryable<MesCustomer>().Any(e => e.Id == entity.Id && e.CustNo == entity.CustNo);
         if (exists)
         {
-            var update = db.Updateable(entity).ExecuteCommand();
+            var update = db.Updateable(entity).Where(e => e.Id == entity.Id && e.CustNo == entity.CustNo).ExecuteCommand();
             return true;
         }
         else
@@ -144,8 +146,8 @@
             Fseller = customer.FSeller,
             Fforbidstatus = customer.FForbidStatus,
             CreateDate = DateTime.Now,
-            CreateOrg= Convert.ToDecimal(customer.FCreateOrgId),
-            UseOrg= Convert.ToDecimal(customer.FUseOrgId),
+            CreateOrg = Convert.ToDecimal(customer.FCreateOrgId),
+            UseOrg = Convert.ToDecimal(customer.FUseOrgId),
             Company = "1000",
             Factory = "1000"
         };

--
Gitblit v1.9.3