From 7d410c1f0d4e36f8281ce2277f355c9abf1c231b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
index 7d66f61..35ecda2 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
@@ -1,5 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
+using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
using CMS.Plugin.PipeLineLems.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.PipeLineLems.Controller
{
@@ -24,20 +26,22 @@
public class CallMaterialOrderController : ControllerBase
{
private readonly ICallMaterialOrderAppService _callMaterialOrderAppService;
+ private readonly ICurrentUser _currentUser;
/// <summary>
/// Initializes a new instance of the <see cref="CallMaterialOrderController"/> class.
/// </summary>
/// <param name="callMaterialOrderAppService">The callMaterialOrder application service.</param>
- public CallMaterialOrderController(ICallMaterialOrderAppService callMaterialOrderAppService)
+ public CallMaterialOrderController(ICallMaterialOrderAppService callMaterialOrderAppService, ICurrentUser currentUser)
{
_callMaterialOrderAppService = callMaterialOrderAppService;
+ _currentUser = currentUser;
}
/// <summary>
/// 鑾峰彇鍙枡鍗曡〃
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@@ -49,7 +53,7 @@
/// <summary>
/// 鍒嗛〉鑾峰彇鍙枡鍗曡〃鐨勫垪琛�.
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
/// <returns></returns>
[HttpGet]
[Route("Page")]
@@ -61,71 +65,90 @@
/// <summary>
/// 鍒涘缓鍙枡鍗曡〃
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鍒涘缓鍙傛暟</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
{
+ input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜�
return _callMaterialOrderAppService.CreateAsync(input);
}
/// <summary>
/// 鏇存柊鍙枡鍗曡〃
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="id">涓婚敭ID</param>
+ /// <param name="input">鏇存柊鍙傛暟</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
{
+ input.LastModifierName = _currentUser.UserAccount;//淇敼浜�
return _callMaterialOrderAppService.UpdateAsync(id, input);
}
/// <summary>
/// 鍏嬮殕鍙枡鍗曡〃
/// </summary>
- /// <param name="ids">Id闆嗗悎.</param>
+ /// <param name="ids">Id闆嗗悎</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<CallMaterialOrderDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
{
- return _callMaterialOrderAppService.CloneAsync(ids);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ return _callMaterialOrderAppService.CloneAsync(ids, myCurrentUser);
}
/// <summary>
/// 鍒犻櫎鍙枡鍗曡〃
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
{
- return _callMaterialOrderAppService.DeleteAsync(id);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ //return _wmsMaterialAppService.DeleteAsync(id,myCurrentUser);//閫昏緫鍒犻櫎
+ return _callMaterialOrderAppService.DeletePermanentlyAsync(id, myCurrentUser);//鐗╃悊鍒犻櫎
}
/// <summary>
/// 鎵归噺鍒犻櫎鍙枡鍗曡〃
/// </summary>
- /// <param name="ids">The ids.</param>
+ /// <param name="ids">涓婚敭ID闆嗗悎</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
- return _callMaterialOrderAppService.DeleteManyAsync(ids);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ // return _wmsMaterialAppService.DeleteManyAsync(ids,myCurrentUser);//閫昏緫鍒犻櫎
+ return _callMaterialOrderAppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//鐗╃悊鍒犻櫎
}
/// <summary>
/// 璋冩暣鎺掑簭鍙枡鍗曡〃
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpPut]
[Route("{id}/AdjustSort/{sort}")]
@@ -155,10 +178,15 @@
throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
}
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
await _callMaterialOrderAppService.ImportAsync(new CallMaterialOrdersImportModel
{
CallMaterialOrders = callMaterialOrderRows,
- });
+ },myCurrentUser);
return Ok();
}
--
Gitblit v1.9.3