From 83f4b5742d68e2af3a4e9f60630de8444e99582a Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 11:53:35 +0800
Subject: [PATCH] 库存高级查询
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 35 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
index 8d564bd4..ade69da 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
@@ -1,10 +1,8 @@
using Ao.Lang;
-using AutoMapper.Internal.Mappers;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
+using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Application.Implements;
-using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -12,6 +10,9 @@
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
+using CmsQueryExtensions.Entitys;
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using System.Linq.Expressions;
namespace CMS.Plugin.PipeLineLems.Controller
{
@@ -27,33 +28,22 @@
public class WorkPlanController : ControllerBase
{
private readonly IWorkPlanAppService _workPlanAppService;
-
-
- /// <summary>
- /// 鑾峰彇鐢熶骇璁″垝.
- /// </summary>
- /// <param name="input">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPost]
- [Route("GetWorkPlanByAps")]
- public virtual async Task<MesOrderResponse> CreateWorkPlanByApsAsync([FromBody] List<WorkPlanInput> input)
- {
- return await _workPlanAppService.CreatebyApsAsync(input);
- }
+ private readonly ICurrentUser _currentUser;
/// <summary>
/// Initializes a new instance of the <see cref="WorkPlanController"/> class.
/// </summary>
/// <param name="workPlanAppService">The workPlan application service.</param>
- public WorkPlanController(IWorkPlanAppService workPlanAppService)
+ public WorkPlanController(IWorkPlanAppService workPlanAppService, ICurrentUser currentUser)
{
_workPlanAppService = workPlanAppService;
+ _currentUser = currentUser;
}
/// <summary>
/// 鑾峰彇浣滀笟璁″垝琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@@ -65,7 +55,7 @@
/// <summary>
/// 鍒嗛〉鑾峰彇浣滀笟璁″垝琛ㄧ殑鍒楄〃.
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
/// <returns></returns>
[HttpGet]
[Route("Page")]
@@ -75,73 +65,114 @@
}
/// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇浣滀笟璁″垝琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindListByFilter")]
+ public virtual async Task<List<WorkPlanDto>> FindListByFilterAsync([FromBody]GetWorkPlanInput input)
+ {
+ return await _workPlanAppService.FindListByFilterAsync(input);
+ }
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟璁″垝琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindSingleByFilter")]
+ public virtual async Task<WorkPlanDto> FindSingleByFilterAsync([FromBody] GetWorkPlanInput input)
+ {
+
+ return await _workPlanAppService.FindSingleByFilterAsync(input);
+ }
+
+ /// <summary>
/// 鍒涘缓浣滀笟璁″垝琛�
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鍒涘缓鍙傛暟</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
{
+ input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜�
return _workPlanAppService.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<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
{
+ input.LastModifierName = _currentUser.UserAccount;//淇敼浜�
return _workPlanAppService.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<WorkPlanDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
{
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
return _workPlanAppService.CloneAsync(ids);
}
/// <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 _workPlanAppService.DeleteAsync(id);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ return _workPlanAppService.DeleteAsync(id);//閫昏緫鍒犻櫎
}
/// <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 _workPlanAppService.DeleteManyAsync(ids);
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ return _workPlanAppService.DeleteManyAsync(ids);//閫昏緫鍒犻櫎
}
/// <summary>
/// 璋冩暣鎺掑簭浣滀笟璁″垝琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpPut]
[Route("{id}/AdjustSort/{sort}")]
@@ -171,11 +202,15 @@
throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
}
-
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
await _workPlanAppService.ImportAsync(new WorkPlansImportModel
{
WorkPlans = workPlanRows,
- });
+ }, myCurrentUser);
return Ok();
}
--
Gitblit v1.9.3