From 9c1af7f5ec91917b4276b25406c86386fd337fbb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 16:35:44 +0800
Subject: [PATCH] 修改冲突后问题
---
BLL/PBS.BLL.WE.Core/03-localclient/01-utensil/UtensilMapping.cs | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 31 deletions(-)
diff --git a/BLL/PBS.BLL.WE.Core/03-localclient/01-utensil/UtensilMapping.cs b/BLL/PBS.BLL.WE.Core/03-localclient/01-utensil/UtensilMapping.cs
index ae1ab8c..5193389 100644
--- a/BLL/PBS.BLL.WE.Core/03-localclient/01-utensil/UtensilMapping.cs
+++ b/BLL/PBS.BLL.WE.Core/03-localclient/01-utensil/UtensilMapping.cs
@@ -1,13 +1,16 @@
-锘縩amespace PBS.CAL.WE.LocalClient
+锘縰sing Mapster;
+using PBS.CAL.WE;
+using Yw.Dto;
+
+namespace PBS.CAL.WE.LocalClient
{
/// <summary>
/// 鐢ㄦ按鍣ㄥ叿鏄犲皠
- ///</summary>
+ ///</summary>
public class UtensilMapping : IUtensilMapping
- {
-
- private readonly Service.WE.UtensilMapping _service = new();
-
+ {
+ private readonly PBS.Service.WE.UtensilMapping _service = new();
+
#region Query
/// <summary>
@@ -36,6 +39,20 @@
}
/// <summary>
+ /// 閫氳繃 ItemID 鑾峰彇
+ /// </summary>
+ public async Task<List<UtensilMappingDto>> GetByItemID(long ItemID)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = _service.GetAll();
+ var select = list.Where(x => x.ItemID == ItemID).ToList();
+ return select?.Select(x => new UtensilMappingDto(x)).ToList();
+ }
+ );
+ }
+
+ /// <summary>
/// 閫氳繃 Ids 鑾峰彇
/// </summary>
public async Task<List<UtensilMappingDto>> GetByIds(List<long> Ids)
@@ -48,7 +65,6 @@
});
}
-
/// <summary>
/// 鑾峰彇鏈�澶ф帓搴忕爜
/// </summary>
@@ -60,8 +76,8 @@
return sort_code;
});
}
-
- #endregion
+
+ #endregion Query
#region Insert
@@ -72,8 +88,8 @@
{
return await Task.Factory.StartNew(() =>
{
- var model = input.Adapt<AddUtensilMappingInput, Model.WE.UtensilMapping>();
- model.SortCode = _service.GetMaxSortCode() + 1;
+ var model = input.Adapt<AddUtensilMappingInput, PBS.Model.WE.UtensilMapping>();
+ model.SortCode = _service.GetMaxSortCode() + 1;
var id = _service.Insert(model);
return id;
});
@@ -86,13 +102,16 @@
{
return await Task.Factory.StartNew(() =>
{
- return false;
+ var list = inputList.Select(x => x.Adapt<AddUtensilMappingInput, PBS.Model.WE.UtensilMapping>()).ToList();
+ list.ForEach(x => x.SortCode = _service.GetMaxSortCode() + 1);
+ var id = _service.Inserts(list);
+ return id;
});
}
-
+
/// <summary>
/// 澶ф壒閲忔彃鍏�
- /// </summary>
+ /// </summary>
public async Task<bool> BulkInserts(List<AddUtensilMappingInput> list)
{
return await Task.Factory.StartNew(() =>
@@ -117,7 +136,7 @@
{
throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
- var rhs = new Model.WE.UtensilMapping(model);
+ var rhs = new PBS.Model.WE.UtensilMapping(model);
input.Adapt(rhs);
var bol = _service.Update(rhs);
return bol;
@@ -134,10 +153,10 @@
return false;
});
}
-
+
/// <summary>
/// 澶ф壒閲忔洿鏂�
- /// </summary>
+ /// </summary>
public async Task<bool> BulkUpdates(List<UpdateUtensilMappingInput> list)
{
return await Task.Factory.StartNew(() =>
@@ -145,8 +164,7 @@
return false;
});
}
-
-
+
/// <summary>
/// 鏇存柊鎺掑簭鐮�
/// </summary>
@@ -175,7 +193,7 @@
#endregion Update
#region Delete
-
+
/// <summary>
/// 閫氳繃 ID 鍒犻櫎
/// </summary>
@@ -194,8 +212,24 @@
/// <summary>
/// 閫氳繃 Ids 鍒犻櫎
- /// </summary>
+ /// </summary>
public async Task<bool> DeleteByIds(List<long> Ids)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.DeleteByIds(Ids, out string msg);
+ if (!bol)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
+ }
+ return true;
+ });
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鍒犻櫎
+ /// </summary>
+ public async Task<bool> DeleteAll()
{
return await Task.Factory.StartNew(() =>
{
@@ -204,16 +238,15 @@
}
/// <summary>
- /// 鍏ㄩ儴鍒犻櫎
- /// </summary>
- public async Task<bool> DeleteAll()
+ /// 閫氳繃 ItemID 鍒犻櫎鎵�鏈�
+ /// </summary>
+ public virtual async Task<bool> DeleteAllByItemID(long item)
{
- return await Task.Factory.StartNew(() =>
- {
- return false;
- });
- }
-
- #endregion
+ var alllist = await GetByItemID(item);
+ var bol = await DeleteByIds(alllist.Select(x => x.ID).ToList());
+ return bol;
+ }
+
+ #endregion Delete
}
}
\ No newline at end of file
--
Gitblit v1.9.3