From 6be4dc69a73560ab2e08e68d5dbfdf95ae62d5b4 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 15:14:37 +0800
Subject: [PATCH] 托盘高级查询
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 152 ++++++++++++++++++++++++++++++--------------------
1 files changed, 90 insertions(+), 62 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/Implements/WmsMaterialAppService.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/Implements/WmsMaterialAppService.cs"
index 2d97a0b..d38fece 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/Implements/WmsMaterialAppService.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/Implements/WmsMaterialAppService.cs"
@@ -10,6 +10,7 @@
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;
+using CmsQueryExtensions.Entitys;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -18,15 +19,15 @@
/// </summary>
public class WmsMaterialAppService : CMSPluginAppService, IWmsMaterialAppService
{
- private readonly IWmsMaterialRepository wmsMaterialRepository;
+ private readonly IWmsMaterialRepository _wmsMaterialRepository;
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialAppService"/> class.
/// </summary>
/// <param name="WmsMaterialRepository">The task job repository.</param>
- public WmsMaterialAppService(IWmsMaterialRepository _WmsMaterialRepository)
+ public WmsMaterialAppService(IWmsMaterialRepository wmsMaterialRepository)
{
- wmsMaterialRepository = _WmsMaterialRepository;
+ _wmsMaterialRepository = wmsMaterialRepository;
}
/// <summary>
@@ -36,7 +37,7 @@
/// <returns></returns>
public virtual async Task<WmsMaterialDto> GetAsync(Guid id)
{
- return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await wmsMaterialRepository.GetAsync(id));
+ return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await _wmsMaterialRepository.GetAsync(id));
}
/// <summary>
@@ -60,8 +61,8 @@
#endregion
- var count = await wmsMaterialRepository.GetCountAsync(whereConditions);
- var list = await wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+ var count = await _wmsMaterialRepository.GetCountAsync(whereConditions);
+ var list = await _wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
}
@@ -99,20 +100,21 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var exist = await wmsMaterialRepository.NameExistAsync(input.MaterialCode);
+ var exist = await _wmsMaterialRepository.NameExistAsync(input.MaterialCode);
if (exist)
{
throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
}
- var maxSort = await wmsMaterialRepository.GetMaxSortAsync();
+ var maxSort = await _wmsMaterialRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
var insertObj = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
insertObj.Sort = sort;
input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
- await wmsMaterialRepository.InsertAsync(insertObj);
+ insertObj.CreatorName = input.CreatorName;//鍒涘缓浜�
+ await _wmsMaterialRepository.InsertAsync(insertObj);
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
@@ -133,8 +135,8 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var updateObj = await wmsMaterialRepository.GetAsync(id);
- var exist = await wmsMaterialRepository.NameExistAsync(input.MaterialCode, updateObj.Id);
+ var updateObj = await _wmsMaterialRepository.GetAsync(id);
+ var exist = await _wmsMaterialRepository.NameExistAsync(input.MaterialCode, updateObj.Id);
if (exist)
{
throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
@@ -145,15 +147,15 @@
updateObj.MaterialCode = input.MaterialCode;
updateObj.IsValid = input.IsValid;
- updateObj.MaterialName = input.MaterialName;
updateObj.IsSelfMade = input.IsSelfMade;
- updateObj.PurchaseType = input.PurchaseType;
updateObj.Num = input.Num;
- updateObj.MaterialType = input.MaterialType;
updateObj.SelfNum = input.SelfNum;
+ updateObj.MaterialName = input.MaterialName;
+ updateObj.NullLength = input.NullLength;
+ updateObj.PurchaseType = input.PurchaseType;
+ updateObj.MaterialType = input.MaterialType;
updateObj.PrimaryUnit = input.PrimaryUnit;
updateObj.Standard = input.Standard;
- updateObj.NullLength = input.NullLength;
updateObj.OuterDiameter = input.OuterDiameter;
updateObj.WallThickness = input.WallThickness;
updateObj.MaterialQuality = input.MaterialQuality;
@@ -165,17 +167,11 @@
updateObj.RedundantField2 = input.RedundantField2;
updateObj.RedundantField3 = input.RedundantField3;
updateObj.Remark = input.Remark;
- updateObj.IsDisabled = input.IsDisabled;
- updateObj.CreatorName = input.CreatorName;
- updateObj.LastModifierName = input.LastModifierName;
- updateObj.ExtraField1 = input.ExtraField1;
- updateObj.ExtraField2 = input.ExtraField2;
- updateObj.ExtraField3 = input.ExtraField3;
- updateObj.OperationRemark = input.OperationRemark;
- updateObj.DeleteRemark = input.DeleteRemark;
- await wmsMaterialRepository.UpdateAsync(updateObj);
+ updateObj.LastModifierName = input.LastModifierName;//淇敼浜�
+
+ await _wmsMaterialRepository.UpdateAsync(updateObj);
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(updateObj);
}
@@ -185,22 +181,22 @@
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids)
+ public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
{
//var wmsMaterials = new List<WmsMaterial>();
//if (ids != null)
//{
- // var sort = await wmsMaterialRepository.GetMaxSortAsync();
+ // var sort = await _wmsMaterialRepository.GetMaxSortAsync();
// foreach (var id in ids)
// {
- // var WmsMaterial = await wmsMaterialRepository.FindAsync(id);
+ // var WmsMaterial = await _wmsMaterialRepository.FindAsync(id);
// if (WmsMaterial != null)
// {
// var name = WmsMaterial.Name + WmsMaterialConsts.CloneTag;
// var notExist = false;
// while (!notExist)
// {
- // var exist = await wmsMaterialRepository.NameExistAsync(name);
+ // var exist = await _wmsMaterialRepository.NameExistAsync(name);
// if (exist || wmsMaterials.Any(x => x.Name == name))
// {
// name += WmsMaterialConsts.CloneTag;
@@ -210,7 +206,7 @@
// notExist = true;
// }
- // //WmsMaterial = await wmsMaterialRepository.InsertAsync(WmsMaterial.Clone(GuidGenerator.Create(), name, sort++));
+ // //WmsMaterial = await _wmsMaterialRepository.InsertAsync(WmsMaterial.Clone(GuidGenerator.Create(), name, sort++));
// wmsMaterials.Add(WmsMaterial);
// }
// }
@@ -227,7 +223,7 @@
/// <returns></returns>
public virtual Task DeleteAsync(Guid id)
{
- return wmsMaterialRepository.DeleteAsync(id);
+ return _wmsMaterialRepository.DeleteAsync(id);
}
/// <summary>
@@ -235,12 +231,34 @@
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
+ public async Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
{
foreach (var id in ids)
{
await DeleteAsync(id);
}
+ }
+
+ /// <summary>
+ /// 鐗╃悊鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="id">涓婚敭ID</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public virtual async Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _wmsMaterialRepository.DeletePermanentlyAsync(id);
+ }
+
+ /// <summary>
+ /// 鎵归噺鐗╃悊鍒犻櫎鐗╂枡鍩虹淇℃伅琛紙鐩存帴鍒犻櫎锛屼笉杞垹闄わ級
+ /// </summary>
+ /// <param name="ids">瑕佸垹闄ょ殑涓婚敭ID鍒楄〃</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public virtual async Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _wmsMaterialRepository.BatchDeletePermanentlyAsync(ids);
}
/// <summary>
@@ -251,7 +269,7 @@
/// <returns></returns>
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await wmsMaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
+ var list = await _wmsMaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -278,7 +296,7 @@
}
}
- await wmsMaterialRepository.UpdateManyAsync(list);
+ await _wmsMaterialRepository.UpdateManyAsync(list);
}
/// <summary>
@@ -287,7 +305,7 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WmsMaterialsImportModel input)
+ public async Task ImportAsync(WmsMaterialsImportModel input, MyCurrentUser myCurrentUser)
{
Check.NotNull(input, nameof(input));
@@ -323,22 +341,22 @@
throw new UserFriendlyException(errorMsg);
}
- var oldWmsMaterial = await wmsMaterialRepository.FindByNameAsync(impItem.MaterialCode);
+ var oldWmsMaterial = await _wmsMaterialRepository.FindByNameAsync(impItem.MaterialCode);
if (oldWmsMaterial != null)
{
var wmsMaterialUpdateDto = new WmsMaterialUpdateDto
{
MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
-MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
-PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
-MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
+MaterialName = impItem.MaterialName,
+NullLength = impItem.NullLength,
+PurchaseType = impItem.PurchaseType,
+MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
-NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -350,14 +368,6 @@
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
-OperationRemark = impItem.OperationRemark,
-DeleteRemark = impItem.DeleteRemark,
};
@@ -369,15 +379,15 @@
{
MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
-MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
-PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
-MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
+MaterialName = impItem.MaterialName,
+NullLength = impItem.NullLength,
+PurchaseType = impItem.PurchaseType,
+MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
-NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -389,14 +399,6 @@
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
-OperationRemark = impItem.OperationRemark,
-DeleteRemark = impItem.DeleteRemark,
};
@@ -410,6 +412,7 @@
{
try
{
+ wmsMaterialDto.Item.CreatorName = myCurrentUser.UserAccount;//鍒涘缓浜�
await CreateAsync(wmsMaterialDto.Item);
}
catch (Exception e)
@@ -424,6 +427,7 @@
{
try
{
+ wmsMaterialDto.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜�
await UpdateAsync(wmsMaterialDto.Id, wmsMaterialDto.Item);
}
catch (Exception e)
@@ -456,7 +460,7 @@
#endregion
- var list = await wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var list = await _wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);
var sheets = new Dictionary<string, object>
@@ -464,7 +468,7 @@
["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "鐗╂枡鍩虹淇℃伅琛ㄥ垪琛�" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = "鐗╂枡淇℃伅";
return (sheets, fileName);
}
@@ -478,9 +482,9 @@
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.MaterialCode, "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", 64);
Check.NotNull(input.IsValid, "鏄惁鏈夋晥鐗╂枡");
+ Check.NotNull(input.Num, "鏁伴噺");
Check.NotNullOrWhiteSpace(input.MaterialName, "鐗╂枡鍚嶇О", 128);
Check.NotNull(input.PurchaseType, "閲囪喘绫诲瀷锛堟灇涓惧�硷級");
- Check.NotNull(input.Num, "鏄惁鏈夋晥鐗╂枡");
Check.NotNull(input.MaterialType, "鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
Check.NotNull(input.OuterDiameter, "澶栧緞锛堝崟浣嶏細mm锛�");
Check.NotNull(input.WallThickness, "澹佸帤锛堝崟浣嶏細mm锛�");
@@ -489,4 +493,28 @@
return Task.CompletedTask;
}
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鐗╂枡鍩虹淇℃伅琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsMaterial>> GetListByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await _wmsMaterialRepository.GetListByFilterAsync(whereConditions);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
+ public async Task<WmsMaterial> GetSingleByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
+ {
+ return await _wmsMaterialRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
+ }
}
--
Gitblit v1.9.3