From ad75e6017901835df1cb3e18e4cc3a6d3460cbeb Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 19:44:50 +0800
Subject: [PATCH] 111
---
MES.Service/service/BasicData/MesSupplierManager.cs | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 2cac024..ee14371 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -23,14 +23,11 @@
if (UpdateSupplierStatus(db, entity.Id, "B"))
return 1;
break;
- case "2":
- if (InsertSupplier(db, entity))
- return 1;
- break;
case "3":
if (DeleteSupplier(entity.Id))
return 1;
break;
+ case "2":
case "4":
if (InsertOrUpdate(db, entity))
return 1;
@@ -65,14 +62,11 @@
"B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
- if (!InsertSupplierBatch(db, supplierGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
case "3":
if (!DeleteSupplierBatch(db, supplierGroup.Value))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
+ case "2":
case "4":
if (!InsertOrUpdateBatch(db, supplierGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
@@ -110,7 +104,10 @@
private bool DeleteSupplier(decimal supplierId)
{
- if (base.DeleteById(supplierId)) return true;
+ var deleteById = Db.Deleteable<MesSupplier>()
+ .Where(s => s.Id == supplierId).ExecuteCommand();
+ if (deleteById > 0)
+ return true;
throw new NotImplementedException("鍒犻櫎澶辫触");
}
@@ -123,12 +120,11 @@
SuppNo = supplier.FNumber,
SuppSname = supplier.FShortName,
SuppName = supplier.FName,
- Lxr = supplier.FContact,
- Telf1 = supplier.FTel,
+ Lxr = supplier.FTContact,
+ Telf1 = supplier.Fmobilephone,
Fstaffid = supplier.FStaffId,
Fforbidstatus = supplier.FForbidStatus,
Type = supplier.Type,
- Remark = supplier.FDescription,
FSubsidiary = supplier.FUseOrgId,
Fumbrella = supplier.FCreateOrgId,
CreateDate = DateTime.Now,
@@ -166,7 +162,8 @@
List<MesSupplier> supplierList)
{
var ids = supplierList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesSupplier>().In(ids).ExecuteCommand();
+ var deleteByIds = db.Deleteable<MesSupplier>()
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
if (deleteByIds > 0)
return true;
@@ -188,10 +185,6 @@
private bool InsertOrUpdateBatch(SqlSugarScope db,
List<MesSupplier> supplierList)
{
- foreach (var entity in supplierList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return supplierList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3