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

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs"
index d678bc4..503255b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs"
@@ -1,6 +1,8 @@
 using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
-using Volo.Abp.Application.Services; 
- 
+using Volo.Abp.Application.Services;
+using CmsQueryExtensions.Entitys;
+
+
 namespace CMS.Plugin.HIAWms.Application.Contracts.Services; 
  
 /// <summary> 
@@ -20,23 +22,40 @@
     /// </summary> 
     /// <param name="ids"></param> 
     /// <returns></returns> 
-    Task DeleteManyAsync(IEnumerable<Guid> ids); 
- 
+    Task DeleteManyAsync(IEnumerable<Guid> ids);
+
+    /// <summary>
+    /// 鐗╃悊鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
+    /// </summary>
+    /// <param name="id">鐗╂枡ID</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task DeletePermanentlyAsync(Guid id, CancellationToken cancellationToken = default);
+
+
+    /// <summary>
+    /// 鎵归噺鐗╃悊鍒犻櫎鐗╂枡鍩虹淇℃伅琛紙鐩存帴鍒犻櫎锛屼笉杞垹闄わ級
+    /// </summary>
+    /// <param name="ids">瑕佸垹闄ょ殑鐗╂枡ID鍒楄〃</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, 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(WmsMaterialsImportModel input); 
- 
+    Task ImportAsync(WmsMaterialsImportModel input, MyCurrentUser myCurrentUser);
+
     /// <summary> 
     /// 瀵煎嚭鐗╂枡鍩虹淇℃伅琛� 
     /// </summary> 

--
Gitblit v1.9.3