From 3a6f7cb36dff0ec99edddbb53078947fcf08a47e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 19 七月 2025 09:32:15 +0800
Subject: [PATCH] 1.用料清单变更
---
MES.Service/service/BasicData/MesSupplierManager.cs | 53 +++++++++++++++++++----------------------------------
1 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 71a9cbf..ee14371 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -24,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;
@@ -66,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("鍚屾澶辫触");
@@ -111,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("鍒犻櫎澶辫触");
}
@@ -124,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,
- Remarks = supplier.FDescription,
+ Type = supplier.Type,
FSubsidiary = supplier.FUseOrgId,
Fumbrella = supplier.FCreateOrgId,
CreateDate = DateTime.Now,
@@ -167,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;
@@ -176,19 +172,12 @@
private bool InsertOrUpdate(SqlSugarScope db, MesSupplier entity)
{
- var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
+ db.Deleteable<MesSupplier>().Where(s => s.Id == entity.Id)
+ .ExecuteCommand();
+
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ return true;
return false;
}
@@ -196,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