From f476ec010c22cd4e3c6a119eea035cbf4594bfbb Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 12 九月 2025 19:32:00 +0800
Subject: [PATCH] 1\修正收料通知单
---
MES.Service/service/BasicData/SysDepartmentManager.cs | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 83 insertions(+), 57 deletions(-)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 4537867..1e91613 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -80,88 +80,114 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
}
+ /// <summary>
+ /// 鐢熸垚鏂扮殑ID锛岀‘淇濅笉閲嶅
+ /// </summary>
+ private decimal GenerateNewId()
+ {
+ // 澶勭悊绌鸿〃鐨勬儏鍐碉紝浠�1寮�濮�
+ var maxId = Db.Queryable<SysDepartment>().Max(x => (decimal?)x.Id) ?? 0;
+ var newId = maxId + 1;
+
+ // 鍙岄噸妫�鏌ワ紝纭繚鐢熸垚鐨処D涓嶅瓨鍦�
+ while (Db.Queryable<SysDepartment>().Where(x => x.Id == newId).Any())
+ {
+ newId++;
+ }
+
+ return newId;
+ }
+
// 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
private bool InsertOrUpdateDepartment(SqlSugarScope db,
SysDepartment entity)
{
- db.Deleteable<SysDepartment>()
- .Where(s => s.Id == entity.Id).ExecuteCommand();
-
- var insert = db.Insertable(entity).ExecuteCommand();
- return insert > 0;
+ if (entity.Id == 0)
+ {
+ // 鏂板鎯呭喌锛氱敓鎴愭柊ID骞舵彃鍏�
+ var newId = GenerateNewId();
+ entity.Id = newId;
+ return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
+ }
+ else
+ {
+ // 鏇存柊鎯呭喌锛氬垹闄ゅ悗閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ var originalId = entity.Id;
+
+ // 鍏堝垹闄ゅ師璁板綍锛堝鏋滃瓨鍦級
+ db.Deleteable<SysDepartment>().Where(s => s.Id == originalId).ExecuteCommand();
+
+ // 閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ entity.Id = originalId;
+ return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
+ }
}
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
private SysDepartment GetSysDepartment(ErpDepartment department)
{
- return new SysDepartment
+ var fForbidStatus = department.FForbidStatus;
+ if (department.FForbidStatus == "0")
+ {
+ fForbidStatus = "A";
+ }
+ else if (department.FForbidStatus == "1")
+ {
+ fForbidStatus = "B";
+ }
+
+ var entity = new SysDepartment
{
Departmentcode = department.FNumber,
Departmentname = department.FName,
- Departmentid = Convert.ToDecimal(department.Id),
- Id = Convert.ToDecimal(department.Id),
Depextr1 = department.FDeptProperty,
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
- Depextr4 = department.FForbidStatus,
+ Depextr4 = fForbidStatus,
FParentID = department.FParentID,
- FSubsidiary = department.FUseOrgId,
- Fumbrella = department.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(department.FUseOrgId)
+ ? "1"
+ : department.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(department.FCreateOrgId)
+ ? "1"
+ : department.FCreateOrgId,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000",
- FDocumentStatus = department.FDocumentStatus
+ Factory = "1000"
};
+
+ // 鏌ユ壘鏄惁宸插瓨鍦ㄧ浉鍚岄儴闂ㄧ紪鐮佺殑璁板綍
+ var existingDepartment = Db.Queryable<SysDepartment>()
+ .Where(s => s.Departmentcode == entity.Departmentcode)
+ .First();
+
+ if (existingDepartment != null)
+ {
+ // 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑ID锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
+ entity.Id = existingDepartment.Id;
+ }
+ else
+ {
+ // 濡傛灉涓嶅瓨鍦紝璁句负0锛孖nsertOrUpdate鏂规硶灏嗙敓鎴愭柊ID
+ entity.Id = 0;
+ }
+
+ return entity;
}
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
public bool SaveList(List<ErpDepartment> departments)
{
- var list = new List<SysDepartment>();
- departments.ForEach(s =>
+ if (departments == null || !departments.Any())
{
- var entity =
- GetSysDepartment(s); // 灏� ErpDepartment 杞崲涓� SysDepartment
- entity.Type = s.Type;
- list.Add(entity);
- });
+ Console.WriteLine("璀﹀憡: 浼犲叆鐨勭墿鏂欏垪琛ㄤ负绌�");
+ return false;
+ }
- 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 "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;
+ // 閫愭潯澶勭悊锛屽叏閮ㄦ垚鍔熸墠杩斿洖true锛堜簨鍔″唴鎵归噺澶勭悊鏇翠紭锛屾澶勪繚鎸佸師鏈夐�昏緫锛�
+ var result = departments.Select(Save).ToList();
+ return result.All(b => b);
}
// 鎵归噺鏇存柊閮ㄩ棬鐘舵�佺殑鏂规硶
@@ -209,7 +235,7 @@
private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
List<SysDepartment> departmentList)
{
- return departmentList.All(
- entity => InsertOrUpdateDepartment(db, entity));
+ return departmentList.All(entity =>
+ InsertOrUpdateDepartment(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3