From f5432e77f687c1efb8c1f488c9032f73616efb23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 15 5月 2025 09:02:56 +0800
Subject: [PATCH] 2

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs |  105 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
index 49f808e..b027c3f 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
@@ -1,44 +1,71 @@
-//using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-//using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
-//using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-//using Microsoft.AspNetCore.Mvc;
-//using System.Reflection;
+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;
 
-//namespace CMS.Plugin.PipeLineLems.Controller
-//{
-//    /// <summary>
-//    /// 浣滀笟璁″垝鏈嶅姟
-//    /// </summary>
-//    [ApiController]
-//    [TypeFilter(typeof(CMSLanguageFilter))]
-//    [TypeFilter(typeof(CMSUowActionFilter))]
-//    [TypeFilter(typeof(CMSAuditActionFilter))]
-//    [TypeFilter(typeof(CMSExceptionFilter))]
-//    [Route("api/v{version:apiVersion}/PipeLineLems/[controller]")]
-//    public class WorkPlanPublicController : ControllerBase
-//    {
+namespace CMS.Plugin.PipeLineLems.Controller
+{
+    /// <summary>
+    /// 浣滀笟璁″垝鏈嶅姟
+    /// </summary>
+    [ApiController]
+    [TypeFilter(typeof(CMSLanguageFilter))]
+    [TypeFilter(typeof(CMSUowActionFilter))]
+    [TypeFilter(typeof(CMSAuditActionFilter))]
+    [TypeFilter(typeof(CMSExceptionFilter))]
+    [Route("api/v{version:apiVersion}/PipeLineLems/[controller]")]
+    public class WorkPlanPublicController : ControllerBase
+    {
 
-//        private readonly IMesAppService _mesAppService;
-//        /// <summary>
-//        /// Initializes a new instance of the <see cref="TestEntityNameController"/> class.
-//        /// </summary>
-//        /// <param name="testentitynameAppService">The testentityname application service.</param>
-//        public WorkPlanPublicController(IMesAppService mesAppService)
-//        {
-//            _mesAppService = mesAppService;
-//        }
+        private readonly IMesAppService _mesAppService;
+        private readonly ICurrentUser _currentUser;
+        private readonly Application.Implements.SharedService sharedService;
+        private IServiceProvider _serviceProvider;
 
-//        /// <summary>
-//        /// 鑾峰彇鐢熶骇璁″垝.
-//        /// </summary>
-//        /// <param name="input">鏍囪瘑绗�.</param>
-//        /// <returns></returns>
-//        [HttpPost]
-//        public virtual async Task<MesOrderResponse> GetWorkPlanAsync([FromBody] List<WorkPlanInput> input)
-//        {
-//            return await _mesAppService.CreateAsync(input);
-//        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestEntityNameController"/> class.
+        /// </summary>
+        /// <param name="testentitynameAppService">The testentityname application service.</param>
+        public WorkPlanPublicController(IMesAppService mesAppService, ICurrentUser currentUser, Application.Implements.SharedService _sharedService,
+            IServiceProvider serviceProvider)
+        {
+            _mesAppService = mesAppService;
+            _currentUser = currentUser;
+            sharedService = _sharedService;
+            _serviceProvider = serviceProvider;
+        }
 
+        /// <summary>
+        /// 鑾峰彇鐢熶骇璁″垝.
+        /// </summary>
+        /// <param name="input">鏍囪瘑绗�.</param>
+        /// <returns></returns>
+        [HttpPost]
+        public virtual async Task<MesOrderResponse> GetWorkPlanAsync([FromBody] List<WorkPlanInput> 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