From ab01d75a3fbc8467d81a895cba5d6dde76fbe053 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 23:29:30 +0800
Subject: [PATCH] 1111
---
MES.Service/service/BasicData/MesItemTypeManager.cs | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index 3b5043c..351d87d 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -31,27 +31,56 @@
}
}
- private bool InsertItemType(MesItemType entity)
+ /// <summary>
+ /// 鐢熸垚鏂扮殑ID锛岀‘淇濅笉閲嶅
+ /// </summary>
+ private decimal GenerateNewId()
{
- // 鍏堟牴鎹甀D鍒犻櫎鐜版湁璁板綍
- try
+ // 澶勭悊绌鸿〃鐨勬儏鍐碉紝浠�1寮�濮�
+ var maxId = Db.Queryable<MesItemType>().Max(x => (decimal?)x.Id) ?? 0;
+ var newId = maxId + 1;
+
+ // 鍙岄噸妫�鏌ワ紝纭繚鐢熸垚鐨処D涓嶅瓨鍦�
+ while (Db.Queryable<MesItemType>().Where(x => x.Id == newId).Any())
{
- Db.Deleteable<MesItemType>()
- .Where(it => it.Id == entity.Id).ExecuteCommand();
+ newId++;
}
- catch (Exception)
- {
- // 鍒犻櫎澶辫触鍙兘鏄洜涓鸿褰曚笉瀛樺湪锛岀户缁墽琛屾彃鍏ユ搷浣�
- }
-
- var insert = base.Insert(entity);
- if (insert)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
+
+ return newId;
}
- private bool DeleteItemType(long? id)
+ private bool InsertItemType(MesItemType entity)
+ {
+ if (entity.Id == 0)
+ {
+ // 鏂板鎯呭喌锛氱敓鎴愭柊ID骞舵彃鍏�
+ var newId = GenerateNewId();
+ entity.Id = newId;
+ return base.Insert(entity);
+ }
+ else
+ {
+ // 鏇存柊鎯呭喌锛氬垹闄ゅ悗閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ var originalId = entity.Id;
+
+ // 鍏堝垹闄ゅ師璁板綍锛堝鏋滃瓨鍦級
+ try
+ {
+ Db.Deleteable<MesItemType>()
+ .Where(it => it.Id == originalId).ExecuteCommand();
+ }
+ catch (Exception)
+ {
+ // 鍒犻櫎澶辫触鍙兘鏄洜涓鸿褰曚笉瀛樺湪锛岀户缁墽琛屾彃鍏ユ搷浣�
+ }
+
+ // 閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ entity.Id = originalId;
+ return base.Insert(entity);
+ }
+ }
+
+ private bool DeleteItemType(decimal? id)
{
var deleteById = Db.Deleteable<MesItemType>()
.Where(it => it.Id == id).ExecuteCommand();
@@ -65,9 +94,6 @@
{
var entity = new MesItemType
{
- Id = string.IsNullOrEmpty(department.Id)
- ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
- : long.Parse(department.Id),
Pgroup = department.FParentId,
Tcode = department.FNumber,
Tname = department.FName,
@@ -78,13 +104,20 @@
Factory = "1000"
};
- var mesItemType = Db.Queryable<MesItemType>()
+ // 鏌ユ壘鏄惁宸插瓨鍦ㄧ浉鍚岀被鍨嬬紪鐮佺殑璁板綍
+ var existingItemType = Db.Queryable<MesItemType>()
.Where(it => it.Tcode == entity.Tcode)
.First();
- if (mesItemType != null)
+ if (existingItemType != null)
{
- entity.Id = mesItemType.Id;
+ // 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑ID锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
+ entity.Id = existingItemType.Id;
+ }
+ else
+ {
+ // 濡傛灉涓嶅瓨鍦紝璁句负0锛孖nsertOrUpdate鏂规硶灏嗙敓鎴愭柊ID
+ entity.Id = 0;
}
return entity;
--
Gitblit v1.9.3