From f998563858724f373ea1ff112bdf781a5a46ee8a Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 05 六月 2025 21:13:14 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs | 140 +---------------------------------------------
1 files changed, 4 insertions(+), 136 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs b/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
index 61fdb3d..328ff70 100644
--- a/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -83,41 +83,6 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
}
- /// <summary>
- /// "鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-31
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- ///鍘熶唬鐮�
- // 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
- //private bool InsertOrUpdateDepartment(SqlSugarScope db,
- // SysDepartment entity)
- //{
- // var exists = db.Queryable<SysDepartment>().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;
- //}
-
-
-
-
- // 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
///鏂颁唬鐮�
// 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
@@ -131,6 +96,7 @@
var insert = db.Insertable(entity).ExecuteCommand();
return insert > 0;
}
+
private SysDepartment GetSysDepartment(ErpDepartment department)
{
return new SysDepartment
@@ -146,8 +112,7 @@
CreateDate = DateTime.Now,
CreateOrg = Convert.ToDecimal(department.FCreateOrgId),
UseOrg = Convert.ToDecimal(department.FUseOrgId),
- ParentId = Convert.ToDecimal(department.FParentID),
- FDOCUMENTSTATUS = department.FDocumentStatus,
+ ParentId = department.FParentID,
Company = "1000",
Factory = "1000"
};
@@ -156,104 +121,7 @@
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
public bool SaveList(List<ErpDepartment> departments)
{
- var list = new List<SysDepartment>();
- departments.ForEach(s =>
- {
- var entity =
- GetSysDepartment(s); // 灏� ErpDepartment 杞崲涓� SysDepartment
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var departmentGroup in groupBy)
- switch (departmentGroup.Key)
- {
- case "0":
- if (!UpdateDepartmentStatusBatch(db,
- departmentGroup.Value, "A")) // 鎵归噺鍚敤閮ㄩ棬
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateDepartmentStatusBatch(db,
- departmentGroup.Value, "B")) // 鎵归噺绂佺敤閮ㄩ棬
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- //case "2":
- // if (!InsertDepartmentBatch(db,
- // departmentGroup.Value)) // 鎵归噺鎻掑叆閮ㄩ棬
- // throw new NotImplementedException("鎻掑叆澶辫触");
- // break;
- case "3":
- if (!DeleteDepartmentBatch(db,
- departmentGroup.Value)) // 鎵归噺鍒犻櫎閮ㄩ棬
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "2":
- case "4":
- if (!InsertOrUpdateDepartmentBatch(db,
- departmentGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂�
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{departmentGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- // 鎵归噺鏇存柊閮ㄩ棬鐘舵�佺殑鏂规硶
- private bool UpdateDepartmentStatusBatch(SqlSugarScope db,
- List<SysDepartment> departmentList, string status)
- {
- var ids = departmentList.Select(it => it.Id).ToArray();
- var result = db.Updateable<SysDepartment>()
- .SetColumns(s => s.Depextr4 == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎵归噺鎻掑叆閮ㄩ棬鐨勬柟娉�
- private bool InsertDepartmentBatch(SqlSugarScope db,
- List<SysDepartment> departmentList)
- {
- var insertRange = db.Insertable(departmentList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- // 鎵归噺鍒犻櫎閮ㄩ棬鐨勬柟娉�
- private bool DeleteDepartmentBatch(SqlSugarScope db,
- List<SysDepartment> departmentList)
- {
- var ids = departmentList.Select(it => it.Id).ToArray();
- var deleteByIds =
- db.Deleteable<SysDepartment>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
- private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
- List<SysDepartment> departmentList)
- {
- foreach (var entity in departmentList)
- if (!InsertOrUpdateDepartment(db, entity))
- return false;
-
- return true;
+ var result = departments.Select(Save).ToList();
+ return result.All(b => b);
}
}
\ No newline at end of file
--
Gitblit v1.9.3