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/MesUnitManager.cs | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 5e71919..fdf6280 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -23,14 +23,11 @@
if (UpdateUnitStatus(db, entity.Id, "B"))
return 1;
break;
- case "2":
- if (InsertUnit(db, entity))
- return 1;
- break;
case "3":
if (DeleteUnit(db, entity.Id))
return 1;
break;
+ case "2":
case "4":
if (InsertOrUpdate(db, entity))
return 1;
@@ -108,7 +105,8 @@
private bool DeleteUnit(SqlSugarScope db, decimal unitId)
{
- var deleteById = db.Deleteable<MesUnit>().In(unitId).ExecuteCommand();
+ var deleteById = db.Deleteable<MesUnit>()
+ .Where(s => s.Id == unitId).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -134,7 +132,8 @@
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+ Type = unit.Type
};
}
@@ -164,35 +163,21 @@
private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
{
var ids = unitList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
+ var deleteByIds = db.Deleteable<MesUnit>()
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
return deleteByIds > 0;
}
private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
{
- var exists = db.Queryable<MesUnit>().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;
- }
-
- return false;
+ db.Deleteable<MesUnit>()
+ .Where(s => s.Id == entity.Id).ExecuteCommand();
+ var insert = db.Insertable(entity).ExecuteCommand();
+ return insert > 0;
}
private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)
{
- foreach (var entity in unitList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return unitList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3