From 800a94c4088b5ad82bdb433a9199dc2183d86959 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 08:57:38 +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.Domain/WmsMaterial/IWmsMaterialRepository.cs |  109 ++++++++++++++++++++++++++----------------------------
 1 files changed, 53 insertions(+), 56 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.Domain/WmsMaterial/IWmsMaterialRepository.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.Domain/WmsMaterial/IWmsMaterialRepository.cs"
index 179c018..387b0bc 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.Domain/WmsMaterial/IWmsMaterialRepository.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.Domain/WmsMaterial/IWmsMaterialRepository.cs"
@@ -1,37 +1,36 @@
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Domain.Repositories;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsMaterial;
-
+using CmsQueryExtensions.Extension; 
+using System.Linq.Expressions; 
+using Volo.Abp.Domain.Repositories; 
+ 
+namespace CMS.Plugin.HIAWms.Domain.WmsMaterial; 
+ 
 /// <summary> 
 /// 鐗╂枡鍩虹淇℃伅琛ㄤ粨鍌� 
 /// </summary> 
-public interface IWmsMaterialRepository : IBasicRepository<WmsMaterial, Guid>
-{
+public interface IWmsMaterialRepository : IBasicRepository<WmsMaterial, Guid> 
+{ 
     /// <summary> 
     /// 鎸夌収鍚嶇О鏌ユ壘鐗╂枡鍩虹淇℃伅琛� 
     /// </summary> 
     /// <param name="name"></param> 
     /// <param name="cancellationToken"></param> 
     /// <returns></returns> 
-    Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default);
-
+    Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default); 
+ 
     /// <summary> 
     /// 楠岃瘉鍚嶇О鏄惁瀛樺湪鐗╂枡鍩虹淇℃伅琛� 
     /// </summary> 
     /// <param name="name"></param> 
     /// <param name="id"></param> 
     /// <returns></returns> 
-    Task<bool> NameExistAsync(string name, Guid? id = null);
-
+    Task<bool> NameExistAsync(string name, Guid? id = null); 
+ 
     /// <summary> 
     /// 鑾峰彇鏈�澶ф帓搴忕墿鏂欏熀纭�淇℃伅琛� 
     /// </summary> 
     /// <returns></returns> 
-    Task<int> GetMaxSortAsync();
-
+    Task<int> GetMaxSortAsync(); 
+ 
     /// <summary> 
     /// 鑾峰彇鍒嗛〉鍒楄〃鐗╂枡鍩虹淇℃伅琛� 
     /// </summary> 
@@ -42,50 +41,48 @@
     /// <param name="includeDetails"></param> 
     /// <param name="cancellationToken"></param> 
     /// <returns></returns> 
-    Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default);
-
+    Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default); 
+ 
     /// <summary> 
     /// 鑾峰彇鎬绘暟鐗╂枡鍩虹淇℃伅琛� 
     /// </summary> 
     /// <param name="whereConditions"></param> 
     /// <param name="cancellationToken"></param> 
     /// <returns></returns> 
-    Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default);
-
-    /// <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="whereConditions"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    Task<List<WmsMaterial>> GetListByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    ///  鏍规嵁鏉′欢鑾峰彇鍗曚釜鐗╂枡鍩虹淇℃伅琛�
-    /// </summary>
-    /// <param name="whereConditions"></param>
-    /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    /// <exception cref="UserFriendlyException"></exception>
-    Task<WmsMaterial> GetSingleByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default);
-
-
-}
+    Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default); 
+ 
+    /// <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="whereConditions"></param> 
+    /// <param name="cancellationToken"></param> 
+    /// <returns></returns> 
+    Task<List<WmsMaterial>> GetListByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, CancellationToken cancellationToken = default); 
+ 
+    /// <summary> 
+    ///  鏍规嵁鏉′欢鑾峰彇鍗曚釜鐗╂枡鍩虹淇℃伅琛� 
+    /// </summary> 
+    /// <param name="whereConditions"></param> 
+    /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param> 
+    /// <param name="cancellationToken"></param> 
+    /// <returns></returns> 
+    /// <exception cref="UserFriendlyException"></exception> 
+    Task<WmsMaterial> GetSingleByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default); 
+} 

--
Gitblit v1.9.3