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/Controller/WmsMaterialController.cs | 181 ++++++++++++++++++++++++--------------------
1 files changed, 99 insertions(+), 82 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 830aa5e..ed341d4 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,6 +1,7 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
+using CMS.Framework.AspNetCore.Users;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -9,12 +10,13 @@
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
+using CmsQueryExtensions.Entitys;
namespace CMS.Plugin.HIAWms.Controller
{
- /// <summary>
- /// WmsMaterial鏈嶅姟
- /// </summary>
+ /// <summary>
+ /// 鐗╂枡鍩虹淇℃伅琛ㄦ湇鍔�
+ /// </summary>
[ApiController]
[TypeFilter(typeof(CMSLanguageFilter))]
[TypeFilter(typeof(CMSUowActionFilter))]
@@ -23,121 +25,132 @@
[Route("api/v{version:apiVersion}/HIAWms/[controller]")]
public class WmsMaterialController : ControllerBase
{
- private readonly IWmsMaterialAppService _wmsmaterialAppService;
+ private readonly IWmsMaterialAppService _wmsMaterialAppService;
+ private readonly ICurrentUser _currentUser;
- /// <summary>
- /// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
- /// </summary>
- /// <param name="wmsmaterialAppService">The wmsmaterial application service.</param>
- public WmsMaterialController(IWmsMaterialAppService wmsmaterialAppService)
+ /// <summary>
+ /// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
+ /// </summary>
+ /// <param name="wmsMaterialAppService">The wmsMaterial application service.</param>
+ public WmsMaterialController(IWmsMaterialAppService wmsMaterialAppService, ICurrentUser currentUser)
{
- _wmsmaterialAppService = wmsmaterialAppService;
+ _wmsMaterialAppService = wmsMaterialAppService;
+ _currentUser = currentUser;
}
- /// <summary>
- /// 鑾峰彇wmsmaterial.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <returns></returns>
[HttpGet]
[Route("{id}")]
public virtual Task<WmsMaterialDto> GetAsync(Guid id)
{
- return _wmsmaterialAppService.GetAsync(id);
+ return _wmsMaterialAppService.GetAsync(id);
}
- /// <summary>
- /// 鑾峰彇wmsmaterial鐨勫垪琛�.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
+ /// <summary>
+ /// 鍒嗛〉鑾峰彇鐗╂枡鍩虹淇℃伅琛ㄧ殑鍒楄〃.
+ /// </summary>
+ /// <param name="input">杈撳叆.</param>
+ /// <returns></returns>
[HttpGet]
[Route("Page")]
- public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialsInput input)
+ public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
{
- return _wmsmaterialAppService.GetListAsync(input);
+ return _wmsMaterialAppService.GetListAsync(input);
}
- /// <summary>
- /// 鍒涘缓wmsmaterial.
- /// </summary>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
+ /// <summary>
+ /// 鍒涘缓鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="input">杈撳叆.</param>
+ /// <returns></returns>
+ //[Authorize]
[HttpPost]
public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
{
- return _wmsmaterialAppService.CreateAsync(input);
+ input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜�
+ return _wmsMaterialAppService.CreateAsync(input);
}
- /// <summary>
- /// 鏇存柊wmsmaterial.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
- /// <returns></returns>
- //[Authorize]
+ /// <summary>
+ /// 鏇存柊鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="input">杈撳叆.</param>
+ /// <returns></returns>
+ //[Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
{
- return _wmsmaterialAppService.UpdateAsync(id, input);
+ input.LastModifierName = _currentUser.UserAccount;//淇敼浜�
+ return _wmsMaterialAppService.UpdateAsync(id, input);
}
- /// <summary>
- /// 鍏嬮殕WmsMaterial.
- /// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
- /// <returns></returns>
- //[Authorize]
+ /// <summary>
+ /// 鍏嬮殕鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="ids">Id闆嗗悎.</param>
+ /// <returns></returns>
+ //[Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
{
- return _wmsmaterialAppService.CloneAsync(ids);
+ return _wmsMaterialAppService.CloneAsync(ids);
}
- /// <summary>
- /// 鍒犻櫎wmsmaterial.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
- //[Authorize]
+ /// <summary>
+ /// 鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <returns></returns>
+ //[Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
{
- return _wmsmaterialAppService.DeleteAsync(id);
+ //return _wmsMaterialAppService.DeleteAsync(id);//閫昏緫鍒犻櫎
+ return _wmsMaterialAppService.DeletePermanentlyAsync(id);//鐗╃悊鍒犻櫎
}
- /// <summary>
- /// 鎵归噺鍒犻櫎wmsmaterial.
- /// </summary>
- /// <param name="ids">The ids.</param>
- /// <returns></returns>
- //[Authorize]
+ /// <summary>
+ /// 鎵归噺鍒犻櫎鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="ids">The ids.</param>
+ /// <returns></returns>
+ //[Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
- return _wmsmaterialAppService.DeleteManyAsync(ids);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ // return _wmsMaterialAppService.DeleteManyAsync(ids);//閫昏緫鍒犻櫎
+ return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids);//鐗╃悊鍒犻櫎
}
- /// <summary>
- /// 璋冩暣鎺掑簭.
- /// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <returns></returns>
+ /// <summary>
+ /// 璋冩暣鎺掑簭鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <param name="id">鏍囪瘑绗�.</param>
+ /// <returns></returns>
[HttpPut]
[Route("{id}/AdjustSort/{sort}")]
public virtual Task AdjustSortAsync(Guid id, int sort)
{
- return _wmsmaterialAppService.AdjustSortAsync(id, sort);
+ return _wmsMaterialAppService.AdjustSortAsync(id, sort);
}
- /// <summary>
- /// 瀵煎叆wmsmaterial.
- /// </summary>
- /// <returns></returns>
+ /// <summary>
+ /// 瀵煎叆鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <returns></returns>
[Authorize]
[HttpPost]
[Route("Import")]
@@ -148,31 +161,35 @@
stream.Seek(0L, SeekOrigin.Begin);
var sheetNames = stream.GetSheetNames();
- var wmsmaterialRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
+ var wmsMaterialRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
- if (!wmsmaterialRows.Any())
+ if (!wmsMaterialRows.Any())
{
throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
}
-
- await _wmsmaterialAppService.ImportAsync(new WmsMaterialsImportModel
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
{
- WmsMaterials = wmsmaterialRows,
- });
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ await _wmsMaterialAppService.ImportAsync(new WmsMaterialsImportModel
+ {
+ WmsMaterials = wmsMaterialRows,
+ }, myCurrentUser);
return Ok();
}
- /// <summary>
- /// 瀵煎嚭wmsmaterial.
- /// </summary>
- /// <returns></returns>
+ /// <summary>
+ /// 瀵煎嚭鐗╂枡鍩虹淇℃伅琛�
+ /// </summary>
+ /// <returns></returns>
[HttpGet]
[Route("Export")]
- public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialsInput input)
+ public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
{
input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsmaterialAppService.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