From cb8543b802db2aa3891e93c3ca3a1eeb5bea0663 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 14:59:53 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
index 354df06..b027c3f 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
@@ -1,6 +1,9 @@
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 CmsQueryExtensions.Entitys;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Reflection;
@@ -19,13 +22,21 @@
{
private readonly IMesAppService _mesAppService;
+ private readonly ICurrentUser _currentUser;
+ private readonly Application.Implements.SharedService sharedService;
+ private IServiceProvider _serviceProvider;
+
/// <summary>
/// Initializes a new instance of the <see cref="TestEntityNameController"/> class.
/// </summary>
/// <param name="testentitynameAppService">The testentityname application service.</param>
- public WorkPlanPublicController(IMesAppService mesAppService)
+ public WorkPlanPublicController(IMesAppService mesAppService, ICurrentUser currentUser, Application.Implements.SharedService _sharedService,
+ IServiceProvider serviceProvider)
{
_mesAppService = mesAppService;
+ _currentUser = currentUser;
+ sharedService = _sharedService;
+ _serviceProvider = serviceProvider;
}
/// <summary>
@@ -36,9 +47,25 @@
[HttpPost]
public virtual async Task<MesOrderResponse> GetWorkPlanAsync([FromBody] List<WorkPlanInput> input)
{
- return await _mesAppService.CreateAsync(input);
+ return await _mesAppService.CreateAsync(input,"","");
}
-
+ /// <summary>
+ /// 鍒嗘嫞
+ /// </summary>
+ /// <param name="input">鏍囪瘑绗�.</param>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ [Route("Pick")]
+ public virtual async Task<MesOrderResponse> Pick([FromBody] PickInput input)
+ {
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+ return await sharedService.CommonPick(_serviceProvider, input, myCurrentUser);
+ }
}
}
--
Gitblit v1.9.3