From ed231e8624dd3b5ad021ea02cb0818d9fdfc4eb1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 19 5月 2025 15:33:15 +0800
Subject: [PATCH] 优化

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
index c2ecf7d..57151fc 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
@@ -2,6 +2,8 @@
 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 CmsQueryExtensions;
 using CmsQueryExtensions.Entitys;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -20,7 +22,7 @@
     [Route("api/v{version:apiVersion}/PipeLineLems/[controller]")]
     public class WorkPlanPublicController : ControllerBase
     {
-
+        private readonly IWorkPlanAppService _workPlanAppService;
         private readonly IMesAppService _mesAppService;
         private readonly ICurrentUser _currentUser;
         private readonly Application.Implements.SharedService sharedService;
@@ -31,12 +33,13 @@
         /// </summary>
         /// <param name="testentitynameAppService">The testentityname application service.</param>
         public WorkPlanPublicController(IMesAppService mesAppService, ICurrentUser currentUser, Application.Implements.SharedService _sharedService,
-            IServiceProvider serviceProvider)
+            IServiceProvider serviceProvider, IWorkPlanAppService workPlanAppService)
         {
             _mesAppService = mesAppService;
             _currentUser = currentUser;
             sharedService = _sharedService;
             _serviceProvider = serviceProvider;
+            _workPlanAppService = workPlanAppService;
         }
 
         /// <summary>
@@ -166,5 +169,44 @@
                 };
             }
         }
+
+
+        /// <summary> 
+        /// 鍒嗘嫞鏃惰幏鍙栫敓浜ц鍒掑拰鍒嗛厤鍖哄煙
+        /// </summary> 
+        /// <param name="input"></param> 
+        /// <returns></returns> 
+        [HttpPost]
+        [Route("GetPickRet")]
+        public virtual async Task<CmsApiResponse<PickOutput>> GetPickRetAsync([FromBody] GetWorkPlanInput input)
+        {
+
+            //WorkPlanDto workPlanDto = await _workPlanAppService.FindSingleByFilterAsync(input);
+            ////杩欓噷瑕佽幏鍙杦ms鐨勫簱瀛橈紝鏉ュ垎鏋� 瑕佹斁鍒板摢涓墭鐩橀噷
+            //return new PickOutput()
+            //{
+            //    WorkPlan = workPlanDto,
+            //    PlaceNo = "",
+            //    ContinerNo = ""
+            //};
+            try
+            {
+                MyCurrentUser myCurrentUser = new MyCurrentUser()
+                {
+                    UserAccount = _currentUser.UserAccount,
+                    UserId = _currentUser.UserId
+                };
+                return await sharedService.GetPickRetAsync(input, _serviceProvider, myCurrentUser);
+            }
+            catch (Exception ex)
+            {
+                return new CmsApiResponse<PickOutput>()
+                {
+                    Code = 400,
+                    Message = ex.Message
+                };
+            }
+
+        }
     }
 }

--
Gitblit v1.9.3