From 448177c5f07c2a63071fe3ebb5bb79894b0606ed Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 17:57:36 +0800
Subject: [PATCH] 3
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs | 84 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 28 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/Controller/WmsMaterialController.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/Controller/WmsMaterialController.cs"
index 0002de3..1d982b5 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/Controller/WmsMaterialController.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/Controller/WmsMaterialController.cs"
@@ -1,5 +1,6 @@
-锘縰sing Ao.Lang;
+using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
+using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
@@ -9,6 +10,7 @@
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
+using CmsQueryExtensions.Entitys;
namespace CMS.Plugin.HIAWms.Controller
{
@@ -23,115 +25,136 @@
[Route("api/v{version:apiVersion}/HIAWms/[controller]")]
public class WmsMaterialController : ControllerBase
{
- private readonly IWmsMaterialAppService _wmsmaterialsAppService;
+ private readonly IWmsMaterialAppService _wmsMaterialAppService;
+ private readonly ICurrentUser _currentUser;
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
/// </summary>
- /// <param name="wmsmaterialsAppService">The wmsmaterials application service.</param>
- public WmsMaterialController(IWmsMaterialAppService wmsmaterialsAppService)
+ /// <param name="wmsMaterialAppService">The wmsMaterial application service.</param>
+ public WmsMaterialController(IWmsMaterialAppService wmsMaterialAppService, ICurrentUser currentUser)
{
- _wmsmaterialsAppService = wmsmaterialsAppService;
+ _wmsMaterialAppService = wmsMaterialAppService;
+ _currentUser = currentUser;
}
/// <summary>
/// 鑾峰彇鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
public virtual Task<WmsMaterialDto> GetAsync(Guid id)
{
- return _wmsmaterialsAppService.GetAsync(id);
+ return _wmsMaterialAppService.GetAsync(id);
}
/// <summary>
/// 鍒嗛〉鑾峰彇鐗╂枡鍩虹淇℃伅琛ㄧ殑鍒楄〃.
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
/// <returns></returns>
[HttpGet]
[Route("Page")]
public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
{
- return _wmsmaterialsAppService.GetListAsync(input);
+ return _wmsMaterialAppService.GetListAsync(input);
}
/// <summary>
/// 鍒涘缓鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鍒涘缓鍙傛暟</param>
/// <returns></returns>
//[Authorize]
[HttpPost]
public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
{
- return _wmsmaterialsAppService.CreateAsync(input);
+ input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜�
+ return _wmsMaterialAppService.CreateAsync(input);
}
/// <summary>
/// 鏇存柊鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="id">涓婚敭ID</param>
+ /// <param name="input">鏇存柊鍙傛暟</param>
/// <returns></returns>
//[Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
{
- return _wmsmaterialsAppService.UpdateAsync(id, input);
+ input.LastModifierName = _currentUser.UserAccount;//淇敼浜�
+ return _wmsMaterialAppService.UpdateAsync(id, input);
}
/// <summary>
/// 鍏嬮殕鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
+ /// <param name="ids">Id闆嗗悎</param>
/// <returns></returns>
//[Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
{
- return _wmsmaterialsAppService.CloneAsync(ids);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ return _wmsMaterialAppService.CloneAsync(ids, myCurrentUser);
}
/// <summary>
/// 鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
//[Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
{
- return _wmsmaterialsAppService.DeleteAsync(id);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ //return _wmsMaterialAppService.DeleteAsync(id,myCurrentUser);//閫昏緫鍒犻櫎
+ return _wmsMaterialAppService.DeletePermanentlyAsync(id, myCurrentUser);//鐗╃悊鍒犻櫎
}
/// <summary>
/// 鎵归噺鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="ids">The ids.</param>
+ /// <param name="ids">涓婚敭ID闆嗗悎</param>
/// <returns></returns>
//[Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
- return _wmsmaterialsAppService.DeleteManyAsync(ids);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ // return _wmsMaterialAppService.DeleteManyAsync(ids,myCurrentUser);//閫昏緫鍒犻櫎
+ return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//鐗╃悊鍒犻櫎
}
/// <summary>
/// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpPut]
[Route("{id}/AdjustSort/{sort}")]
public virtual Task AdjustSortAsync(Guid id, int sort)
{
- return _wmsmaterialsAppService.AdjustSortAsync(id, sort);
+ return _wmsMaterialAppService.AdjustSortAsync(id, sort);
}
/// <summary>
@@ -148,17 +171,22 @@
stream.Seek(0L, SeekOrigin.Begin);
var sheetNames = stream.GetSheetNames();
- var wmsmaterialsRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
+ var wmsMaterialRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
- if (!wmsmaterialsRows.Any())
+ if (!wmsMaterialRows.Any())
{
throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
}
- await _wmsmaterialsAppService.ImportAsync(new WmsMaterialsImportModel
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
{
- WmsMaterials = wmsmaterialsRows,
- });
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ await _wmsMaterialAppService.ImportAsync(new WmsMaterialsImportModel
+ {
+ WmsMaterials = wmsMaterialRows,
+ },myCurrentUser);
return Ok();
}
@@ -172,7 +200,7 @@
public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
{
input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsmaterialsAppService.ExportAsync(input);
+ var exportData = await _wmsMaterialAppService.ExportAsync(input);
var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial瀵煎嚭妯℃澘.xlsx");
if (!System.IO.File.Exists(templatePath))
{
--
Gitblit v1.9.3