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/MesSupplierManager.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 649b8fd..6ce5efc 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -89,10 +89,10 @@
 
     private bool InsertSupplier(SqlSugarScope db, MesSupplier entity)
     {
-        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
+        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id && e.SuppNo == entity.SuppNo);
         if (exists)
         {
-            var result = db.Updateable<MesSupplier>().ExecuteCommand();
+            var result = db.Updateable(entity).Where(e => e.Id == entity.Id && e.SuppNo == entity.SuppNo).ExecuteCommand();
             return true;
         }
         else
@@ -111,10 +111,10 @@
 
     private bool InsertOrUpdate(SqlSugarScope db, MesSupplier entity)
     {
-        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
+        var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id && e.SuppNo == entity.SuppNo);
         if (exists)
         {
-            var update = db.Updateable(entity).ExecuteCommand();
+            var update = db.Updateable(entity).Where(e => e.Id == entity.Id && e.SuppNo == entity.SuppNo).ExecuteCommand();
             return true;
         }
         else
@@ -144,9 +144,9 @@
             Fstaffid = supplier.FStaffId,
             Fforbidstatus = supplier.FForbidStatus,
             CreateDate = DateTime.Now,
-            CreateOrg= Convert.ToDecimal(supplier.FCreateOrgId),
-            UseOrg= Convert.ToDecimal(supplier.FUseOrgId),
-            Remark=supplier.FDescription,
+            CreateOrg = Convert.ToDecimal(supplier.FCreateOrgId),
+            UseOrg = Convert.ToDecimal(supplier.FUseOrgId),
+            Remark = supplier.FDescription,
             Company = "1000",
             Factory = "1000"
         };

--
Gitblit v1.9.3