From eb744ecfecc0f1b6d9c0999c65bc740d93e30eda Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 22 一月 2025 13:38:52 +0800
Subject: [PATCH] 新增接口
---
StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs | 230 +++++++++++++++++++++-----------------------------------
1 files changed, 87 insertions(+), 143 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs b/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
index 4b055de..c2d65d6 100644
--- a/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -10,45 +10,18 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
public bool Save(ErpItemType unit)
{
- /// <summary>
- /// save鏂规硶璋冩暣銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- ///鍘熶唬鐮�
- //try
- //{
- // switch (customer.Type)
- // {
- // case "0":
- // return InsertItemType(entity);
- // case "1":
- // return DeleteItemType(entity.Id);
- // default:
- // throw new ArgumentNullException(
- // $"type娌℃湁{customer.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- // }
- //}
- //catch (Exception ex)
- //{
- // throw new ApplicationException($"鎿嶄綔澶辫触: {ex.Message}", ex);
- //}
-
var entity = GetMesItemType(unit);
return UseTransaction(db =>
{
switch (unit.Type)
{
- case "0":
- if (InsertItemType(db, entity))
+ case "3":
+ if (DeleteItemType(entity))
return 1;
break;
- case "1":
- if (DeleteItemType(entity.Id))
+ case "2":
+ case "4":
+ if (InsertItemType(db, entity))
return 1;
break;
default:
@@ -58,133 +31,104 @@
throw new NotImplementedException("鎿嶄綔澶辫触");
}) > 0;
-
}
- /// <summary>
- /// "鎻掑叆鎴栨洿鏂扮殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- //// - 鍘熶唬鐮侊細
- //private bool InsertItemType(MesItemType entity)
- //{
- // var insert = base.Insert(entity);
- // if (insert)
- // return true;
-
- // throw new NotImplementedException("鎻掑叆澶辫触");
- //}
-
- //// - 鏂颁唬鐮侊細
- private bool InsertItemType(SqlSugarScope db, MesItemType entity)
+
+ private bool InsertItemType(SqlSugarScope db, List<MesItemType> entity)
{
- db.Deleteable<MesItemType>()
- .Where(s => s.Id == entity.Id)
- .ExecuteCommand();
+ DeleteItemType(entity);
var insert = db.Insertable(entity).ExecuteCommand();
return insert > 0;
}
- private bool DeleteItemType(decimal id)
+ private bool DeleteItemType(List<MesItemType> supplierId)
{
- var deleteById = base.DeleteById(id);
- if (deleteById)
- return true;
+ // 鎻愬彇鎵�鏈夐渶瑕佺殑 MesId 缁勫悎
+ var ids = supplierId.Select(customer => customer.Id.ToString())
+ .ToList();
+
+ // 浣跨敤杩欎簺 MesId 鍘绘煡璇� MesLinkU9 琛紝鎵惧埌瀵瑰簲鐨� U9Id
+ var u9Ids = Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ ids.Contains(u.MesId) && u.TableType == "MES_ITEM_TYPE")
+ .Select(u => u.U9Id)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ // 鏍规嵁 U9Id 鎵惧埌鎵�鏈夊搴旂殑 MesId锛岃繘琛屽垹闄�
+ // 娉ㄦ剰锛氳繖閲屽亣璁炬偍纭疄鎯宠鍒犻櫎杩欎簺璁板綍銆傚鏋滀笉纭畾锛岃鍏堟煡璇互楠岃瘉缁撴灉銆�
+ var idsToDelete = Db.Queryable<MesLinkU9>()
+ .Where(u => u9Ids.Contains(u.U9Id) && u.TableType == "MES_ITEM_TYPE")
+ .Select(u => u.MesId)
+ .Distinct() // 搴旂敤 Distinct 鍘婚噸
+ .ToList();
+
+ var deleteByIds = Db.Deleteable<MesProject>().In(idsToDelete)
+ .ExecuteCommand();
+ // if (deleteByIds > 0)
+ // return true;
+ return true;
+ //throw new NotImplementedException("鍒犻櫎澶辫触");
}
- private MesItemType GetMesItemType(ErpItemType department)
+ private List<MesItemType> GetMesItemType(ErpItemType department)
{
- return new MesItemType
+
+ List<MesItemType> list = new();
+
+ foreach (var erpDetail in department.FUseOrgId)
{
- Id = Convert.ToDecimal(department.Id),
- Pgroup = department.FParentId,
- Tcode = department.FNumber,
- Tname = department.FName,
- Description = department.FDescription,
- CreateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
+ var exists = Db.Queryable<MesLinkU9>().Any(u =>
+ u.U9Id == department.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_ITEM_TYPE");
+
+ decimal mesId = 0;
+ if (exists)
+ {
+ //鑾峰彇mesid
+ mesId = Convert.ToDecimal(Db.Queryable<MesLinkU9>()
+ .Where(u =>
+ u.U9Id == department.Id && u.OrgId == erpDetail.FUseOrgId &&
+ u.TableType == "MES_ITEM_TYPE")
+ .Select(u => u.MesId) // 閫夋嫨 MesId 瀛楁
+ .First());
+ }
+ else
+ {
+ var entity = new MesLinkU9
+ {
+ CreateDate = DateTime.Now,
+ MesId = mesId.ToString(),
+ U9Id = department.Id,
+ OrgId = erpDetail.FUseOrgId,
+ TableType = "MES_ITEM_TYPE"
+ };
+ mesId = Db.Insertable(entity).ExecuteReturnIdentity();
+ }
+
+ var mesItemType = new MesItemType
+ {
+ Id = mesId,
+ Pgroup = department.FParentId,
+ Tcode = department.FNumber,
+ Tname = department.FName,
+ Unit = department.Unit,
+ ForbidStatus = department.FForbidStatus,
+ IqcType = department.IqcType,
+ CreateDate = DateTime.Now,
+ Company = "1000",
+ Factory = "1000"
+ };
+
+ list.Add(mesItemType);
+ }
+
+ return list;
}
public bool SaveList(List<ErpItemType> departments)
{
- var list = new List<MesItemType>();
- departments.ForEach(s =>
- {
- var entity = GetMesItemType(s);
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- var result = new List<bool>();
-
- foreach (var itemTypeGroup in groupBy)
- try
- {
- switch (itemTypeGroup.Key)
- {
- case "0":
- result.Add(InsertItemTypeBatch(itemTypeGroup.Value));
- break;
- case "1":
- result.Add(DeleteItemTypeBatch(itemTypeGroup.Value));
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemTypeGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
- }
- catch (Exception ex)
- {
- throw new ApplicationException($"鎵归噺鎿嶄綔澶辫触: {ex.Message}", ex);
- }
-
- if (result.All(b => b))
- return true;
-
- throw new NotImplementedException("鎺ュ彛鎵ц澶辫触");
- }
-
- private bool InsertItemTypeBatch(List<MesItemType> itemTypeList)
- {
- /// <summary>
- /// InsertItemTypeBatch鏂规硶璋冩暣锛屽厛鍒犻櫎鍐嶆彃鍏ャ��
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
- //鏂板锛氬厛鍒犻櫎锛屽啀鎻掑叆
- var ids = itemTypeList.Select(it => it.Id).ToArray();
- var deleteByIds =
- base.DeleteByIds(ids.Select(d => (dynamic)d).ToArray());
-
- var insertRange = base.InsertRange(itemTypeList);
- if (insertRange)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemTypeBatch(List<MesItemType> itemTypeList)
- {
- var ids = itemTypeList.Select(it => it.Id).ToArray();
- var deleteByIds =
- base.DeleteByIds(ids.Select(d => (dynamic)d).ToArray());
- if (deleteByIds)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
+ var result = departments.Select(Save).ToList();
+ return result.All(b => b);
}
}
\ No newline at end of file
--
Gitblit v1.9.3