From 8d771316d68f1523bcdf30c97d3a55107cb5ae56 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 04 九月 2025 10:53:31 +0800
Subject: [PATCH] 111
---
MES.Service/service/BasicData/MesItemTypeManager.cs | 66 +++++++++++++--------------------
1 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index a5191ba..6736c56 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -15,9 +15,10 @@
{
switch (customer.Type)
{
- case "0":
+ case "2":
+ case "4":
return InsertItemType(entity);
- case "1":
+ case "3":
return DeleteItemType(entity.Id);
default:
throw new ArgumentNullException(
@@ -50,7 +51,7 @@
throw new NotImplementedException("鎻掑叆澶辫触");
}
- private bool DeleteItemType(decimal id)
+ private bool DeleteItemType(decimal? id)
{
var deleteById = Db.Deleteable<MesItemType>()
.Where(it => it.Id == id).ExecuteCommand();
@@ -62,9 +63,11 @@
private MesItemType GetMesItemType(ErpItemType department)
{
- return new MesItemType
+ var entity = new MesItemType
{
- Id = Convert.ToDecimal(department.Id),
+ // Id = string.IsNullOrEmpty(department.Id)
+ // ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ // : long.Parse(department.Id),
Pgroup = department.FParentId,
Tcode = department.FNumber,
Tname = department.FName,
@@ -74,47 +77,30 @@
Company = "1000",
Factory = "1000"
};
+
+ var mesItemType = Db.Queryable<MesItemType>()
+ .Where(it => it.Tcode == entity.Tcode)
+ .First();
+
+ if (mesItemType != null)
+ {
+ entity.Id = mesItemType.Id;
+ }
+
+ return entity;
}
public bool SaveList(List<ErpItemType> departments)
{
- var list = new List<MesItemType>();
- departments.ForEach(s =>
+ if (departments == null || !departments.Any())
{
- var entity = GetMesItemType(s);
- 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());
- 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("鎺ュ彛鎵ц澶辫触");
+ // 閫愭潯澶勭悊锛屽叏閮ㄦ垚鍔熸墠杩斿洖true锛堜簨鍔″唴鎵归噺澶勭悊鏇翠紭锛屾澶勪繚鎸佸師鏈夐�昏緫锛�
+ var result = departments.Select(Save).ToList();
+ return result.All(b => b);
}
private bool InsertItemTypeBatch(List<MesItemType> itemTypeList)
--
Gitblit v1.9.3