From 6761b0ed84fd7a03400b557244d0835f671dad94 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 14 七月 2025 18:02:59 +0800
Subject: [PATCH] 修改多组织
---
MES.Service/service/BasicData/MesUnitManager.cs | 121 ++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 66 deletions(-)
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 5e71919..e06cbca 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -28,7 +28,7 @@
return 1;
break;
case "3":
- if (DeleteUnit(db, entity.Id))
+ if (UpdateUnitStatus(db, entity.Id, "B"))
return 1;
break;
case "4":
@@ -36,8 +36,7 @@
return 1;
break;
default:
- throw new ArgumentNullException(
- $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ throw new ArgumentNullException($"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
}
throw new NotImplementedException("鎿嶄綔澶辫触");
@@ -47,8 +46,7 @@
public bool SaveList(List<ErpUnit> units)
{
var list = units.Select(GetMesUnit).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
+ var groupBy = list.GroupBy(s => s.Type).ToDictionary(g => g.Key, g => g.ToList());
return UseTransaction(db =>
{
@@ -68,7 +66,7 @@
throw new NotImplementedException("鎻掑叆澶辫触");
break;
case "3":
- if (!DeleteUnitBatch(db, unitGroup.Value))
+ if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B"))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "4":
@@ -76,43 +74,61 @@
throw new NotImplementedException("鍚屾澶辫触");
break;
default:
- throw new ArgumentNullException(
- $"type娌℃湁{unitGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+ throw new ArgumentNullException($"type娌℃湁{unitGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
}
return 1;
}) > 0;
}
- private bool UpdateUnitStatus(SqlSugarScope db, decimal unitId,
- string status)
+ private bool UpdateUnitStatus(SqlSugarScope db, decimal unitId,string status)
{
- var result = db.Updateable<MesUnit>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == unitId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ var result = db.Updateable<MesUnit>().SetColumns(s => s.Fforbidstatus == status).Where(s => s.Id == unitId).ExecuteCommand();
+ return true;
}
private bool InsertUnit(SqlSugarScope db, MesUnit entity)
{
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
+ var exists = db.Queryable<MesUnit>().Any(e => e.Id == entity.Id);
+ if (exists)
+ {
+ var result = db.Updateable<MesUnit>().ExecuteCommand();
return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+ else
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ {
+ return true;
+ }
+ else
+ {
+ throw new NotImplementedException("鎻掑叆澶辫触");
+ }
+ }
}
- private bool DeleteUnit(SqlSugarScope db, decimal unitId)
+ private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
{
- var deleteById = db.Deleteable<MesUnit>().In(unitId).ExecuteCommand();
- if (deleteById > 0)
+ var exists = db.Queryable<MesUnit>().Any(e => e.Id == entity.Id);
+ if (exists)
+ {
+ var update = db.Updateable(entity).ExecuteCommand();
return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ }
+ else
+ {
+ var insert = db.Insertable(entity).ExecuteCommand();
+ if (insert > 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
}
private MesUnit GetMesUnit(ErpUnit unit)
@@ -132,7 +148,6 @@
Fdescription = unit.FDescription,
Fforbidstatus = unit.FForbidStatus,
CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
@@ -142,57 +157,31 @@
string status)
{
var ids = unitList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesUnit>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
+ var result = db.Updateable<MesUnit>().SetColumns(s => s.Fforbidstatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand();
+ return true;
}
private bool InsertUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
{
- var insertRange = db.Insertable(unitList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
- return deleteByIds > 0;
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
- {
- var exists = db.Queryable<MesUnit>().Any(e => e.Id == entity.Id);
- if (exists)
+ foreach (var entity in unitList)
{
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
+ if (!InsertUnit(db, entity))
+ {
+ return false;
+ }
}
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
+ return true;
}
private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)
{
foreach (var entity in unitList)
+ {
if (!InsertOrUpdate(db, entity))
+ {
return false;
-
+ }
+ }
return true;
}
}
\ No newline at end of file
--
Gitblit v1.9.3