From 7d410c1f0d4e36f8281ce2277f355c9abf1c231b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs |   72 +++++++++++++++++++++---------------
 1 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs
index c1be461..d2778f6 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs
@@ -1,66 +1,78 @@
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
-using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Application.Services;
-
-namespace CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-
+using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder; 
+using Volo.Abp.Application.Services; 
+using CmsQueryExtensions.Entitys; 
+using System.Linq.Expressions; 
+using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder; 
+ 
+namespace CMS.Plugin.PipeLineLems.Application.Contracts.Services; 
+ 
 /// <summary> 
 /// 鍙枡鍗曡〃搴旂敤鏈嶅姟鎺ュ彛 
 /// </summary> 
-public interface ICallMaterialOrderAppService : ICrudAppService<CallMaterialOrderDto, Guid, GetCallMaterialOrderInput, CallMaterialOrderCreateDto, CallMaterialOrderUpdateDto>
-{
+public interface ICallMaterialOrderAppService : ICrudAppService<CallMaterialOrderDto, Guid, GetCallMaterialOrderInput, CallMaterialOrderCreateDto, CallMaterialOrderUpdateDto> 
+{ 
     /// <summary> 
     /// 鍏嬮殕鍙枡鍗曡〃 
     /// </summary> 
     /// <param name="ids"></param> 
     /// <returns></returns> 
-    Task<List<CallMaterialOrderDto>> CloneAsync(IEnumerable<Guid> ids);
-
+    Task<List<CallMaterialOrderDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser); 
+ 
     /// <summary> 
     /// 鍒犻櫎鍙枡鍗曡〃 
     /// </summary> 
     /// <param name="ids"></param> 
     /// <returns></returns> 
-    Task DeleteManyAsync(IEnumerable<Guid> ids);
-
-    Task<CallMaterialOrder> FindByWmsTaskNoAsync(string wmsTaskNo);
-
-
-    Task CallMaterialByDataIdentifier(Guid id);
-
+    Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser); 
+ 
+    /// <summary> 
+    /// 鐗╃悊鍒犻櫎鍙枡鍗曡〃 
+    /// </summary> 
+    /// <param name="id">涓婚敭ID</param> 
+    /// <param name="cancellationToken"></param> 
+    /// <returns></returns> 
+    Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default); 
+ 
+ 
+    /// <summary> 
+    /// 鎵归噺鐗╃悊鍒犻櫎鍙枡鍗曡〃锛堢洿鎺ュ垹闄わ紝涓嶈蒋鍒犻櫎锛� 
+    /// </summary> 
+    /// <param name="ids">瑕佸垹闄ょ殑涓婚敭ID鍒楄〃</param> 
+    /// <param name="cancellationToken"></param> 
+    /// <returns></returns> 
+    Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default); 
+ 
     /// <summary> 
     /// 璋冩暣鎺掑簭鍙枡鍗曡〃 
     /// </summary> 
     /// <param name="id"></param> 
     /// <param name="sort"></param> 
     /// <returns></returns> 
-    Task AdjustSortAsync(Guid id, int sort);
-
+    Task AdjustSortAsync(Guid id, int sort); 
+ 
     /// <summary> 
     /// 瀵煎叆鍙枡鍗曡〃 
     /// </summary> 
     /// <param name="input"></param> 
     /// <returns></returns> 
-    Task ImportAsync(CallMaterialOrdersImportModel input);
-
+    Task ImportAsync(CallMaterialOrdersImportModel input, MyCurrentUser myCurrentUser); 
+ 
     /// <summary> 
     /// 瀵煎嚭鍙枡鍗曡〃 
     /// </summary> 
     /// <param name="input"></param> 
     /// <returns></returns> 
-    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetCallMaterialOrderInput input);
-
+    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetCallMaterialOrderInput input); 
+ 
     /// <summary> 
     /// 鏍规嵁鏉′欢鑾峰彇鍙枡鍗曡〃鍒楄〃 
     /// </summary> 
     /// <param name="whereConditions"></param> 
     /// <param name="cancellationToken"></param> 
     /// <returns></returns> 
-    Task<List<CallMaterialOrder>> GetListByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, CancellationToken cancellationToken = default);
-
-
+    Task<List<CallMaterialOrder>> GetListByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, CancellationToken cancellationToken = default); 
+ 
+ 
     /// <summary> 
     ///  鏍规嵁鏉′欢鑾峰彇鍗曚釜鍙枡鍗曡〃 
     /// </summary> 
@@ -69,5 +81,5 @@
     /// <param name="cancellationToken"></param> 
     /// <returns></returns> 
     /// <exception cref="UserFriendlyException"></exception> 
-    Task<CallMaterialOrder> GetSingleByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default);
-}
+    Task<CallMaterialOrder> GetSingleByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default); 
+} 

--
Gitblit v1.9.3